[gthumb] Move "Set as Desktop Background" item from "Tools" menu to right-click popup menu

[Paolo Bacchilega <paobac src gnome org>]

commit 2e7e8a4397049f34115712f3329dc464da1d47b4
Author: Christophe Bisière <bisiere univ-tlse1 fr>
Date:   Thu May 13 11:20:47 2010 +0200

    Move "Set as Desktop Background" item from "Tools" menu to right-click popup menu
    
    [bug #618430]

 extensions/desktop_background/callbacks.c |   12 +++++++++---
 gthumb/gth-browser-ui.h                   |    8 ++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/extensions/desktop_background/callbacks.c b/extensions/desktop_background/callbacks.c
index 7f420e1..7cb0d66 100644
--- a/extensions/desktop_background/callbacks.c
+++ b/extensions/desktop_background/callbacks.c
@@ -32,8 +32,13 @@
 
 static const char *fixed_ui_info =
 "<ui>"
-"  <popup name='ListToolsPopup'>"
-"    <placeholder name='Tools'>"
+"  <popup name='FileListPopup'>"
+"    <placeholder name='Screen_Actions'>"
+"      <menuitem name='DesktopBackground' action='Tool_DesktopBackground'/>"
+"    </placeholder>"
+"  </popup>"
+"  <popup name='FilePopup'>"
+"    <placeholder name='Screen_Actions'>"
 "      <menuitem name='DesktopBackground' action='Tool_DesktopBackground'/>"
 "    </placeholder>"
 "  </popup>"
@@ -82,7 +87,8 @@ db__gth_browser_construct_cb (GthBrowser *browser)
 		g_clear_error (&error);
 	}
 
-	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ListToolsPopup/Tools/DesktopBackground")), TRUE);
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/FileListPopup/Screen_Actions/DesktopBackground")), TRUE);
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/FilePopup/Screen_Actions/DesktopBackground")), TRUE);
 
 	g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free);
 }
diff --git a/gthumb/gth-browser-ui.h b/gthumb/gth-browser-ui.h
index 24b3b70..bd2a77a 100644
--- a/gthumb/gth-browser-ui.h
+++ b/gthumb/gth-browser-ui.h
@@ -162,7 +162,9 @@ static const char *fixed_ui_info =
 "    </menu>"
 "    <placeholder name='Open_Actions'/>"
 "    <separator/>"
-"    <menuitem action='View_Fullscreen'/>"
+"    <placeholder name='Screen_Actions'>"
+"      <menuitem action='View_Fullscreen'/>"
+"    </placeholder>"
 "    <separator/>"
 "    <placeholder name='File_Actions'/>"
 "    <separator/>"
@@ -178,7 +180,9 @@ static const char *fixed_ui_info =
 "    </menu>"
 "    <separator/>"
 "    <placeholder name='Open_Actions'/>"
-"    <menuitem action='View_Fullscreen'/>"
+"    <placeholder name='Screen_Actions'>"
+"      <menuitem action='View_Fullscreen'/>"
+"    </placeholder>"
 "    <separator/>"
 "    <placeholder name='File_Actions'/>"
 "    <separator/>"