[eog/wip/gaction-migration] Stop trying to build menus with GtkUIManager



commit d87f0a29e72d378b32d9ce5f20e48c6946e94a3f
Author: Felix Riemann <friemann gnome org>
Date:   Thu Dec 18 18:27:41 2014 +0100

    Stop trying to build menus with GtkUIManager

 data/eog-ui.xml       |   39 ---------------------------------------
 src/eog-window.c      |   11 ++++-------
 src/eog.gresource.xml |    1 -
 3 files changed, 4 insertions(+), 47 deletions(-)
---
diff --git a/src/eog-window.c b/src/eog-window.c
index 9b01bdd..bf4f76b 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -938,6 +938,7 @@ open_with_launch_application_cb (GAction *action, gpointer data) {
 static void
 eog_window_update_openwith_menu (EogWindow *window, EogImage *image)
 {
+#if 0
        gboolean edit_button_active;
        GAppInfo *editor_app;
        GFile *file;
@@ -1069,6 +1070,7 @@ eog_window_update_openwith_menu (EogWindow *window, EogImage *image)
         if (action != NULL) {
                 g_simple_action_set_enabled (action, edit_button_active);
         }
+#endif
 }
 
 static void
@@ -4413,13 +4415,6 @@ eog_window_construct_ui (EogWindow *window)
        gtk_widget_show (priv->box);
        priv->ui_mgr = gtk_ui_manager_new ();
 
-       if (!gtk_ui_manager_add_ui_from_resource (priv->ui_mgr,
-                                                 "/org/gnome/eog/ui/eog-ui.xml",
-                                                 &error)) {
-                g_warning ("building menus failed: %s", error->message);
-                g_error_free (error);
-        }
-
        /*gtk_window_add_accel_group (GTK_WINDOW (window),
                                    gtk_ui_manager_get_accel_group (priv->ui_mgr));*/
 
@@ -4429,9 +4424,11 @@ eog_window_construct_ui (EogWindow *window)
                          G_CALLBACK (eog_window_recent_manager_changed_cb),
                          window);
 
+#if 0
        eog_window_update_recent_files_menu (window);
 
        gtk_ui_manager_insert_action_group (priv->ui_mgr, priv->actions_recent, 0);
+#endif
 
        priv->cbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
        gtk_box_pack_start (GTK_BOX (priv->box), priv->cbox, TRUE, TRUE, 0);
diff --git a/src/eog.gresource.xml b/src/eog.gresource.xml
index 5388ce2..bfe4fa8 100644
--- a/src/eog.gresource.xml
+++ b/src/eog.gresource.xml
@@ -7,7 +7,6 @@
     <file compressed="true" preprocess="xml-stripblanks">eog-multiple-save-as-dialog.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">eog-preferences-dialog.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">eog-view-popup.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">eog-ui.xml</file>
     <file compressed="true" preprocess="xml-stripblanks">fullscreen-toolbar.ui</file>
   </gresource>
 </gresources>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]