Commit 155bc0c2 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'master' into conference

parents 39a91ffa 6a9ec135
......@@ -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);
......@@ -631,6 +631,8 @@ select_audio_manager( void )
gtk_widget_show( alsa_conf );
gtk_widget_set_sensitive(GTK_WIDGET(alsa_conf), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(pa_mute_widget), FALSE);
gtk_action_set_sensitive (GTK_ACTION (volumeToggle), TRUE);
}
else if( SHOW_ALSA_CONF && gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(pulse) ))
{
......@@ -639,6 +641,13 @@ select_audio_manager( void )
gtk_container_remove( GTK_CONTAINER(alsa_conf) , alsabox );
gtk_widget_hide( alsa_conf );
gtk_widget_set_sensitive(GTK_WIDGET(pa_mute_widget), TRUE);
if (gtk_toggle_action_get_active ( GTK_TOGGLE_ACTION (volumeToggle)))
{
main_window_volume_controls(FALSE);
dbus_set_volume_controls (FALSE);
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (volumeToggle), FALSE);
}
gtk_action_set_sensitive (GTK_ACTION (volumeToggle), FALSE);
} else {
DEBUG("alsa conf panel...nothing");
}
......
......@@ -183,8 +183,7 @@ create_main_window ()
ret = uimanager_new (&ui_manager);
if (!ret)
{
//show_error_dialog (GTK_WINDOW (window), error->message,
// _("Could not load ui.xml. The program may be not properly installed"));
ERROR ("Could not load xml GUI\n");
g_error_free (error);
exit (1);
}
......
......@@ -115,10 +115,10 @@ log4c_category_t* log4c_sfl_gtk_category;
#define __POPUP_WINDOW ( dbus_popup_mode() )
/** Show/Hide the dialpad */
#define SHOW_DIALPAD ( dbus_get_dialpad() )
/** Show/Hide the volume controls */
#define SHOW_VOLUME ( dbus_get_volume_controls() )
/** Show/Hide the alsa configuration panel */
#define SHOW_ALSA_CONF ( dbus_get_audio_manager() == ALSA )
/** Show/Hide the volume controls */
#define SHOW_VOLUME (dbus_get_volume_controls() && SHOW_ALSA_CONF)
/** Audio Managers */
#define ALSA 0
......
......@@ -29,6 +29,7 @@
<menuitem action="Toolbar"/>
<separator/>
<menuitem action="Dialpad"/>
<!--menuitem name="VolumeControlsToggle" action="VolumeControls"/-->
<menuitem action="VolumeControls"/>
<separator/>
<menuitem action="CallWindow"/>
......
......@@ -350,15 +350,18 @@ void update_actions()
static void volume_bar_cb (GtkToggleAction *togglemenuitem, gpointer user_data)
{
gboolean toggled = gtk_toggle_action_get_active (togglemenuitem);
g_print ("%i\n", toggled);
main_window_volume_controls(toggled);
dbus_set_volume_controls(toggled);
if (toggled || SHOW_VOLUME)
dbus_set_volume_controls(toggled);
}
static void dialpad_bar_cb (GtkToggleAction *togglemenuitem, gpointer user_data)
{
gboolean toggled = gtk_toggle_action_get_active (togglemenuitem);
main_window_dialpad(toggled);
dbus_set_dialpad(toggled);
if (toggled || SHOW_DIALPAD)
dbus_set_dialpad(toggled);
}
static void help_contents_cb (GtkAction *action)
......@@ -1353,13 +1356,16 @@ GtkWidget* create_menus (GtkUIManager *ui_manager)
recordAction = gtk_ui_manager_get_action (ui_manager, "/MenuBar/CallMenu/Record");
copyAction = gtk_ui_manager_get_action (ui_manager, "/MenuBar/EditMenu/Copy");
pasteAction = gtk_ui_manager_get_action (ui_manager, "/MenuBar/EditMenu/Paste");
volumeToggle = gtk_ui_manager_get_action (ui_manager, "/MenuBar/ViewMenu/VolumeControls");
// Set the toggle buttons
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (ui_manager, "/MenuBar/ViewMenu/Dialpad")), (gboolean)SHOW_DIALPAD);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (ui_manager, "/MenuBar/ViewMenu/VolumeControls")), (gboolean) SHOW_VOLUME);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (ui_manager, "/MenuBar/ViewMenu/Dialpad")), (gboolean) SHOW_DIALPAD);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (volumeToggle), (gboolean) SHOW_VOLUME);
gtk_action_set_sensitive (GTK_ACTION (volumeToggle), SHOW_ALSA_CONF);
// GtkWidget * newCallMenu;
// Disable it right now
gtk_action_set_sensitive (GTK_ACTION (gtk_ui_manager_get_action (ui_manager, "/MenuBar/ViewMenu/Toolbar")), FALSE);
waitingLayer = create_waiting_icon ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), waitingLayer);
......
......@@ -30,6 +30,8 @@ GtkWidget *historyButton;
GtkWidget *contactButton;
GtkWidget *currentCallsButton;
GtkAction *volumeToggle;
gboolean uimanager_new (GtkUIManager**);
G_END_DECLS
......
......@@ -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.
Markdown is supported
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