aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/caldav
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-08-08 12:26:12 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-08-08 12:26:12 +0800
commitcea054cd54d84479352a43bbabc19c9ce9af5efb (patch)
treeba02763209ba0f22989024004f57689071603ec5 /plugins/caldav
parent91a6b6899e5568ed34f913bedb538dd6c9e35b32 (diff)
downloadgsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.gz
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.bz2
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.lz
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.xz
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.zst
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.zip
Merge revisions 35747:35930 from trunk.
svn path=/branches/kill-bonobo/; revision=35931
Diffstat (limited to 'plugins/caldav')
-rw-r--r--plugins/caldav/ChangeLog17
-rw-r--r--plugins/caldav/caldav-source.c4
-rw-r--r--plugins/caldav/org-gnome-evolution-caldav.eplug.xml3
3 files changed, 22 insertions, 2 deletions
diff --git a/plugins/caldav/ChangeLog b/plugins/caldav/ChangeLog
index 0801aed8cd..43cc26248f 100644
--- a/plugins/caldav/ChangeLog
+++ b/plugins/caldav/ChangeLog
@@ -1,3 +1,20 @@
+2008-08-07 Paul Bolle <pebolle@tiscali.nl>
+
+ ** Fixes bug #546785
+
+ * caldav-source.c: (e_plugin_lib_enable): The caldav plugin is noisy
+ when enabled:
+ "CalDAV Eplugin starting up ..."
+ Make this plugin just as polite as google-account-setup.
+
+2008-07-31 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #545568
+
+ * org-gnome-caldav.eplug.xml:
+ Add "system_plugin=true" so it's not shown in the Plugin Manager.
+ This plugin is not designed to be disabled by the user.
+
2007-10-26 Kjartan Maraas <kmaraas@gnome.org>
* caldav-source.c: (ensure_caldav_source_group):
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index 784e79bf8d..8b48bf6319 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -38,6 +38,8 @@
#include <string.h>
+#define d(x)
+
/*****************************************************************************/
/* prototypes */
int e_plugin_lib_enable (EPluginLib *ep,
@@ -84,7 +86,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
{
if (enable) {
- g_print ("CalDAV Eplugin starting up ...\n");
+ d(g_print ("CalDAV Eplugin starting up ...\n"));
ensure_caldav_source_group ();
}
diff --git a/plugins/caldav/org-gnome-evolution-caldav.eplug.xml b/plugins/caldav/org-gnome-evolution-caldav.eplug.xml
index 40710b39f7..dc728f1e7f 100644
--- a/plugins/caldav/org-gnome-evolution-caldav.eplug.xml
+++ b/plugins/caldav/org-gnome-evolution-caldav.eplug.xml
@@ -7,7 +7,8 @@
load-on-startup="true"
domain="@GETTEXT_PACKAGE@"
localedir="@LOCALEDIR@"
- _name="CalDAV sources">
+ _name="CalDAV sources"
+ system_plugin="true">
<author name="Christian Kellner" email="gicmo@gnome.org"/>
<_description>CalDAV Calendar sources</_description>