Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
141
Issues
141
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
33a9fdab
Commit
33a9fdab
authored
Dec 19, 2005
by
jpbl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merging sflphoned and sflphone
parent
528f4380
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
74 additions
and
12 deletions
+74
-12
Makefile.am
Makefile.am
+2
-2
Makefile.cvs
Makefile.cvs
+10
-7
admin/cvs.sh
admin/cvs.sh
+1
-1
configure.ac
configure.ac
+5
-1
libs/Makefile.am
libs/Makefile.am
+1
-1
libs/taxidermy/WidgetBuilderCreator.inl
libs/taxidermy/WidgetBuilderCreator.inl
+27
-0
libs/taxidermy/WidgetBuilderFactoryImpl.inl
libs/taxidermy/WidgetBuilderFactoryImpl.inl
+28
-0
No files found.
Makefile.am
View file @
33a9fdab
SUBDIRS
=
include libs src ringtones
m4
EXTRA_DIST
=
tools/
*
.sh tools/install-sip
*
debian/
*
README.cvs CHANGES
SUBDIRS
=
include libs src ringtones
skins
EXTRA_DIST
=
tools/
*
.sh tools/install-sip
*
debian/
*
README.cvs CHANGES
ACLOCAL_FLAGS
=
-I
$(top_srcdir)
/m4
Makefile.cvs
View file @
33a9fdab
all
:
autotools
autotools
:
./autogen.sh
qt
:
cd
src/gui/qt
&&
qmake
all
:
@
echo
"This Makefile is only for the CVS repository"
@
echo
"This will be deleted before making the distribution"
@
echo
""
@
if
test
!
-d
admin
;
then
\
echo
"Please recheckout this module!"
;
\
echo
"for cvs: use checkout once and after that update again"
;
\
exit
1
;
\
fi
$(MAKE)
-f
admin/Makefile.common cvs
admin/cvs.sh
View file @
33a9fdab
...
...
@@ -487,7 +487,7 @@ fi
acinclude_m4
()
{
echo
"*** Creating acinclude.m4"
adds
=
adds
=
m4/
*
if
grep
'\$(top_srcdir)/acinclude.m4:'
$makefile_am
>
/dev/null
;
then
strip_makefile
rm
-f
acinclude.m4
...
...
configure.ac
View file @
33a9fdab
...
...
@@ -34,7 +34,6 @@ AC_PATH_QT
AC_CHECK_COMPILERS
AC_SUBST(LIBQT)
LIBS="$LIBS -lstdc++ $LIB_QT"
AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
...
...
@@ -160,8 +159,13 @@ CPPFLAGS=$save_dnssdtest_CPPFLAGS
LDFLAGS=$save_dnssdtest_LDFLAGS
LIBS=$save_dnssdtest_LIBS
fi
sflphone_datadir=$datadir/sflphone
AC_SUBST(sflphone_datadir)
AC_SUBST(LIB_DNSSD)
AM_CONDITIONAL(USE_ZEROCONF, test "$have_libdns_sd" = "yes")
LIBS="$LIBS -lstdc++ $LIB_QT"
dnl AC_CONFIG_FILES(
AC_OUTPUT(
...
...
libs/Makefile.am
View file @
33a9fdab
SUBDIRS
=
eXosip2 portaudio stund utilspp
\ No newline at end of file
SUBDIRS
=
eXosip2 portaudio stund taxidermy utilspp
\ No newline at end of file
libs/taxidermy/WidgetBuilderCreator.inl
0 → 100644
View file @
33a9fdab
/*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Jean-Philippe Barrette-LaPierre
* (jean-philippe.barrette-lapierre@savoirfairelinux.com)
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2,
* or (at your option) any later version.
*
* This is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
template< typename T >
taxidermy::WidgetBuilder *
taxidermy::WidgetBuilderCreator< T >::create()
{
return new T();
}
libs/taxidermy/WidgetBuilderFactoryImpl.inl
0 → 100644
View file @
33a9fdab
/*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Author: Jean-Philippe Barrette-LaPierre
* (jean-philippe.barrette-lapierre@savoirfairelinux.com)
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2,
* or (at your option) any later version.
*
* This is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
template< typename T >
void
taxidermy::WidgetBuilderFactoryImpl::add(const QString &objectType)
{
mBuilders.insert(objectType, new WidgetBuilderCreator<T>());
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment