diff options
| author | Baptiste Mille-Mathias <baptiste.millemathias@gmail.com> | 2010-11-19 15:58:54 +0100 |
|---|---|---|
| committer | Baptiste Mille-Mathias <baptiste.millemathias@gmail.com> | 2010-11-19 20:51:13 +0100 |
| commit | d26606d6273427777790e998902d86acd57c3393 (patch) | |
| tree | 4317c1d24384693f2679988f029f1444e97a12d2 | |
| parent | 3e2af1c2ba6450075f0315a5230015853b97f87d (diff) | |
| download | eog-d26606d6273427777790e998902d86acd57c3393.tar.gz | |
Remove any reference to glade* (bug 634942)
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | bindings/python/eog.defs | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 6 | ||||
| -rw-r--r-- | src/eog-dialog.c | 8 | ||||
| -rw-r--r-- | src/eog-dialog.h | 4 |
5 files changed, 12 insertions, 12 deletions
@@ -19,8 +19,8 @@ Requirements ------------ This package requires the following modules to be installed: glib, -GTK+, libgnomeui, libglade, gconf, gnome-desktop, gio, gdk-pixbuf, -gnome-icon-theme, shared-mime-info, libart, and libglade. +GTK+, gconf, gnome-desktop, gio, gdk-pixbuf, gnome-icon-theme, +shared-mime-info, and libart. You can get these packages from your favourite GNOME FTP mirror or at http://download.gnome.org/sources or from other sources where GNOME diff --git a/bindings/python/eog.defs b/bindings/python/eog.defs index 28428fd9..17e3067f 100644 --- a/bindings/python/eog.defs +++ b/bindings/python/eog.defs @@ -346,7 +346,7 @@ (c-name "eog_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 ddd84344..b3142bbe 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -19,8 +19,8 @@ gsettings_SCHEMAS = org.gnome.eog.gschema.xml gsettingsconvertdir = $(datadir)/GConf/gsettings gsettingsconvert_DATA = eog.convert -gladedir = $(pkgdatadir) -glade_DATA = eog-image-properties-dialog.ui \ +uidir = $(pkgdatadir) +ui_DATA = eog-image-properties-dialog.ui \ eog-multiple-save-as-dialog.ui \ eog-preferences-dialog.ui @@ -39,7 +39,7 @@ gtkrc_DATA = gtkrc EXTRA_DIST = \ $(gtkrc_DATA) \ - $(glade_DATA) \ + $(ui_DATA) \ $(DESKTOP_IN_FILES) \ eog.convert \ $(UI_FILES) diff --git a/src/eog-dialog.c b/src/eog-dialog.c index 0082ee95..688161be 100644 --- a/src/eog-dialog.c +++ b/src/eog-dialog.c @@ -47,7 +47,7 @@ struct _EogDialogPrivate { static void eog_dialog_construct_impl (EogDialog *dialog, - const gchar *glade_file, + const gchar *ui_file, const gchar *dlg_node) { EogDialogPrivate *priv; @@ -58,7 +58,7 @@ eog_dialog_construct_impl (EogDialog *dialog, priv = dialog->priv; - filename = g_build_filename (EOG_DATA_DIR, glade_file, NULL); + filename = g_build_filename (EOG_DATA_DIR, ui_file, NULL); priv->xml = gtk_builder_new (); gtk_builder_set_translation_domain (priv->xml, GETTEXT_PACKAGE); @@ -187,11 +187,11 @@ eog_dialog_init (EogDialog *dialog) void eog_dialog_construct (EogDialog *dialog, - const gchar *glade_file, + const gchar *ui_file, const gchar *dlg_node) { EogDialogClass *klass = EOG_DIALOG_GET_CLASS (dialog); - klass->construct (dialog, glade_file, dlg_node); + klass->construct (dialog, ui_file, dlg_node); } void diff --git a/src/eog-dialog.h b/src/eog-dialog.h index f27b5f2c..00d1bb46 100644 --- a/src/eog-dialog.h +++ b/src/eog-dialog.h @@ -49,7 +49,7 @@ struct _EogDialogClass { GObjectClass parent_class; void (* construct) (EogDialog *dialog, - const gchar *glade_file, + const gchar *ui_file, const gchar *dlg_node); void (* show) (EogDialog *dialog); @@ -60,7 +60,7 @@ struct _EogDialogClass { GType eog_dialog_get_type (void) G_GNUC_CONST; void eog_dialog_construct (EogDialog *dialog, - const gchar *glade_file, + const gchar *ui_file, const gchar *dlg_node); void eog_dialog_show (EogDialog *dialog); |