[gedit] file-manager: use gresource

[Paolo Borelli <pborelli src gnome org>]

commit 2975bcb9ea88615a037f6400dfddd01d339e2169
Author: Paolo Borelli <pborelli gnome org>
Date:   Thu Mar 1 21:07:53 2012 +0100

    file-manager: use gresource

 gedit/gedit-window.c                               |    1 +
 plugins/filebrowser/Makefile.am                    |   10 +++++-----
 plugins/filebrowser/gedit-file-browser-widget.c    |   13 ++++---------
 .../filebrowser/gedit-file-browser.gresource.xml   |    6 ++++++
 4 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index 101b194..9ccb8b4 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -1602,6 +1602,7 @@ create_menu_bar_and_toolbar (GeditWindow *window,
 	{
 		g_warning ("Could not add ui definition: %s", error->message);
 		g_error_free (error);
+		return;
 	}
 
 	/* show tooltips in the statusbar */
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index 209a671..cc6178f 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
 	$(DISABLE_DEPRECATED_CFLAGS)
 
 BUILT_SOURCES = \
+	gedit-file-browser-resources.c		\
 	gedit-file-browser-enum-types.h		\
 	gedit-file-browser-enum-types.c		\
 	gedit-file-browser-marshal.h 		\
@@ -59,14 +60,13 @@ libfilebrowser_la_SOURCES = \
 libfilebrowser_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libfilebrowser_la_LIBADD = $(GEDIT_LIBS)
 
-# UI files (if you use ui for your plugin, list those files here)
-uidir = $(GEDIT_PLUGINS_DATA_DIR)/filebrowser
-ui_DATA = gedit-file-browser-widget-ui.xml
-
 plugin_in_files = filebrowser.plugin.desktop.in
 
 %.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
+gedit-file-browser-resources.c: gedit-file-browser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies gedit-file-browser.gresource.xml)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source gedit-file-browser.gresource.xml
+
 gedit-file-browser-enum-types.h: gedit-file-browser-enum-types.h.template $(NOINST_H_FILES) $(GLIB_MKENUMS)
 	(cd $(srcdir) && $(GLIB_MKENUMS) --template gedit-file-browser-enum-types.h.template $(NOINST_H_FILES)) > $@
 
@@ -96,8 +96,8 @@ update-messages:
 	$(top_srcdir)/tools/generate-message.py --output-directory $(builddir)/messages/  --gpl --program gedit $(srcdir)/messages.xml
 
 EXTRA_DIST = \
-	$(ui_DATA)					\
 	$(plugin_in_files)				\
+	gedit-file-browser.gresource.xml		\
 	gedit-file-browser-enum-types.h.template	\
 	gedit-file-browser-enum-types.c.template	\
 	gedit-file-browser-enum-register.c.template	\
diff --git a/plugins/filebrowser/gedit-file-browser-widget.c b/plugins/filebrowser/gedit-file-browser-widget.c
index 4a6271b..b04bb7d 100644
--- a/plugins/filebrowser/gedit-file-browser-widget.c
+++ b/plugins/filebrowser/gedit-file-browser-widget.c
@@ -44,7 +44,6 @@
 						      GEDIT_TYPE_FILE_BROWSER_WIDGET, \
 						      GeditFileBrowserWidgetPrivate))
 
-#define XML_UI_FILE "gedit-file-browser-widget-ui.xml"
 #define LOCATION_DATA_KEY "gedit-file-browser-widget-location"
 
 enum
@@ -902,20 +901,16 @@ create_toolbar (GeditFileBrowserWidget *obj,
 	GtkActionGroup *action_group;
 	GtkWidget *toolbar;
 	GtkAction *action;
-	gchar *ui_file;
 
 	manager = gtk_ui_manager_new ();
 	obj->priv->manager = manager;
 
-	ui_file = g_build_filename (data_dir, XML_UI_FILE, NULL);
-	gtk_ui_manager_add_ui_from_file (manager, ui_file, &error);
-
-	g_free (ui_file);
-
+	gtk_ui_manager_add_ui_from_resource (manager,
+					     "/org/gnome/gedit/plugins/file-browser/ui/gedit-file-browser-widget-ui.xml",
+					     &error);
 	if (error != NULL)
 	{
-		g_warning ("Error in adding ui from file %s: %s",
-			   XML_UI_FILE, error->message);
+		g_warning ("Could not add ui definition: %s", error->message);
 		g_error_free (error);
 		return;
 	}
diff --git a/plugins/filebrowser/gedit-file-browser.gresource.xml b/plugins/filebrowser/gedit-file-browser.gresource.xml
new file mode 100644
index 0000000..7adf4ed
--- /dev/null
+++ b/plugins/filebrowser/gedit-file-browser.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/gedit/plugins/file-browser/ui">
+    <file preprocess="xml-stripblanks">gedit-file-browser-widget-ui.xml</file>
+  </gresource>
+</gresources>