diff --git a/sflphone-client-gnome/src/callable_obj.c b/sflphone-client-gnome/src/callable_obj.c
index 09a83d4776041e906896812878d3fe04034427fc..15dc04fd01e12e18dbe731d41f251540529f4d9c 100644
--- a/sflphone-client-gnome/src/callable_obj.c
+++ b/sflphone-client-gnome/src/callable_obj.c
@@ -58,12 +58,9 @@ gchar* call_get_peer_name (const gchar *format)
if (!end) {
return g_strndup (format, 0);
} else {
- name = format;
+ name = g_strdup (format);
return g_strndup(name, end - name);
}
-
-
-
}
gchar* call_get_peer_number (const gchar *format)
diff --git a/sflphone-client-gnome/src/conference_obj.c b/sflphone-client-gnome/src/conference_obj.c
index 52e31bff503118de5b38fde2f2fcefc375a72328..c0ab255d6266c479ab0bc04da76795be62da6c2f 100644
--- a/sflphone-client-gnome/src/conference_obj.c
+++ b/sflphone-client-gnome/src/conference_obj.c
@@ -38,7 +38,6 @@ void create_new_conference (conference_state_t state, const gchar* confID, confe
{
conference_obj_t *obj;
- gchar *conf_id;
// Allocate memory
obj = g_new0 (conference_obj_t, 1);
@@ -47,8 +46,7 @@ void create_new_conference (conference_state_t state, const gchar* confID, confe
obj->_state = state;
// Set the ID field
- conf_id = confID;
- obj->_confID = g_strdup (conf_id);
+ obj->_confID = g_strdup (confID);
*new_conf = obj;
}
diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
index 6ad988afee76a721baacdcc5dfb8283467586b5d..a63ca9f936aa17abfc4f2b809c1c4bd82cd55e97 100644
--- a/sflphone-client-gnome/src/config/accountconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -710,7 +710,7 @@ GtkWidget * create_advanced_tab(account_t **a)
GtkTreeIter current_local_address_iter = iter;
gchar ** iface_list = NULL;
- iface_list = (gchar **)dbus_get_all_ip_interface();
+ iface_list = (gchar**) dbus_get_all_ip_interface();
gchar ** iface = NULL;
if (iface_list != NULL) {
diff --git a/sflphone-client-gnome/src/config/assistant.c b/sflphone-client-gnome/src/config/assistant.c
index 59e7c94173f69e99381d5267af9d2c0c31ec1ebf..1f62ab5617eb47816479acaebfeac86027af2821 100644
--- a/sflphone-client-gnome/src/config/assistant.c
+++ b/sflphone-client-gnome/src/config/assistant.c
@@ -63,7 +63,7 @@ void set_account_type( GtkWidget* widget , gpointer data UNUSED ) {
* Fills string message with the final message of account registration
* with alias, server and username specified.
*/
-void getMessageSummary( char * message , const gchar * alias, const gchar * server, const gchar * username, const gchar * zrtp)
+void getMessageSummary( char * message , const gchar * alias, const gchar * server, const gchar * username, const gboolean zrtp)
{
char var[64];
sprintf( message, _("This assistant is now finished."));
@@ -153,7 +153,7 @@ static void sip_apply_callback( void ) {
gtk_entry_get_text (GTK_ENTRY(wiz->sip_alias)),
gtk_entry_get_text (GTK_ENTRY(wiz->sip_server)),
gtk_entry_get_text (GTK_ENTRY(wiz->sip_username)),
- (gchar *)(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wiz->zrtp_enable)))
+ (gboolean)(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wiz->zrtp_enable)))
);
gtk_label_set_text (GTK_LABEL(wiz->label_summary), message);
@@ -179,7 +179,7 @@ static void iax_apply_callback( void ) {
gtk_entry_get_text (GTK_ENTRY(wiz->iax_alias)),
gtk_entry_get_text (GTK_ENTRY(wiz->iax_server)),
gtk_entry_get_text (GTK_ENTRY(wiz->iax_username)),
- (gchar *) _("None")
+ FALSE
) ;
gtk_label_set_text (GTK_LABEL(wiz->label_summary), message);
diff --git a/sflphone-client-gnome/src/config/zrtpadvanceddialog.c b/sflphone-client-gnome/src/config/zrtpadvanceddialog.c
index c0e17440e493e8d0447c10ef0a56bc4fd3b67e34..b055e0de41ad37998c1e43739950e6f166e2db73 100644
--- a/sflphone-client-gnome/src/config/zrtpadvanceddialog.c
+++ b/sflphone-client-gnome/src/config/zrtpadvanceddialog.c
@@ -46,14 +46,15 @@ void show_advanced_zrtp_options(GHashTable * properties)
curDisplaySasOnce = g_hash_table_lookup(properties, ACCOUNT_DISPLAY_SAS_ONCE);
}
- securityDialog = GTK_DIALOG(gtk_dialog_new_with_buttons (_("ZRTP Options"),
- GTK_WINDOW(get_main_window()),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE,
- GTK_RESPONSE_ACCEPT,
- NULL));
+ securityDialog = GTK_DIALOG (gtk_dialog_new_with_buttons ( _("ZRTP Options"),
+ GTK_WINDOW (get_main_window()),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ GTK_STOCK_SAVE,
+ GTK_RESPONSE_ACCEPT,
+ NULL)
+ );
gtk_window_set_policy( GTK_WINDOW(securityDialog), FALSE, FALSE, FALSE );
gtk_dialog_set_has_separator(securityDialog, TRUE);
gtk_container_set_border_width (GTK_CONTAINER(securityDialog), 0);
diff --git a/sflphone-client-gnome/src/mainwindow.c b/sflphone-client-gnome/src/mainwindow.c
index c39d26eb2015f8dad349f76f3bc92985415365cb..adf556f326783aecd412b262fd7236bff71d1f62 100644
--- a/sflphone-client-gnome/src/mainwindow.c
+++ b/sflphone-client-gnome/src/mainwindow.c
@@ -195,19 +195,13 @@ create_main_window ()
vbox = gtk_vbox_new ( FALSE /*homogeneous*/, 0 /*spacing*/);
subvbox = gtk_vbox_new ( FALSE /*homogeneous*/, 5 /*spacing*/);
- widget = create_menus (ui_manager);
+ create_menus (ui_manager, &widget);
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
- widget = create_toolbar_actions (ui_manager);
+ create_toolbar_actions (ui_manager, &widget);
// Do not override GNOME user settings
- // gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH);
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
- widget = create_toolbar_windows (ui_manager);
- // Do not override GNOME user settings
- //gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_ICONS);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
-
gtk_box_pack_start (GTK_BOX (vbox), current_calls->tree, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
gtk_box_pack_start (GTK_BOX (vbox), history->tree, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
gtk_box_pack_start (GTK_BOX (vbox), contacts->tree, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
@@ -430,7 +424,7 @@ main_window_confirm_go_clear(callable_obj_t * c)
PidginMiniDialog *mini_dialog;
gchar *desc = g_markup_printf_escaped(_("%s wants to stop using secure communication. Confirm will resume conversation without SRTP.\n"), c->_peer_number);
mini_dialog = pidgin_mini_dialog_new(_("Confirm Go Clear"), desc, GTK_STOCK_STOP);
- pidgin_mini_dialog_add_button(mini_dialog, _("Confirm"), sflphone_set_confirm_go_clear, NULL);
+ pidgin_mini_dialog_add_button(mini_dialog, _("Confirm"), (PidginMiniDialogCallback)sflphone_set_confirm_go_clear, NULL);
pidgin_mini_dialog_add_button(mini_dialog, _("Stop Call"), sflphone_hang_up, NULL);
add_error_dialog(GTK_WIDGET(mini_dialog), c);
diff --git a/sflphone-client-gnome/src/ui.xml b/sflphone-client-gnome/src/ui.xml
index e420b8e27025b25d873a49deba644d7cd42e534c..23469a1e7d056de949580b3097f632d749398baf 100644
--- a/sflphone-client-gnome/src/ui.xml
+++ b/sflphone-client-gnome/src/ui.xml
@@ -56,9 +56,4 @@
<toolitem name="HistoryToolbar" action="History"/>
<toolitem name="AddressbookToolbar" action="Addressbook"/>
</toolbar>
-
- <toolbar name="ToolbarWindows">
- <!--toolitem name="CallWindowToolbar" action="CallWindow"/-->
- </toolbar>
-
</ui>
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index baffda85309731b09d4ff4743eb40ffafc435a8d..48b740f2f20f0e8223913f4e99aef19a4463e1a2 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -1283,7 +1283,7 @@ GtkWidget* create_waiting_icon()
return waiting_icon;
}
-GtkWidget* create_menus (GtkUIManager *ui_manager)
+void create_menus (GtkUIManager *ui_manager, GtkWidget **widget)
{
GtkWidget * menu_bar;
@@ -1310,10 +1310,10 @@ GtkWidget* create_menus (GtkUIManager *ui_manager)
waitingLayer = create_waiting_icon ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), waitingLayer);
- return menu_bar;
+ *widget = menu_bar;
}
-GtkWidget* create_toolbar_actions (GtkUIManager *ui_manager)
+void create_toolbar_actions (GtkUIManager *ui_manager, GtkWidget **widget)
{
toolbar = gtk_ui_manager_get_widget (ui_manager, "/ToolbarActions");
@@ -1328,19 +1328,10 @@ GtkWidget* create_toolbar_actions (GtkUIManager *ui_manager)
recordWidget = gtk_ui_manager_get_widget (ui_manager, "/ToolbarActions/RecordToolbar");
historyButton = gtk_ui_manager_get_widget (ui_manager, "/ToolbarActions/HistoryToolbar");
contactButton = gtk_ui_manager_get_widget (ui_manager, "/ToolbarActions/AddressbookToolbar");
- //currentCallsButton = gtk_ui_manager_get_widget (ui_manager, "/ToolbarActions/CallWindowToolbar");
// Set the handler ID for the transfer
transfertButtonConnId = g_signal_connect (G_OBJECT (transferToolbar), "toggled", G_CALLBACK (call_transfer_cb), NULL);
active_calltree = current_calls;
- return toolbar;
-}
-
-GtkWidget* create_toolbar_windows (GtkUIManager *ui_manager)
-{
- toolbarWindows = gtk_ui_manager_get_widget (ui_manager, "/ToolbarWindows");
- active_calltree = current_calls;
-
- return toolbarWindows;
+ *widget = toolbar;
}