diff --git a/gtk/calllogs.c b/gtk/calllogs.c
index 71e93cc2b..efa6f1884 100644
--- a/gtk/calllogs.c
+++ b/gtk/calllogs.c
@@ -238,19 +238,9 @@ gboolean linphone_gtk_call_log_button_pressed(GtkWidget *widget, GdkEventButton
}
void linphone_gtk_call_log_clear_missed_call(){
- GtkWidget *mw=linphone_gtk_get_main_window();
- GtkNotebook *notebook=GTK_NOTEBOOK(linphone_gtk_get_widget(mw,"viewswitch"));
- GtkWidget *page=gtk_notebook_get_nth_page(notebook,0);
- GtkWidget *box=gtk_hbox_new(FALSE,0);
- GtkWidget *image=gtk_image_new_from_icon_name("linphone-history",GTK_ICON_SIZE_MENU);
- GtkWidget *l;
- const gchar*text=gtk_label_get_text(GTK_LABEL(linphone_gtk_get_widget(mw,"label3")));
-
- l=gtk_label_new(text);
- gtk_box_pack_start(GTK_BOX(box),image,FALSE,FALSE,0);
- gtk_box_pack_start(GTK_BOX(box),l,FALSE,FALSE,0);
- gtk_notebook_set_tab_label(notebook,page,box);
- gtk_widget_show_all(box);
+ GtkWidget *mw = linphone_gtk_get_main_window();
+ GtkWidget *label = linphone_gtk_get_widget(mw, "history_tab_label");
+ gtk_label_set_text(GTK_LABEL(label), _("Recent calls"));
}
gboolean linphone_gtk_call_log_reset_missed_call(GtkWidget *w, GdkEvent *event,gpointer user_data){
@@ -263,25 +253,10 @@ gboolean linphone_gtk_call_log_reset_missed_call(GtkWidget *w, GdkEvent *event,g
}
void linphone_gtk_call_log_display_missed_call(int nb){
- GtkWidget *mw=linphone_gtk_get_main_window();
- GtkNotebook *notebook=GTK_NOTEBOOK(linphone_gtk_get_widget(mw,"viewswitch"));
- GtkWidget *page=gtk_notebook_get_nth_page(notebook,0);
- GtkWidget *ebox=gtk_event_box_new();
- GtkWidget *box=gtk_hbox_new(FALSE,0);
- GtkWidget *image=gtk_image_new_from_icon_name("linphone-history",GTK_ICON_SIZE_MENU);
- GtkWidget *l;
- gchar *buf;
-
- buf=g_markup_printf_escaped(_("Recent calls (%i)"),nb);
- l=gtk_label_new(NULL);
- gtk_label_set_markup(GTK_LABEL(l),buf);
- gtk_box_pack_start(GTK_BOX(box),image,FALSE,FALSE,0);
- gtk_box_pack_start(GTK_BOX(box),l,FALSE,FALSE,0);
- gtk_container_add(GTK_CONTAINER(ebox),box);
- gtk_notebook_set_tab_label(notebook,page,ebox);
- gtk_widget_add_events(ebox,GDK_BUTTON_PRESS_MASK);
- g_signal_connect(G_OBJECT(ebox),"button_press_event",(GCallback)linphone_gtk_call_log_reset_missed_call,NULL);
- gtk_widget_show_all(ebox);
+ GtkWidget *mw = linphone_gtk_get_main_window();
+ GtkWidget *label = linphone_gtk_get_widget(mw, "history_tab_label");
+ gchar *buf = g_markup_printf_escaped(_("Recent calls (%i)"), nb);
+ gtk_label_set_markup(GTK_LABEL(label), buf);
}
void linphone_gtk_call_log_update(GtkWidget *w){
diff --git a/gtk/friendlist.c b/gtk/friendlist.c
index 036f69d20..fb0d15ed2 100644
--- a/gtk/friendlist.c
+++ b/gtk/friendlist.c
@@ -814,8 +814,6 @@ void linphone_gtk_contact_ok(GtkWidget *button){
static GtkWidget *linphone_gtk_create_contact_menu(GtkWidget *contact_list){
GtkWidget *menu=gtk_menu_new();
GtkWidget *menu_item;
- gchar *call_label=NULL;
- gchar *text_label=NULL;
gchar *edit_label=NULL;
gchar *delete_label=NULL;
gchar *delete_hist_label=NULL;
@@ -840,32 +838,12 @@ static GtkWidget *linphone_gtk_create_contact_menu(GtkWidget *contact_list){
add_contact_label=g_strdup_printf(_("Add a new contact"));
if (gtk_tree_selection_get_selected (select, &model, &iter)){
gtk_tree_model_get(model, &iter,FRIEND_NAME , &name, -1);
- call_label=g_strdup_printf(_("Call %s"),name);
- text_label=g_strdup_printf(_("Send text to %s"),name);
edit_label=g_strdup_printf(_("Edit contact '%s'"),name);
delete_label=g_strdup_printf(_("Delete contact '%s'"),name);
delete_hist_label=g_strdup_printf(_("Delete chat history of '%s'"),name);
g_free(name);
show_menu_separator=TRUE;
}
- if (call_label){
- menu_item=gtk_image_menu_item_new_with_label(call_label);
- image=gtk_image_new_from_icon_name("linphone-start-call",GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
- gtk_widget_show(image);
- gtk_widget_show(menu_item);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
- g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_call_selected,contact_list);
- }
- if (text_label){
- menu_item=gtk_image_menu_item_new_with_label(text_label);
- image=gtk_image_new_from_icon_name("linphone-start-chat",GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
- gtk_widget_show(image);
- gtk_widget_show(menu_item);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
- g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_chat_selected,contact_list);
- }
if (edit_label){
menu_item=gtk_image_menu_item_new_with_label(edit_label);
image=gtk_image_new_from_icon_name("linphone-edit",GTK_ICON_SIZE_MENU);
@@ -886,8 +864,11 @@ static GtkWidget *linphone_gtk_create_contact_menu(GtkWidget *contact_list){
}
if (delete_hist_label){
+ GtkWidget *menu_item_separator=gtk_separator_menu_item_new();
+ gtk_widget_show(menu_item_separator);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_separator);
menu_item=gtk_image_menu_item_new_with_label(delete_hist_label);
- image=gtk_image_new_from_stock(GTK_STOCK_CLEAR,GTK_ICON_SIZE_MENU);
+ image=gtk_image_new_from_icon_name("linphone-delete",GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
gtk_widget_show(image);
gtk_widget_show(menu_item);
@@ -924,8 +905,6 @@ static GtkWidget *linphone_gtk_create_contact_menu(GtkWidget *contact_list){
gtk_menu_attach_to_widget (GTK_MENU (menu), contact_list, NULL);
g_free(add_contact_label);
- if (call_label) g_free(call_label);
- if (text_label) g_free(text_label);
if (edit_label) g_free(edit_label);
if (delete_label) g_free(delete_label);
return menu;
diff --git a/gtk/main.ui b/gtk/main.ui
index ce560cd69..334773119 100644
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -15,6 +15,12 @@
False
linphone-contact-add
+