From b1fb22db626d4d1f37c70dbe75dcd05900a39af2 Mon Sep 17 00:00:00 2001 From: Felix Riemann Date: Sun, 4 May 2014 13:24:34 +0200 Subject: Load EomMultipleSaveAsDialog from GResource origin commit: https://gitlab.gnome.org/GNOME/eog/commit/a2defa1 --- src/eom-save-as-dialog-helper.c | 10 +--------- src/eom.gresource.xml | 1 + 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'src') 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 @@ eom.css eom-image-properties-dialog.ui + eom-multiple-save-as-dialog.ui eom-ui.xml metadata-sidebar.ui -- cgit v1.2.1