Skip to content

GitLab

Commit b0256c5e authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'jbonjean'

parents 617f5c9f 6e8baecb
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ b0256c5e
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
*.m4 *.m4
*.Tpo *.Tpo
Makefile.in Makefile.in
*.spec
/config.* /config.*
*.swp *.swp
*.so *.so
......
sflphone-client-gnome/src/accountlist.h
View file @ b0256c5e
...@@ -67,7 +67,7 @@ typedef struct { ...@@ -67,7 +67,7 @@ typedef struct {
gchar * accountID; gchar * accountID;
account_state_t state; account_state_t state;
gchar * protocol_state_description; gchar * protocol_state_description;
guint * protocol_state_code; guint protocol_state_code;
GHashTable * properties; GHashTable * properties;
GPtrArray * credential_information; GPtrArray * credential_information;
} account_t; } account_t;
......
sflphone-client-gnome/src/actions.c
View file @ b0256c5e
...@@ -1099,7 +1099,7 @@ sflphone_fill_codec_list() ...@@ -1099,7 +1099,7 @@ sflphone_fill_codec_list()
for(pl=codecs; *codecs; codecs++) for(pl=codecs; *codecs; codecs++)
{ {
details = (gchar **)dbus_codec_details(atoi(*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. // does nothing - the codec is already in the list, so is active.
} }
else{ else{
...@@ -1169,7 +1169,7 @@ void sflphone_fill_conference_list(void) ...@@ -1169,7 +1169,7 @@ void sflphone_fill_conference_list(void)
c = g_new0(conference_obj_t, 1); c = g_new0(conference_obj_t, 1);
conf_id = (gchar*)(*conferences); 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); create_new_call_from_details (conf_id, conference_details, &c);
c->_confID = g_strdup(conf_id); c->_confID = g_strdup(conf_id);
......
sflphone-client-gnome/src/callable_obj.c
View file @ b0256c5e
...@@ -165,7 +165,7 @@ void create_history_entry_from_serialized_form (gchar *timestamp, gchar *details ...@@ -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 // 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 { do {
switch (token) switch (token)
{ {
...@@ -188,7 +188,7 @@ void create_history_entry_from_serialized_form (gchar *timestamp, gchar *details ...@@ -188,7 +188,7 @@ void create_history_entry_from_serialized_form (gchar *timestamp, gchar *details
break; break;
} }
token ++; token ++;
} while ((ptr = strtok(NULL, delim)) != NULL); } while ((ptr = g_strsplit(NULL, delim, 0)) != NULL);
} }
if (g_strcasecmp (peer_name, "empty") == 0) if (g_strcasecmp (peer_name, "empty") == 0)
......
sflphone-client-gnome/src/codeclist.c
View file @ b0256c5e
...@@ -103,7 +103,7 @@ codec_list_get_by_name( const gchar* name) ...@@ -103,7 +103,7 @@ codec_list_get_by_name( const gchar* name)
} }
codec_t* 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); GList * c = g_queue_find_custom(codecQueue, payload, is_payload_codecstruct);
if(c) if(c)
......
sflphone-client-gnome/src/codeclist.h
View file @ b0256c5e
...@@ -117,6 +117,6 @@ void codec_list_move_codec_down(guint index); ...@@ -117,6 +117,6 @@ void codec_list_move_codec_down(guint index);
*/ */
void codec_list_update_to_daemon(); 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 #endif
sflphone-client-gnome/src/config/accountconfigdialog.c
View file @ b0256c5e
...@@ -710,7 +710,7 @@ GtkWidget * create_advanced_tab(account_t **a) ...@@ -710,7 +710,7 @@ GtkWidget * create_advanced_tab(account_t **a)
GtkTreeIter current_local_address_iter = iter; GtkTreeIter current_local_address_iter = iter;
gchar ** iface_list = NULL; gchar ** iface_list = NULL;
iface_list = dbus_get_all_ip_interface(); iface_list = (gchar **)dbus_get_all_ip_interface();
gchar ** iface = NULL; gchar ** iface = NULL;
if (iface_list != NULL) { if (iface_list != NULL) {
......
sflphone-client-gnome/src/config/audioconf.c
View file @ b0256c5e
...@@ -396,11 +396,11 @@ codec_active_toggled(GtkCellRendererToggle *renderer UNUSED, gchar *path, gpoint ...@@ -396,11 +396,11 @@ codec_active_toggled(GtkCellRendererToggle *renderer UNUSED, gchar *path, gpoint
// codec_list_get_by_name(name); // codec_list_get_by_name(name);
if ((g_strcasecmp(name,"speex")==0) && (g_strcasecmp(srate,"8 kHz")==0)) 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)) 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)) 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 else
codec = codec_list_get_by_name(name); codec = codec_list_get_by_name(name);
......
sflphone-common/libs/pjproject/Makefile
View file @ b0256c5e
...@@ -70,7 +70,6 @@ xhdrid: ...@@ -70,7 +70,6 @@ xhdrid:
cp /tmp/id $$f; \ cp /tmp/id $$f; \
done done
prefix = /usr/local
install: install:
mkdir -p $(DESTDIR)$(prefix)/lib mkdir -p $(DESTDIR)$(prefix)/lib
cp -L $$(find . -name '*.a') $(DESTDIR)$(prefix)/lib cp -L $$(find . -name '*.a') $(DESTDIR)$(prefix)/lib
......
sflphone-common/src/sip/sipvoiplink.cpp
View file @ b0256c5e
...@@ -3668,7 +3668,7 @@ std::vector<std::string> SIPVoIPLink::getAllIpInterface (void) ...@@ -3668,7 +3668,7 @@ std::vector<std::string> SIPVoIPLink::getAllIpInterface (void)
_debug ("Local interface %s\n", tmpAddr); _debug ("Local interface %s\n", tmpAddr);
} }
return ifaceList; return ifaceList;
} }
......
tools/build-system/launchpad/debian-sflphone-client-gnome/control 0 → 100644
View file @ b0256c5e
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.
tools/build-system/launchpad/debian-sflphone-client-gnome/control.hardy 0 → 100644
View file @ b0256c5e
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.
tools/build-system/launchpad/debian-sflphone-client-gnome/control.intrepid 0 → 100644
View file @ b0256c5e
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.
tools/build-system/launchpad/debian-sflphone-client-gnome/copyright 0 → 100644
View file @ b0256c5e
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.
tools/build-system/launchpad/debian-sflphone-client-gnome/cron.d 0 → 100644
View file @ b0256c5e
#
# Regular cron jobs for the sflphone package
#
0 4 * * * root sflphone_maintenance
tools/build-system/launchpad/debian-sflphone-client-gnome/dirs 0 → 100644
View file @ b0256c5e
usr/bin
usr/share/applications
usr/share/pixmaps
usr/share/sflphone
usr/share/locale
usr/share/doc
usr/share/man
tools/build-system/launchpad/debian-sflphone-client-gnome/manpages 0 → 100644
View file @ b0256c5e
debian/sflphone-client-gnome/usr/share/man/man1/sflphone-client-gnome.1
debian/sflphone-client-gnome/usr/share/man/man1/sflphone.1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment