Fixed merge side effects, factorisation

sflphone-gtk/src/menus.c

@@ -163,6 +163,20 @@ create_help_menu()
 
   return root_menu;
 }
+/* ----------------------------------------------------------------- */
+  GtkWidget *
+create_waiting_icon()
+{
+  GtkWidget * waiting_icon;
+  waiting_icon = gtk_image_menu_item_new_with_label("");
+  gtk_image_menu_item_set_image (
+        GTK_IMAGE_MENU_ITEM(waiting_icon),
+        gtk_image_new_from_animation(
+            gdk_pixbuf_animation_new_from_file(ICONS_DIR "/wait-on.gif", NULL)));
+  gtk_menu_item_set_right_justified(GTK_MENU_ITEM(waiting_icon),TRUE);
+
+  return waiting_icon;
+}
 /* ----------------------------------------------------------------- */
   static void
 call_new_call ( void * foo UNUSED)
@@ -686,8 +700,8 @@ create_menus ( )
   root_menu = create_help_menu();
   gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), root_menu);
 
-  waitingLayer = gtk_image_menu_item_new_with_label("");
-  gtk_menu_item_set_right_justified(GTK_MENU_ITEM(waitingLayer),TRUE);
+  // Create waiting icon
+  waitingLayer = create_waiting_icon();
   gtk_menu_shell_append(GTK_MENU_SHELL (menu_bar),waitingLayer);
 
   return menu_bar;

sflphone-gtk/src/searchfilter.c

@@ -172,13 +172,7 @@ GtkWidget* create_filter_entry_contact() {
 
     gtk_box_pack_start(GTK_BOX(ret), filter_entry_contact, TRUE, TRUE, 0);
 
-    // Create waiting icon
-    waitingPixOn = gdk_pixbuf_animation_new_from_file(ICONS_DIR "/wait-on.gif", NULL);
-    // waitingPixOff = gdk_pixbuf_new_from_file(ICONS_DIR "/wait-off.gif", NULL);
-    gtk_image_menu_item_set_image (waitingLayer,GTK_IMAGE(gtk_image_new_from_animation(waitingPixOn)));
-
     return ret;
-
 }
 
 
@@ -199,16 +193,7 @@ GtkWidget* create_filter_entry_history() {
 
     gtk_box_pack_start(GTK_BOX(ret), filter_entry_history, TRUE, TRUE, 0);
 
-    // Create waiting icon
-    //waitingPixOn = gdk_pixbuf_animation_new_from_file(ICONS_DIR "/wait-on.gif", NULL);
-    //waitingPixOff = gdk_pixbuf_new_from_file(ICONS_DIR "/wait-off.gif", NULL);
-    //waitingLayer = gtk_image_new_from_pixbuf(waitingPixOff);
-
-    //gtk_box_pack_end(GTK_BOX(ret), waitingLayer, TRUE, TRUE, 0);
-
-
     return ret;
-
 }
 
 void activateWaitingLayer() {

sflphone-gtk/src/searchfilter.h

@@ -27,9 +27,6 @@
 #include <libsexy/sexy-icon-entry.h>
 
 
-
-GdkPixbufAnimation *waitingPixOn;
-
 GdkPixbuf *waitingPixOff;
 
 GtkTreeModel* create_filter(GtkTreeModel* child);