diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c index 228fee2003d01d46e92f4bb5c98a31a4cb943a30..5a3146c08107a5510cec52ae02c36b95f41a1686 100644 --- a/sflphone-gtk/src/actions.c +++ b/sflphone-gtk/src/actions.c @@ -744,7 +744,6 @@ sflphone_place_call ( call_t * c ) } // Update history c->history_state = OUTGOING; - c->from; call_list_add(history, c); } } diff --git a/sflphone-gtk/src/calllist.c b/sflphone-gtk/src/calllist.c index b77b840d19b664a7a7f6c6741eed10bfe7873641..dc8d80debef3e9a85697261e488f9f0cc7af0479 100644 --- a/sflphone-gtk/src/calllist.c +++ b/sflphone-gtk/src/calllist.c @@ -21,7 +21,7 @@ #include <calltree.h> #include <dbus.h> -#include <string.h> +#include <glib/gprintf.h> /* * GQueue * callQueue = NULL; @@ -33,7 +33,7 @@ gint is_callID_callstruct ( gconstpointer a, gconstpointer b) { call_t * c = (call_t*)a; - if(strcmp(c->callID, (const gchar*) b) == 0) + if(g_strcasecmp(c->callID, (const gchar*) b) == 0) { return 0; } diff --git a/sflphone-gtk/src/calltree.c b/sflphone-gtk/src/calltree.c index 9b9446939a84df195ae3dcbb780a7b36e1888905..1092acc8c244c8020a5180c36033b1c0062df1ee 100644 --- a/sflphone-gtk/src/calltree.c +++ b/sflphone-gtk/src/calltree.c @@ -285,7 +285,7 @@ void create_new_entry_in_contactlist (gchar *contact_name, gchar *contact_phone, call_t *new_call; /* Check if the information is valid */ - if (strcmp (contact_phone, EMPTY_ENTRY) != 0){ + if (g_strcasecmp (contact_phone, EMPTY_ENTRY) != 0){ from = g_strconcat("\"" , contact_name, "\"<", contact_phone, ">", NULL); create_new_call (from, from, CALL_STATE_DIALING, "", &new_call); new_call->contact_type = type; diff --git a/sflphone-gtk/src/calltree.h b/sflphone-gtk/src/calltree.h index 7fc292b61cea33a8d44f4d5f1083b1811b113d61..7fd46fd57e7dbfa2aa608a3d00628531741ae65d 100644 --- a/sflphone-gtk/src/calltree.h +++ b/sflphone-gtk/src/calltree.h @@ -80,4 +80,6 @@ void switch_tab( calltab_t* tab ); void refresh_tab( calltab_t* tab ); +void create_new_entry_in_contactlist (gchar *contact_name, gchar *contact_phone, contact_type_t type); + #endif diff --git a/sflphone-gtk/src/contactlist/eds.c b/sflphone-gtk/src/contactlist/eds.c index 19404ce5856c0304f0509151f44c93c5067f67ea..6a9cfc86139bca151722ca92d65144b43b341ea9 100644 --- a/sflphone-gtk/src/contactlist/eds.c +++ b/sflphone-gtk/src/contactlist/eds.c @@ -26,6 +26,7 @@ #include <glib.h> #include <glib/gstring.h> +#include <string.h> #include <pango/pango.h> #include "eds.h" @@ -153,7 +154,6 @@ search_sync (const char *query, GSList *iter = NULL; GList *contacts = NULL; GList *hits = NULL; - char ext[30]; EBookQuery* book_query = create_query (query); for (iter = books; iter != NULL; iter = iter->next) { diff --git a/sflphone-gtk/src/menus.c b/sflphone-gtk/src/menus.c index 3ddd0264d7ee518378e3e0347cbfb86921cd0dd0..afc320db9322c993f93610002cadc8721e32bb52 100644 --- a/sflphone-gtk/src/menus.c +++ b/sflphone-gtk/src/menus.c @@ -323,9 +323,7 @@ create_call_menu() NULL); gtk_widget_show (menu_items); - image = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_RECORD); - recordMenu = gtk_image_menu_item_new_with_mnemonic(_("_Record")); - gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM ( recordMenu ), image ); + recordMenu = gtk_image_menu_item_new_from_stock (GTK_STOCK_MEDIA_RECORD, get_accel_group()); gtk_menu_shell_append (GTK_MENU_SHELL (menu), recordMenu); gtk_widget_set_sensitive( GTK_WIDGET(recordMenu), FALSE); g_signal_connect_swapped (G_OBJECT (recordMenu), "activate", @@ -810,9 +808,7 @@ show_popup_menu (GtkWidget *my_widget, GdkEventButton *event) if(record) { - menu_items = gtk_image_menu_item_new_with_mnemonic(_("_Record")); - image = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_RECORD); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_items), image); + menu_items = gtk_image_menu_item_new_from_stock( GTK_STOCK_MEDIA_RECORD, get_accel_group()); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items); g_signal_connect (G_OBJECT (menu_items), "activate", G_CALLBACK (call_record),