From d11528c92cdf38b551e1783b71c9a2b9e7f5331b Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy <pchen@src.gnome.org> Date: Sun, 9 Sep 2007 21:13:02 +0000 Subject: Fixes #274047 (bnc) svn path=/trunk/; revision=34209 --- plugins/publish-calendar/ChangeLog | 7 +++++++ plugins/publish-calendar/Makefile.am | 14 +++++++++----- plugins/publish-calendar/publish-calendar.c | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) (limited to 'plugins') diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog index 5c6a38c1fa..339d09049b 100644 --- a/plugins/publish-calendar/ChangeLog +++ b/plugins/publish-calendar/ChangeLog @@ -1,3 +1,10 @@ +2007-09-10 Chenthill Palanisamy <pchenthill@novell.com> + + Fixes #274047 (bnc) + * Makefile.am: Inserted glade_data. + * publish-calendar.c: (publish_calendar_locations): Pick + the glade file from install area. + 2007-09-10 Chenthill Palanisamy <pchenthill@novell.com> Fixes #277159 (bnc) diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 4356390024..954333c11c 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -2,14 +2,18 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ - -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" + -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 + +glade_DATA = \ + publish-calendar.glade + plugin_LTLIBRARIES = liborg-gnome-publish-calendar.la liborg_gnome_publish_calendar_la_SOURCES = \ @@ -32,7 +36,7 @@ liborg_gnome_publish_calendar_la_LIBADD = \ EXTRA_DIST = \ org-gnome-publish-calendar.eplug.xml \ - publish-calendar.glade \ - org-gnome-publish-calendar.xml + org-gnome-publish-calendar.xml \ + $(glade_DATA) CLEANFILES = org-gnome-publish-calendar.eplug diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 742d64da3f..92d254d5ca 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -491,7 +491,7 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) GConfClient *client; char *gladefile; - gladefile = g_build_filename (EVOLUTION_PLUGINDIR, + gladefile = g_build_filename (EVOLUTION_GLADEDIR, "publish-calendar.glade", NULL); xml = glade_xml_new (gladefile, "toplevel", NULL); -- cgit