Skip to content

Commit b1fb22d

Browse files
fxriraveit65
authored and
raveit65
committed
Load EomMultipleSaveAsDialog from GResource
origin commit: https://gitlab.gnome.org/GNOME/eog/commit/a2defa1
1 parent b5172a3 commit b1fb22d

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

data/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ gsettings_SCHEMAS = org.mate.eom.gschema.xml
2222

2323
uidir = $(pkgdatadir)
2424
ui_DATA = \
25-
eom-multiple-save-as-dialog.ui \
2625
eom-preferences-dialog.ui \
2726
eom-toolbar.xml
2827

@@ -33,6 +32,7 @@ EXTRA_DIST = \
3332
$(ui_DATA) \
3433
eom.css \
3534
eom-image-properties-dialog.ui \
35+
eom-multiple-save-as-dialog.ui \
3636
eom-ui.xml \
3737
metadata-sidebar.ui \
3838
$(DESKTOP_IN_FILES) \

src/eom-save-as-dialog-helper.c

+1-9
Original file line numberDiff line numberDiff line change
@@ -201,21 +201,13 @@ set_default_values (GtkWidget *dlg, GFile *base_file)
201201
GtkWidget*
202202
eom_save_as_dialog_new (GtkWindow *main, GList *images, GFile *base_file)
203203
{
204-
char *filepath;
205204
GtkBuilder *xml;
206205
GtkWidget *dlg;
207206
SaveAsData *data;
208207
GtkWidget *label;
209208

210-
filepath = g_build_filename (EOM_DATA_DIR,
211-
"eom-multiple-save-as-dialog.ui",
212-
NULL);
213-
214-
xml = gtk_builder_new ();
209+
xml = gtk_builder_new_from_resource ("/org/gnome/eog/ui/eom-multiple-save-as-dialog.ui");
215210
gtk_builder_set_translation_domain (xml, GETTEXT_PACKAGE);
216-
g_assert (gtk_builder_add_from_file (xml, filepath, NULL));
217-
218-
g_free (filepath);
219211

220212
dlg = GTK_WIDGET (g_object_ref (gtk_builder_get_object (xml, "eom_multiple_save_as_dialog")));
221213
gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (main));

src/eom.gresource.xml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<gresource prefix="/org/mate/eom/ui">
44
<file>eom.css</file>
55
<file compressed="true" preprocess="xml-stripblanks">eom-image-properties-dialog.ui</file>
6+
<file compressed="true" preprocess="xml-stripblanks">eom-multiple-save-as-dialog.ui</file>
67
<file compressed="true" preprocess="xml-stripblanks">eom-ui.xml</file>
78
<file compressed="true" preprocess="xml-stripblanks">metadata-sidebar.ui</file>
89
</gresource>

0 commit comments

Comments
 (0)