diff options
| author | infirit <[email protected]> | 2014-07-25 16:18:18 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-07-25 16:18:18 +0200 |
| commit | 041b050488e3fa0d1dda442c19375c217dc8886a (patch) | |
| tree | b0196f8bb22d9a21a578438c46fe397b1b69cdb1 | |
| parent | 4d498a1cc3a0bff55af99d5cde87343b0df011a0 (diff) | |
| download | eom-041b050488e3fa0d1dda442c19375c217dc8886a.tar.bz2 eom-041b050488e3fa0d1dda442c19375c217dc8886a.tar.xz | |
Remove any reference to glade*
Based on eog commit d26606d6273427777790e998902d86acd57c3393
From Baptiste Mille-Mathias <[email protected]>
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | bindings/python/eom.defs | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 6 | ||||
| -rw-r--r-- | src/eom-dialog.c | 8 | ||||
| -rw-r--r-- | src/eom-dialog.h | 4 |
5 files changed, 12 insertions, 12 deletions
@@ -22,8 +22,8 @@ Requirements ------------ This package requires the following modules to be installed: glib, -GTK+, libmateui, libglade, mate-desktop, gio, gdk-pixbuf, -mate-icon-theme, shared-mime-info, libart, and libglade. +GTK+, mate-desktop, gio, gdk-pixbuf, mate-icon-theme, +shared-mime-info and libart. You can get these packages from your favourite MATE FTP mirror or at http://pub.mate-desktop.org/ or from other sources where MATE diff --git a/bindings/python/eom.defs b/bindings/python/eom.defs index d2b37c0..9d16fa4 100644 --- a/bindings/python/eom.defs +++ b/bindings/python/eom.defs @@ -346,7 +346,7 @@ (c-name "eom_dialog_construct") (return-type "none") (parameters - '("const-gchar*" "glade_file") + '("const-gchar*" "ui_file") '("const-gchar*" "dlg_node") ) ) diff --git a/data/Makefile.am b/data/Makefile.am index a362527..a5b6cdc 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -18,8 +18,8 @@ gsettings_SCHEMAS = org.mate.eom.gschema.xml convertdir = $(datadir)/MateConf/gsettings convert_DATA = eom.convert -gladedir = $(pkgdatadir) -glade_DATA = eom-image-properties-dialog.ui \ +uidir = $(pkgdatadir) +ui_DATA = eom-image-properties-dialog.ui \ eom-multiple-save-as-dialog.ui \ eom-preferences-dialog.ui @@ -38,7 +38,7 @@ gtkrc_DATA = gtkrc EXTRA_DIST = \ $(gtkrc_DATA) \ - $(glade_DATA) \ + $(ui_DATA) \ $(convert_DATA) \ $(DESKTOP_IN_FILES) \ $(gsettings_SCHEMAS).in.in \ diff --git a/src/eom-dialog.c b/src/eom-dialog.c index dd7ba82..935c7a1 100644 --- a/src/eom-dialog.c +++ b/src/eom-dialog.c @@ -47,7 +47,7 @@ struct _EomDialogPrivate { static void eom_dialog_construct_impl (EomDialog *dialog, - const gchar *glade_file, + const gchar *ui_file, const gchar *dlg_node) { EomDialogPrivate *priv; @@ -58,7 +58,7 @@ eom_dialog_construct_impl (EomDialog *dialog, priv = dialog->priv; - filename = g_build_filename (EOM_DATA_DIR, glade_file, NULL); + filename = g_build_filename (EOM_DATA_DIR, ui_file, NULL); priv->xml = gtk_builder_new (); gtk_builder_set_translation_domain (priv->xml, GETTEXT_PACKAGE); @@ -187,11 +187,11 @@ eom_dialog_init (EomDialog *dialog) void eom_dialog_construct (EomDialog *dialog, - const gchar *glade_file, + const gchar *ui_file, const gchar *dlg_node) { EomDialogClass *klass = EOM_DIALOG_GET_CLASS (dialog); - klass->construct (dialog, glade_file, dlg_node); + klass->construct (dialog, ui_file, dlg_node); } void diff --git a/src/eom-dialog.h b/src/eom-dialog.h index 104daa3..b9f7a52 100644 --- a/src/eom-dialog.h +++ b/src/eom-dialog.h @@ -49,7 +49,7 @@ struct _EomDialogClass { GObjectClass parent_class; void (* construct) (EomDialog *dialog, - const gchar *glade_file, + const gchar *ui_file, const gchar *dlg_node); void (* show) (EomDialog *dialog); @@ -60,7 +60,7 @@ struct _EomDialogClass { GType eom_dialog_get_type (void) G_GNUC_CONST; void eom_dialog_construct (EomDialog *dialog, - const gchar *glade_file, + const gchar *ui_file, const gchar *dlg_node); void eom_dialog_show (EomDialog *dialog); |