summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Riemann <[email protected]>2014-05-04 13:24:34 +0200
committerraveit65 <[email protected]>2018-08-13 19:08:02 +0200
commitb1fb22db626d4d1f37c70dbe75dcd05900a39af2 (patch)
treea4bcc1bd2fc41c170d5a698b3fb2d15a0d871015
parentb5172a3d28ea2356d06ec3b961d53b7c390ab758 (diff)
downloadeom-b1fb22db626d4d1f37c70dbe75dcd05900a39af2.tar.bz2
eom-b1fb22db626d4d1f37c70dbe75dcd05900a39af2.tar.xz
Load EomMultipleSaveAsDialog from GResource
origin commit: https://gitlab.gnome.org/GNOME/eog/commit/a2defa1
-rw-r--r--data/Makefile.am2
-rw-r--r--src/eom-save-as-dialog-helper.c10
-rw-r--r--src/eom.gresource.xml1
3 files changed, 3 insertions, 10 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index ef52670..f822dd5 100644
--- 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
index a547ccc..8b61c75 100644
--- 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
index 8a10c9f..d1d2599 100644
--- 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>