[nautilus-actions] Rename GLADEDIR to PKGDATADIR

[Pierre Wieser <pwieser src gnome org>]

commit 62435df6603dd463f30576b3ba220616411eaa93
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Aug 20 18:23:32 2009 +0200

    Rename GLADEDIR to PKGDATADIR
    
    Internally rename GLADE_FILENAME to UI_XML_FILENAME

 ChangeLog                   |    8 +++++++-
 src/nact/Makefile.am        |    2 +-
 src/nact/nact-application.c |    4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 600fb31..bb5aa95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,12 @@
 
 	* src/common/na-gconf.c: Fix typo.
 
+	* src/common/Makefile.am: Updated accordingly.
+
+	* src/nact/nact-application.c:
+	Rename GLADEDIR to PKGDATADIR.
+	Rename GLADE_FILENAME to UI_XML_FILENAME.
+
 	* src/nact/nact-imenubar.c:
 	Add an item in the menubar to run the Preferences dialog.
 	Rename MenuBarVBox to MenubarVBox to be consistent with Statusbar.
@@ -25,8 +31,8 @@
 	width to minimize focus errors.
 	Rename MenuBarVBox to MenubarVBox to be consistent with Statusbar.
 
-	* src/common/Makefile.am:
 	* src/nact/Makefile.am: Updated accordingly.
+	Rename GLADEDIR to PKGDATADIR.
 
 	* src/plugin/nautilus-actions.c:
 	Take into account the DisplayAsSubmenu preference.
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index c8acd94..01a2d8e 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -33,7 +33,7 @@ bin_PROGRAMS = \
 AM_CPPFLAGS += \
 	-I $(top_srcdir)/src								\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
-	-DGLADEDIR=\"$(pkgdatadir)\"						\
+	-DPKGDATADIR=\"$(pkgdatadir)\"						\
 	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_NACT}\"				\
 	$(NAUTILUS_ACTIONS_CFLAGS)							\
 	$(NULL)
diff --git a/src/nact/nact-application.c b/src/nact/nact-application.c
index dc6b33d..b43f5a6 100644
--- a/src/nact/nact-application.c
+++ b/src/nact/nact-application.c
@@ -38,7 +38,7 @@
 #include "nact-application.h"
 #include "nact-main-window.h"
 
-#define GLADE_FILENAME				GLADEDIR "/nautilus-actions-config-tool.ui"
+#define UI_XML_FILENAME				PKGDATADIR "/nautilus-actions-config-tool.ui"
 
 /* private class data
  */
@@ -339,7 +339,7 @@ appli_get_unique_app_name( BaseApplication *application )
 static gchar *
 appli_get_gtkbuilder_filename( BaseApplication *application )
 {
-	return( g_strdup( GLADE_FILENAME ));
+	return( g_strdup( UI_XML_FILENAME ));
 }
 
 /*