[eog] Load EogMultipleSaveAsDialog from GResource

[Felix Riemann <friemann src gnome org>]

commit a2defa1d08be2367d78938a362f7a234a9166d65
Author: Felix Riemann <friemann gnome org>
Date:   Sun May 4 13:24:34 2014 +0200

    Load EogMultipleSaveAsDialog from GResource

 data/Makefile.am                |    2 +-
 src/eog-save-as-dialog-helper.c |    9 +--------
 src/eog.gresource.xml           |    1 +
 3 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 96c63cd..5390299 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,7 +25,6 @@ gsettingsconvert_DATA = eog.convert
 
 uidir = $(pkgdatadir)
 ui_DATA = \
-       eog-multiple-save-as-dialog.ui \
        eog-toolbar.xml
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -36,6 +35,7 @@ EXTRA_DIST =                  \
        eog.css                 \
        eog-app-menu.xml        \
        eog-image-properties-dialog.ui  \
+       eog-multiple-save-as-dialog.ui  \
        eog-preferences-dialog.ui \
        eog-ui.xml              \
        $(DESKTOP_IN_FILES)     \
diff --git a/src/eog-save-as-dialog-helper.c b/src/eog-save-as-dialog-helper.c
index 66e5d39..8c6bf54 100644
--- a/src/eog-save-as-dialog-helper.c
+++ b/src/eog-save-as-dialog-helper.c
@@ -202,21 +202,14 @@ set_default_values (GtkWidget *dlg, GFile *base_file)
 GtkWidget*
 eog_save_as_dialog_new (GtkWindow *main, GList *images, GFile *base_file)
 {
-       char *filepath;
        GtkBuilder  *xml;
        GtkWidget *dlg;
        SaveAsData *data;
        GtkWidget *label;
 
-       filepath = g_build_filename (EOG_DATA_DIR,
-                                    "eog-multiple-save-as-dialog.ui",
-                                    NULL);
 
-       xml = gtk_builder_new ();
+       xml = gtk_builder_new_from_resource ("/org/gnome/eog/ui/eog-multiple-save-as-dialog.ui");
        gtk_builder_set_translation_domain (xml, GETTEXT_PACKAGE);
-       g_assert (gtk_builder_add_from_file (xml, filepath, NULL));
-
-       g_free (filepath);
 
        dlg = GTK_WIDGET (g_object_ref (gtk_builder_get_object (xml, "eog_multiple_save_as_dialog")));
        gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (main));
diff --git a/src/eog.gresource.xml b/src/eog.gresource.xml
index a445e61..8dd0acf 100644
--- a/src/eog.gresource.xml
+++ b/src/eog.gresource.xml
@@ -4,6 +4,7 @@
     <file>eog.css</file>
     <file compressed="true" preprocess="xml-stripblanks">eog-app-menu.xml</file>
     <file compressed="true" preprocess="xml-stripblanks">eog-image-properties-dialog.ui</file>
+    <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-ui.xml</file>
   </gresource>