Merge lp:~leftyfb/gstm/gstm into lp:gstm

[Mike Rushton]

added gtk_image_menu_item_set_always_show_image to show icons in the notification area dialog in the new version of gnome

[Mattias Eriksson (snaggen)]

This is needed. I didn't find out how this when I rewrote things the last time. So thanks!

review: Approve (code)

=== modified file 'src/fniface.c'
--- src/fniface.c	2009-10-29 17:45:24 +0000
+++ src/fniface.c	2010-03-19 03:03:18 +0000
@@ -469,7 +469,7 @@
   gtk_widget_show (item_tunnel);
   gtk_container_add (GTK_CONTAINER (menu), item_tunnel);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item_tunnel), img_yesno);
-  
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item_tunnel), TRUE); 
   g_signal_connect ((gpointer) item_tunnel, "activate",
                     G_CALLBACK (on_dockletmenu_tunnel_activate),
                     (gpointer)t_id);
@@ -505,6 +505,7 @@
   gtk_widget_show (item_toggle);
   gtk_container_add (GTK_CONTAINER (dmenu), item_toggle);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item_toggle), image_toggle);
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item_toggle), TRUE);
 
   separator1 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator1);
@@ -530,6 +531,7 @@
   gtk_widget_show (item_quit);
   gtk_container_add (GTK_CONTAINER (dmenu), item_quit);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item_quit), image_quit);
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item_quit), TRUE);
 
   g_signal_connect ((gpointer) item_toggle, "activate",
                     G_CALLBACK (on_dockletmenu_toggle_activate),