[gnome-panel] fish: Convert to GResource

[Vincent Untz <vuntz src gnome org>]

commit 5478111b1fc676fc1d97a76911f0c33a7aa2e8c2
Author: Vincent Untz <vuntz gnome org>
Date:   Thu Feb 2 12:05:20 2012 +0100

    fish: Convert to GResource

 applets/fish/Makefile.am        |   27 +++++++++++++++++----------
 applets/fish/fish.c             |   18 +++++-------------
 applets/fish/fish.gresource.xml |    7 +++++++
 3 files changed, 29 insertions(+), 23 deletions(-)
---
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 4b8912b..b41a364 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -6,13 +6,13 @@ AM_CPPFLAGS =							\
 	-I$(top_builddir)/libpanel-applet			\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DFISH_ICONDIR=\""$(fishbitmapsdir)"\"			\
-	-DFISH_BUILDERDIR=\""$(uidir)"\"			\
-	-DFISH_MENU_UI_DIR=\""$(xmluidir)"\" 			\
 	$(DISABLE_DEPRECATED_CFLAGS)
 
 AM_CFLAGS = $(WARN_CFLAGS)
 
-FISH_SOURCES = fish.c
+FISH_SOURCES = 		\
+	fish.c		\
+	$(BUILT_SOURCES)
 
 FISH_LDADD =						\
 	../../libpanel-applet/libpanel-applet-4.la	\
@@ -76,20 +76,27 @@ fishbitmaps_DATA = 	\
 	monkey.fish	\
 	monkey.png
 
-uidir		= $(datadir)/gnome-panel/ui
-ui_DATA		= fish.ui
+ui_FILES = 		\
+	fish.ui		\
+	fish-menu.xml
 
-xmluidir 	= $(datadir)/gnome-panel/ui
-xmlui_DATA	= fish-menu.xml
+fish-resources.c: fish.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies fish.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fish $(srcdir)/$<
+
+fish-resources.h: fish.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies fish.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fish $(srcdir)/$<
+
+BUILT_SOURCES = 		\
+	fish-resources.c	\
+	fish-resources.h
 
 EXTRA_DIST =						\
 	wanda.svg					\
 	$(fishbitmaps_DATA)				\
 	org.gnome.panel.FishApplet.panel-applet.in.in	\
 	$(service_in_files)				\
-	$(ui_DATA)					\
-	$(xmlui_DATA)
+	$(ui_FILES)
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
+CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index 4240dd4..fcafb06 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -47,6 +47,7 @@
 			   FISH_TYPE_APPLET))
 
 #define FISH_ICON "gnome-panel-fish"
+#define FISH_RESOURCE_PATH "/org/gnome/panel/applet/fish/"
 
 #define FISH_SCHEMA      "org.gnome.gnome-panel.applet.fish"
 #define FISH_NAME_KEY    "name"
@@ -264,7 +265,6 @@ display_preferences_dialog (GtkAction  *action,
 			    FishApplet *fish)
 {
 	GtkBuilder *builder;
-	GError     *error;
 	GtkWidget  *box;
 	GtkWidget  *name_entry;
 	GtkWidget  *command_entry;
@@ -281,14 +281,7 @@ display_preferences_dialog (GtkAction  *action,
 
 	builder = gtk_builder_new ();
 	gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
-
-	error = NULL;
-	gtk_builder_add_from_file (builder, FISH_BUILDERDIR "/fish.ui", &error);
-	if (error) {
-		g_warning ("Error loading preferences: %s", error->message);
-		g_error_free (error);
-		return;
-	}
+	gtk_builder_add_from_resource (builder, FISH_RESOURCE_PATH "fish.ui", NULL);
 
 	fish->preferences_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "fish_preferences_dialog"));
 
@@ -1442,7 +1435,6 @@ fish_applet_fill (FishApplet *fish)
 	PanelApplet    *applet = (PanelApplet *) fish;
 	GtkActionGroup *action_group;
 	GtkAction      *action;
-	gchar          *ui_path;
 
 	fish->orientation = panel_applet_get_orient (applet);
 
@@ -1460,9 +1452,9 @@ fish_applet_fill (FishApplet *fish)
 				      fish_menu_verbs,
 				      G_N_ELEMENTS (fish_menu_verbs),
 				      fish);
-	ui_path = g_build_filename (FISH_MENU_UI_DIR, "fish-menu.xml", NULL);
-	panel_applet_setup_menu_from_file (applet, ui_path, action_group);
-	g_free (ui_path);
+	panel_applet_setup_menu_from_resource (applet,
+					       FISH_RESOURCE_PATH "fish-menu.xml",
+					       action_group);
 
 	action = gtk_action_group_get_action (action_group, "FishPreferences");
 	g_object_bind_property (applet, "locked-down",
diff --git a/applets/fish/fish.gresource.xml b/applets/fish/fish.gresource.xml
new file mode 100644
index 0000000..9261e09
--- /dev/null
+++ b/applets/fish/fish.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/panel/applet/fish">
+    <file compressed="true">fish.ui</file>
+    <file compressed="true">fish-menu.xml</file>
+  </gresource>
+</gresources>