aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorChenthill Palanisamy <pchen@src.gnome.org>2007-09-10 05:13:02 +0800
committerChenthill Palanisamy <pchen@src.gnome.org>2007-09-10 05:13:02 +0800
commitd11528c92cdf38b551e1783b71c9a2b9e7f5331b (patch)
treeeab1e5b288396a57e211c82c3e8f6e1620663dc7 /plugins
parent552c833e7ce667c5f9305ef1fa221eeb4eb6b648 (diff)
downloadgsoc2013-evolution-d11528c92cdf38b551e1783b71c9a2b9e7f5331b.tar
gsoc2013-evolution-d11528c92cdf38b551e1783b71c9a2b9e7f5331b.tar.gz
gsoc2013-evolution-d11528c92cdf38b551e1783b71c9a2b9e7f5331b.tar.bz2
gsoc2013-evolution-d11528c92cdf38b551e1783b71c9a2b9e7f5331b.tar.lz
gsoc2013-evolution-d11528c92cdf38b551e1783b71c9a2b9e7f5331b.tar.xz
gsoc2013-evolution-d11528c92cdf38b551e1783b71c9a2b9e7f5331b.tar.zst
gsoc2013-evolution-d11528c92cdf38b551e1783b71c9a2b9e7f5331b.zip
Fixes #274047 (bnc)
svn path=/trunk/; revision=34209
Diffstat (limited to 'plugins')
-rw-r--r--plugins/publish-calendar/ChangeLog7
-rw-r--r--plugins/publish-calendar/Makefile.am14
-rw-r--r--plugins/publish-calendar/publish-calendar.c2
3 files changed, 17 insertions, 6 deletions
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,5 +1,12 @@
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)
* url-editor-dialog.c: (frequency_changed_cb),
(url_editor_dialog_construct): Listen to the changes made
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);