[eog] Remove any reference to glade* (bug 634942)

[Baptiste Mille-Mathias <baptistem src gnome org>]

commit d26606d6273427777790e998902d86acd57c3393
Author: Baptiste Mille-Mathias <baptiste millemathias gmail com>
Date:   Fri Nov 19 15:58:54 2010 +0100

    Remove any reference to glade* (bug 634942)

 README                   |    4 ++--
 bindings/python/eog.defs |    2 +-
 data/Makefile.am         |    6 +++---
 src/eog-dialog.c         |    8 ++++----
 src/eog-dialog.h         |    4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/README b/README
index ad05fab..cd74f08 100644
--- a/README
+++ b/README
@@ -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 28428fd..17e3067 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 ddd8434..b3142bb 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 0082ee9..688161b 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 f27b5f2..00d1bb4 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);