[gedit] Use gresources also for the uimanager xml.

[Paolo Borelli <pborelli src gnome org>]

commit 065a5ee30d36d24fa38c465ed70be746e1912224
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Feb 25 17:41:49 2012 +0100

    Use gresources also for the uimanager xml.

 gedit/Makefile.am         |    4 ----
 gedit/gedit-window.c      |   10 ++++------
 gedit/gedit.gresource.xml |    1 +
 3 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index a3352d6..6f50b39 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -258,10 +258,6 @@ gedit-marshal.c: gedit-marshal.list $(GLIB_GENMARSHAL)
 gedit-resources.c: gedit.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies gedit.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source gedit.gresource.xml
 
-uidir = $(datadir)/gedit/ui/
-ui_DATA = 				\
-	gedit-ui.xml
-
 if ENABLE_PYTHON
 overridesdir = $(pyoverridesdir)
 overrides_PYTHON =			\
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index f015f4d..ae1daf9 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -63,7 +63,6 @@
 #include "gedit-marshal.h"
 
 #define LANGUAGE_NONE (const gchar *)"LangNone"
-#define GEDIT_UIFILE "gedit-ui.xml"
 #define TAB_WIDTH_DATA "GeditWindowTabWidthData"
 #define LANGUAGE_DATA "GeditWindowLanguageData"
 #define FULLSCREEN_ANIMATION_SPEED 4
@@ -1513,7 +1512,6 @@ create_menu_bar_and_toolbar (GeditWindow *window,
 	GtkUIManager *manager;
 	GtkRecentManager *recent_manager;
 	GError *error = NULL;
-	gchar *ui_file;
 
 	gedit_debug (DEBUG_WINDOW);
 
@@ -1597,12 +1595,12 @@ create_menu_bar_and_toolbar (GeditWindow *window,
 	g_object_unref (action_group);
 	window->priv->panels_action_group = action_group;
 
-	/* now load the UI definition */
-	ui_file = gedit_dirs_get_ui_file (GEDIT_UIFILE);
-	gtk_ui_manager_add_ui_from_file (manager, ui_file, &error);
+	gtk_ui_manager_add_ui_from_resource (manager,
+					     "/org/gnome/gedit/ui/gedit-ui.xml",
+					     &error);
 	if (error != NULL)
 	{
-		g_warning ("Could not merge %s: %s", ui_file, error->message);
+		g_warning ("Could not add ui definition: %s", error->message);
 		g_error_free (error);
 	}
 	g_free (ui_file);
diff --git a/gedit/gedit.gresource.xml b/gedit/gedit.gresource.xml
index bb9d01e..11db256 100644
--- a/gedit/gedit.gresource.xml
+++ b/gedit/gedit.gresource.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/gedit/ui">
+    <file preprocess="xml-stripblanks">gedit-ui.xml</file>
     <file preprocess="xml-stripblanks">gedit-encodings-dialog.ui</file>
     <file preprocess="xml-stripblanks">gedit-preferences-dialog.ui</file>
     <file preprocess="xml-stripblanks">gedit-replace-dialog.ui</file>