Commit b0256c5e authored by Emmanuel Milou's avatar Emmanuel Milou

Merge branch 'jbonjean'

parents 617f5c9f 6e8baecb
......@@ -9,7 +9,6 @@
*.m4
*.Tpo
Makefile.in
*.spec
/config.*
*.swp
*.so
......
......@@ -67,7 +67,7 @@ typedef struct {
gchar * accountID;
account_state_t state;
gchar * protocol_state_description;
guint * protocol_state_code;
guint protocol_state_code;
GHashTable * properties;
GPtrArray * credential_information;
} account_t;
......
......@@ -1099,7 +1099,7 @@ sflphone_fill_codec_list()
for(pl=codecs; *codecs; codecs++)
{
details = (gchar **)dbus_codec_details(atoi(*codecs));
if(codec_list_get_by_payload(atoi(*codecs))!=NULL){
if(codec_list_get_by_payload((gconstpointer) atoi(*codecs))!=NULL){
// does nothing - the codec is already in the list, so is active.
}
else{
......@@ -1169,7 +1169,7 @@ void sflphone_fill_conference_list(void)
c = g_new0(conference_obj_t, 1);
conf_id = (gchar*)(*conferences);
conference_details = dbus_get_conference_details(conf_id);
conference_details = (GHashTable*) dbus_get_conference_details(conf_id);
create_new_call_from_details (conf_id, conference_details, &c);
c->_confID = g_strdup(conf_id);
......
......@@ -165,7 +165,7 @@ void create_history_entry_from_serialized_form (gchar *timestamp, gchar *details
// details is in serialized form, i e: calltype%to%from%callid
if ((ptr = strtok(details, delim)) != NULL) {
if ((ptr = g_strsplit(details, delim,0)) != NULL) {
do {
switch (token)
{
......@@ -188,7 +188,7 @@ void create_history_entry_from_serialized_form (gchar *timestamp, gchar *details
break;
}
token ++;
} while ((ptr = strtok(NULL, delim)) != NULL);
} while ((ptr = g_strsplit(NULL, delim, 0)) != NULL);
}
if (g_strcasecmp (peer_name, "empty") == 0)
......
......@@ -103,7 +103,7 @@ codec_list_get_by_name( const gchar* name)
}
codec_t*
codec_list_get_by_payload( const int payload)
codec_list_get_by_payload(gconstpointer payload)
{
GList * c = g_queue_find_custom(codecQueue, payload, is_payload_codecstruct);
if(c)
......
......@@ -117,6 +117,6 @@ void codec_list_move_codec_down(guint index);
*/
void codec_list_update_to_daemon();
codec_t* codec_list_get_by_payload( const int payload);
codec_t* codec_list_get_by_payload(gconstpointer payload);
#endif
......@@ -710,7 +710,7 @@ GtkWidget * create_advanced_tab(account_t **a)
GtkTreeIter current_local_address_iter = iter;
gchar ** iface_list = NULL;
iface_list = dbus_get_all_ip_interface();
iface_list = (gchar **)dbus_get_all_ip_interface();
gchar ** iface = NULL;
if (iface_list != NULL) {
......
......@@ -396,11 +396,11 @@ codec_active_toggled(GtkCellRendererToggle *renderer UNUSED, gchar *path, gpoint
// codec_list_get_by_name(name);
if ((g_strcasecmp(name,"speex")==0) && (g_strcasecmp(srate,"8 kHz")==0))
codec = codec_list_get_by_payload(110);
codec = codec_list_get_by_payload((gconstpointer) 110);
else if ((g_strcasecmp(name,"speex")==0) && (g_strcasecmp(srate,"16 kHz")==0))
codec = codec_list_get_by_payload(111);
codec = codec_list_get_by_payload((gconstpointer) 111);
else if ((g_strcasecmp(name,"speex")==0) && (g_strcasecmp(srate,"32 kHz")==0))
codec = codec_list_get_by_payload(112);
codec = codec_list_get_by_payload((gconstpointer) 112);
else
codec = codec_list_get_by_name(name);
......
......@@ -70,7 +70,6 @@ xhdrid:
cp /tmp/id $$f; \
done
prefix = /usr/local
install:
mkdir -p $(DESTDIR)$(prefix)/lib
cp -L $$(find . -name '*.a') $(DESTDIR)$(prefix)/lib
......
......@@ -3668,7 +3668,7 @@ std::vector<std::string> SIPVoIPLink::getAllIpInterface (void)
_debug ("Local interface %s\n", tmpAddr);
}
return ifaceList;
return ifaceList;
}
......
Source: sflphone-client-gnome
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome
Priority: optional
Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libtool, libgtk2.0-dev (>=2.16), libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev, libgnomeui-dev, gnome-doc-utils, rarian-compat
Standards-Version: 3.7.3
Package: sflphone-client-gnome
Priority: optional
#Architecture: any
Architecture: i386
Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 (>=2.16) , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,libdbus-glib-1-2, libnotify1 (>= 0.4), librsvg2-common (>=2.22.2), liblog4c3
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
Description: GNOME client for SFLphone
Provide a GNOME client for SFLphone.
SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License.
SFLphone is being developed by the global community, and maintained by
Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
Source: sflphone-client-gnome
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome
Priority: optional
Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libsexy-dev, libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev
Standards-Version: 3.7.3
Package: sflphone-client-gnome
Priority: optional
Architecture: any
Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>=2.22.2), liblog4c3
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
Description: GNOME client for SFLphone
Provide a GNOME client to SFLphone.
SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License.
SFLphone is being developed by the global community, and maintained by
Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
Source: sflphone-client-gnome
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome
Priority: optional
Build-Depends: debhelper (>= 5), libgcc1, autoconf, libtool, libgtk2.0-dev, libsexy-dev, libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev
Standards-Version: 3.8.0
Package: sflphone-client-gnome
Priority: optional
Architecture: any
Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>= 2.22.2), liblog4c3
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
Description: GNOME client for SFLphone
Provide a GNOME client to SFLphone.
SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License.
SFLphone is being developed by the global community, and maintained by
Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
This package was debianized by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> on
Fri, 3 Apr 2009 09:47:53 -0500.
It was downloaded from the git repository of SFLphone: git://sflphone.org/git/sflphone.git
Upstream Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Copyright:
Savoir-Faire Linux Inc.
License:
This software is copyright (c) 2004-2009 Savoir-Faire Linux inc.
You are free to distribute this software under the terms of
the GNU General Public License version 3.
On Debian systems, the complete text of the GNU General Public
License can be found in the file `/usr/share/common-licenses/GPL'.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklyn St, Fifth Floor, Boston, MA 02110-1301, USA.
#
# Regular cron jobs for the sflphone package
#
0 4 * * * root sflphone_maintenance
usr/bin
usr/share/applications
usr/share/pixmaps
usr/share/sflphone
usr/share/locale
usr/share/doc
usr/share/man
debian/sflphone-client-gnome/usr/share/man/man1/sflphone-client-gnome.1
debian/sflphone-client-gnome/usr/share/man/man1/sflphone.1
#!/bin/sh -e
update-alternatives --install /usr/bin/sflphone sflphone /usr/bin/sflphone-client-gnome 100 \
--slave /usr/share/man/man1/sflphone.1.gz sflphone.1.gz \
/usr/share/man/man1/sflphone-client-gnome.1.gz
exit 0
#!/bin/sh
# postrm script for sflphone
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
# * <old-postrm> `upgrade' <new-version>
# * <new-postrm> `failed-upgrade' <old-version>
# * <new-postrm> `abort-install'
# * <new-postrm> `abort-install' <old-version>
# * <new-postrm> `abort-upgrade' <old-version>
# * <disappearer's-postrm> `disappear' <overwriter>
# <overwriter-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
if [ "$1" = "purge" ]
then
# remove the user config file
rm -f $HOME/.sflphone/sflphonedrc
fi
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
#!/bin/sh
# postrm script for sflphone
#
# see: dh_installdeb(1)
set -e
package=sflphone-client-gnome
case "$1" in
install|upgrade)
## Clean up the previous manpage
if [ -f /usr/share/man/man1/sflphone-gtk.1 ]; then
rm /usr/share/man/man1/sflphone-gtk.1
fi
;;
esac
exit 0
#!/bin/sh -e
if [ "$1" = "remove" ]; then
# Remove alternatives symlink set in postinst
update-alternatives --remove sflphone /usr/bin/sflphone
fi
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
export DH_OPTIONS
package=sflphone-client-gnome
CXX = g++-4.0
CFLAGS = -Wall -g
DEB_INSTALL_MANPAGES_sflphone_client_gnome = sflphone.1 sflphone-client-gnome.1
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
./autogen.sh
./configure --prefix=/usr
touch configure-stamp
#Architecture
build: build-arch build-indep
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
# Add here commands to compile the arch part of the package.
$(MAKE)
touch $@
build-indep: build-indep-stamp
build-indep-stamp: configure-stamp
# Add here commands to compile the indep part of the package.
#$(MAKE) doc
touch $@
clean:
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp configure-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
dh_clean
install: install-indep install-arch
install-indep:
dh_testdir
dh_testroot
dh_clean -k -i
dh_installdirs -i
# Add here commands to install the package into debian/sflphone.
install-arch:
dh_testdir
dh_testroot
dh_clean -k -s
dh_installdirs -s
# Add here commands to install the arch part of the package into
# debian/tmp.
$(MAKE) DESTDIR=$(CURDIR)/debian/$(package) install
dh_install -s
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
# in another 'make' thread.
binary-common:
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
# dh_installmenu
# dh_installdebconf
# dh_installlogrotate
# dh_installemacsen
# dh_installpam
# dh_installmime
# dh_python
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
# dh_perl
dh_makeshlibs
dh_installdeb
# dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
# Build architecture independant packages using the common target.
binary-indep: build-indep install-indep
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
Source: sflphone-client-kde
Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
Section: kde
Priority: optional
Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), libqt4-dev (>=4.3)
Standards-Version: 3.7.3
Package: sflphone-client-kde
Priority: optional
Architecture: i386
Depends: sflphone-common (=VERSION), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
Description: KDE client for SFLphone
Provide a KDE client for SFLphone.
SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License.
SFLphone is being developed by the global community, and maintained by
Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
Source: sflphone-client-kde
Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
Section: kde
Priority: optional
Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), libqt4-dev (>=4.3)
Standards-Version: 3.7.3
Package: sflphone-client-kde
Priority: optional
Architecture: any
Depends: sflphone-common (=VERSION), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
Description: KDE client for SFLphone
Provide a KDE client for SFLphone.
SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License.
SFLphone is being developed by the global community, and maintained by
Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
Source: sflphone-client-kde
Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
Section: kde
Priority: optional
Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), libqt4-dev (>=4.3)
Standards-Version: 3.7.3
Package: sflphone-client-kde
Priority: optional
Architecture: i386
Depends: sflphone-common (=VERSION), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
Replaces: sflphone
Conflicts: sflphone
Homepage: http://www.sflphone.org
Description: KDE client for SFLphone
Provide a KDE client for SFLphone.
SFLphone is meant to be a robust enterprise-class desktop phone.
SFLphone is released under the GNU General Public License.
SFLphone is being developed by the global community, and maintained by
Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
This package was debianized by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> on
Fri, 3 Apr 2009 09:47:53 -0500.
It was downloaded from the git repository of SFLphone: git://sflphone.org/git/sflphone.git
Upstream Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Copyright:
Savoir-Faire Linux Inc.
License:
This software is copyright (c) 2004-2009 Savoir-Faire Linux inc.
You are free to distribute this software under the terms of
the GNU General Public License version 3.
On Debian systems, the complete text of the GNU General Public
License can be found in the file `/usr/share/common-licenses/GPL'.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 51 Franklyn St, Fifth Floor, Boston, MA 02110-1301, USA.
#
# Regular cron jobs for the sflphone package
#
0 4 * * * root sflphone_maintenance
usr/bin
usr/share/applications
usr/share/pixmaps
usr/share/sflphone
usr/share/locale
usr/share/doc
usr/share/man
debian/sflphone-client-kde/usr/share/man/man1/sflphone.1
debian/sflphone-client-kde/usr/share/man/man1/sflphone-client-kde.1
#!/bin/sh -e
update-alternatives --install /usr/bin/sflphone sflphone /usr/bin/sflphone-client-kde 200 \
--slave /usr/share/man/man1/sflphone.1.gz sflphone.1.gz \
/usr/share/man/man1/sflphone-client-kde.1
update-alternatives --set sflphone /usr/bin/sflphone-client-kde
exit 0
#!/bin/sh
# postrm script for sflphone
#
# see: dh_installdeb(1)
set -e
package=sflphone-client-kde
case "$1" in
install|upgrade)
;;
esac