[totem] grilo: Use GResource for grilo.ui as well

[Bastien Nocera <hadess src gnome org>]

commit 5f138b8e49421beef197335a4892186870e32315
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jan 15 01:30:17 2014 +0100

    grilo: Use GResource for grilo.ui as well

 src/plugins/grilo/Makefile.am         |    8 ++------
 src/plugins/grilo/grilo.gresource.xml |    1 +
 src/plugins/grilo/totem-grilo.c       |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/src/plugins/grilo/Makefile.am b/src/plugins/grilo/Makefile.am
index b41253d..afe8c79 100644
--- a/src/plugins/grilo/Makefile.am
+++ b/src/plugins/grilo/Makefile.am
@@ -5,20 +5,16 @@ plugin_LTLIBRARIES = libgrilo.la
 
 plugin_in_files = grilo.plugin.in
 
-uidir = $(plugindir)
-ui_DATA = grilo.ui
-EXTRA_DIST += $(ui_DATA)
-
 confdir = $(plugindir)
 conf_DATA = totem-grilo.conf
 EXTRA_DIST += $(conf_DATA)
 
-EXTRA_DIST += grilo.gresource.xml totemmaintoolbar.ui
+EXTRA_DIST += grilo.gresource.xml totemmaintoolbar.ui grilo.ui
 
 griloresources.h: grilo.gresource.xml
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/grilo.gresource.xml \
                --target=$@ --sourcedir=$(srcdir) --c-name _totem --generate-header
-griloresources.c: grilo.gresource.xml totemmaintoolbar.ui griloresources.h
+griloresources.c: grilo.gresource.xml totemmaintoolbar.ui grilo.ui griloresources.h
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/grilo.gresource.xml \
                --target=$@ --sourcedir=$(srcdir) --c-name _totem --generate-source
 
diff --git a/src/plugins/grilo/grilo.gresource.xml b/src/plugins/grilo/grilo.gresource.xml
index d8f2e65..6c2e172 100644
--- a/src/plugins/grilo/grilo.gresource.xml
+++ b/src/plugins/grilo/grilo.gresource.xml
@@ -2,5 +2,6 @@
 <gresources>
   <gresource prefix="/org/totem/grilo">
     <file compressed="true">totemmaintoolbar.ui</file>
+    <file compressed="true">grilo.ui</file>
   </gresource>
 </gresources>
diff --git a/src/plugins/grilo/totem-grilo.c b/src/plugins/grilo/totem-grilo.c
index b1464ce..9962dd1 100644
--- a/src/plugins/grilo/totem-grilo.c
+++ b/src/plugins/grilo/totem-grilo.c
@@ -1443,7 +1443,7 @@ impl_activate (PeasActivatable *plugin)
        priv->totem = g_object_ref (g_object_get_data (G_OBJECT (plugin), "object"));
        priv->main_window = totem_object_get_main_window (priv->totem);
 
-       builder = totem_plugin_load_interface ("grilo", "grilo.ui", TRUE, self->priv->main_window, self);
+       builder = gtk_builder_new_from_resource ("/org/totem/grilo/grilo.ui");
        setup_ui (self, builder);
        grl_init (0, NULL);
        setup_config (self);