--- plugins/publish-calendar/Makefile.am	2006-01-21 08:49:14.000000000 +0530
+++ plugins/publish-calendar/Makefile.am	2006-01-21 08:50:23.000000000 +0530
@@ -1,14 +1,14 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
 
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = 					\
 	org-gnome-publish-calendar.eplug	\
-	org-gnome-publish-calendar.xml		\
-	publish-calendar.glade
+	org-gnome-publish-calendar.xml
+
 plugin_LTLIBRARIES = liborg-gnome-publish-calendar.la
 
 liborg_gnome_publish_calendar_la_SOURCES =	\
@@ -29,7 +29,10 @@ liborg_gnome_publish_calendar_la_LIBADD 
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(EVOLUTION_CALENDAR_LIBS)
 
+glade_DATA =					\
+	publish-calendar.glade
+
 EXTRA_DIST =					\
 	org-gnome-publish-calendar.eplug.xml	\
-	publish-calendar.glade			\
-	org-gnome-publish-calendar.xml
+	org-gnome-publish-calendar.xml		\
+	$(glade_DATA)
--- plugins/publish-calendar/publish-calendar.c	2006-01-09 13:21:19.000000000 +0530
+++ plugins/publish-calendar/publish-calendar.c	2006-01-21 08:19:37.000000000 +0530
@@ -35,6 +39,8 @@
 #include "publish-format-fb.h"
 #include "publish-format-ical.h"
 
+#define GLADE_FILENAME EVOLUTION_GLADEDIR "/publish-calendar.glade"
+
 static GtkListStore *store = NULL;
 static GHashTable *uri_timeouts = NULL;
 static GSList *publish_uris = NULL;
@@ -439,13 +445,8 @@ publish_calendar_locations (EPlugin *epl
 	GSList *l;
 	GtkTreeIter iter;
 	GConfClient *client;
-	char *gladefile;
 
-	gladefile = g_build_filename (EVOLUTION_PLUGINDIR,
-				      "publish-calendar.glade",
-				      NULL);
-	xml = glade_xml_new (gladefile, "toplevel", NULL);
-	g_free (gladefile);
+	xml = glade_xml_new (GLADE_FILENAME, "toplevel", NULL);
 
 	ui->treeview = glade_xml_get_widget (xml, "url list");
 	if (store == NULL)
--- plugins/publish-calendar/url-editor-dialog.c	2006-01-21 08:55:29.000000000 +0530
+++ plugins/publish-calendar/url-editor-dialog.c	2006-01-21 09:05:17.000000000 +0530
@@ -26,6 +26,8 @@
 #include <string.h>
 #include <e-util/e-util-private.h>
 
+#define GLADE_FILENAME EVOLUTION_GLADEDIR "/publish-calendar.glade"
+
 static GtkDialogClass *parent_class = NULL;
 
 static void
@@ -324,15 +326,10 @@ url_editor_dialog_construct (UrlEditorDi
 	GConfClient *gconf;
 	GtkSizeGroup *group;
 	EPublishUri *uri;
-	char *gladefile;
 
 	gconf = gconf_client_get_default ();
 
-	gladefile = g_build_filename (EVOLUTION_PLUGINDIR,
-				      "publish-calendar.glade",
-				      NULL);
-	gui = glade_xml_new (gladefile, "publishing toplevel", NULL);
-	g_free (gladefile);
+	gui = glade_xml_new (GLADE_FILENAME, "publishing toplevel", NULL);
 	dialog->gui = gui;
 
 #define GW(name) ((dialog->name) = glade_xml_get_widget (dialog->gui, #name))