From cea054cd54d84479352a43bbabc19c9ce9af5efb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 8 Aug 2008 04:26:12 +0000
Subject: Merge revisions 35747:35930 from trunk.

svn path=/branches/kill-bonobo/; revision=35931
---
 plugins/calendar-http/ChangeLog                         | 8 ++++++++
 plugins/calendar-http/org-gnome-calendar-http.eplug.xml | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'plugins/calendar-http')

diff --git a/plugins/calendar-http/ChangeLog b/plugins/calendar-http/ChangeLog
index 76fb7d8cba..8cadbba783 100644
--- a/plugins/calendar-http/ChangeLog
+++ b/plugins/calendar-http/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #545568
+
+	* org-gnome-calendar-http.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.
+
 2008-03-31  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #346555
diff --git a/plugins/calendar-http/org-gnome-calendar-http.eplug.xml b/plugins/calendar-http/org-gnome-calendar-http.eplug.xml
index 3d4f885aec..8b75a0f2c3 100644
--- a/plugins/calendar-http/org-gnome-calendar-http.eplug.xml
+++ b/plugins/calendar-http/org-gnome-calendar-http.eplug.xml
@@ -4,7 +4,8 @@
      type="shlib"
      location="@PLUGINDIR@/liborg-gnome-calendar-http@SOEXT@"
      id="org.gnome.evolution.calendar.http"
-     _name="HTTP Calendars">
+     _name="HTTP Calendars"
+     system_plugin="true">
      <author name="David Trowbridge" email="David.Trowbridge@Colorado.edu"/>
      <_description>Provides core functionality for webcal and http calendars.</_description>
         <hook class="org.gnome.evolution.calendar.config:1.0">
-- 
cgit v1.2.3