From cea054cd54d84479352a43bbabc19c9ce9af5efb Mon Sep 17 00:00:00 2001 From: Matthew Barnes 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-weather/ChangeLog | 8 ++++++++ plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'plugins/calendar-weather') diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog index 78f2dc28d7..13f1f22a89 100644 --- a/plugins/calendar-weather/ChangeLog +++ b/plugins/calendar-weather/ChangeLog @@ -1,3 +1,11 @@ +2008-07-31 Matthew Barnes + + ** Fixes part of bug #545568 + + * org-gnome-calendar-weather.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 ** Fix for bug #346555 diff --git a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml index 442fd83074..e6767d128a 100644 --- a/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml +++ b/plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml @@ -4,7 +4,8 @@ type="shlib" location="@PLUGINDIR@/liborg-gnome-calendar-weather@SOEXT@" id="org.gnome.evolution.calendar.weather" - _name="Weather Calendars"> + _name="Weather Calendars" + system_plugin="true"> <_description>Provides core functionality for weather calendars. -- cgit v1.2.3