Load EomMultipleSaveAsDialog from GResource

fxri · raveit65 · commit b1fb22db626d · 2018-08-13T19:08:02.000+02:00
origin commit: https://gitlab.gnome.org/GNOME/eog/commit/a2defa1
diff --git a/data/Makefile.am b/data/Makefile.am
@@ -22,7 +22,6 @@ gsettings_SCHEMAS = org.mate.eom.gschema.xml
 
 uidir = $(pkgdatadir)
 ui_DATA = \
-	eom-multiple-save-as-dialog.ui \
 	eom-preferences-dialog.ui \
 	eom-toolbar.xml
 
@@ -33,6 +32,7 @@ EXTRA_DIST = \
 	$(ui_DATA) \
 	eom.css			\
 	eom-image-properties-dialog.ui	\
+	eom-multiple-save-as-dialog.ui	\
 	eom-ui.xml		\
 	metadata-sidebar.ui	\
 	$(DESKTOP_IN_FILES) \
diff --git a/src/eom-save-as-dialog-helper.c b/src/eom-save-as-dialog-helper.c
@@ -201,21 +201,13 @@ set_default_values (GtkWidget *dlg, GFile *base_file)
 GtkWidget*
 eom_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 (EOM_DATA_DIR,
-				     "eom-multiple-save-as-dialog.ui",
-				     NULL);
-
-	xml = gtk_builder_new ();
+	xml = gtk_builder_new_from_resource ("/org/gnome/eog/ui/eom-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, "eom_multiple_save_as_dialog")));
 	gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (main));
diff --git a/src/eom.gresource.xml b/src/eom.gresource.xml
@@ -3,6 +3,7 @@
   <gresource prefix="/org/mate/eom/ui">
     <file>eom.css</file>
     <file compressed="true" preprocess="xml-stripblanks">eom-image-properties-dialog.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">eom-multiple-save-as-dialog.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">eom-ui.xml</file>
     <file compressed="true" preprocess="xml-stripblanks">metadata-sidebar.ui</file>
   </gresource>
