Fix for bug #424818 (bugzilla.novell.com) - Integrate the mark-calendar-offline plugin into the main code as we already have a similar per-calendar option which does the same thing.

svn path=/trunk/; revision=36610

6 files changed, 7 insertions, 216 deletions

diff --git a/plugins/mark-calendar-offline/ChangeLog b/plugins/mark-calendar-offline/ChangeLog
deleted file mode 100644
index a57222d5a6..0000000000
--- a/plugins/mark-calendar-offline/ChangeLog
+++ /dev/null
@@ -1,54 +0,0 @@
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* mark-calendar-offline.c:
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2007-11-11  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fix bug #495872
-
-	* mark-calendar-offline.c: (org_gnome_mark_no_offline),
-	(org_gnome_mark_offline):
-	* org-gnome-mark-calendar-offline.eplug.xml:
-	add tasks and memos support
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* org-gnome-mark-calendar-offline.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Fix make-clean issues.
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: 
-	* org-gnome-mark-calendar-offline.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-mark-calendar-offline.eplug.in: Shortened the
-	name. 
-	Added author and description.
-	Added xml tag.
-
-2004-11-01  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: dist .eplug.in file
-
-2004-10-22  Harish Krishnaswamy <kharish@novell.com>
-
-	* mark-calendar-offline.c: implement a plugin that lets the user mark a
-	calendar to be available for off-line use, if it is not already set to be so
-	and vice versa
-	
diff --git a/plugins/mark-calendar-offline/Makefile.am b/plugins/mark-calendar-offline/Makefile.am
deleted file mode 100644
index c7773ae87b..0000000000
--- a/plugins/mark-calendar-offline/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-INCLUDES =						\
-	-I$(top_srcdir)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-mark-calendar-offline.eplug
-plugin_LTLIBRARIES = liborg-gnome-mark-calendar-offline.la
-
-liborg_gnome_mark_calendar_offline_la_SOURCES = mark-calendar-offline.c
-liborg_gnome_mark_calendar_offline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_mark_calendar_offline_la_LIBADD =	\
-	$(EVOLUTION_CALENDAR_LIBS)
-
-EXTRA_DIST = org-gnome-mark-calendar-offline.eplug.xml
-
-BUILT_SOURCES = $(plugin_DATA)
-CLEANFILES = $(BUILT_SOURCES)
diff --git a/plugins/mark-calendar-offline/mark-calendar-offline.c b/plugins/mark-calendar-offline/mark-calendar-offline.c
deleted file mode 100644
index 68bd3f445b..0000000000
--- a/plugins/mark-calendar-offline/mark-calendar-offline.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
- *
- *
- * Authors:
- *		Harish Krishnaswamy <kharish@novell.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-/* This is prototype code only, this may, or may not, use undocumented
- * unstable or private internal function calls.
- * This code has been derived from the source of the sample eplugin
- * select_one_source.
- */
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <libedataserver/e-source.h>
-#include <libedataserverui/e-source-selector.h>
-#include <calendar/gui/e-cal-popup.h>
-
-void org_gnome_mark_offline (EPlugin *ep, ECalPopupTargetSource *target);
-void org_gnome_mark_no_offline (EPlugin *ep, ECalPopupTargetSource *target);
-
-void
-org_gnome_mark_no_offline (EPlugin *ep, ECalPopupTargetSource *target)
-{
-	ESource *source;
-
-	source = e_source_selector_peek_primary_selection (target->selector);
-	e_source_set_property (source, "offline", "0");
-}
-
-void
-org_gnome_mark_offline (EPlugin *ep, ECalPopupTargetSource *target)
-{
-	ESource *source;
-
-	source = e_source_selector_peek_primary_selection (target->selector);
-	e_source_set_property (source, "offline", "1");
-}
-
diff --git a/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml b/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml
deleted file mode 100644
index bde9805396..0000000000
--- a/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<e-plugin-list>
-    <e-plugin id="org.gnome.evolution.mark_calendar_offline" type="shlib" 
-	_name="Mark calendar offline" 
-	location="@PLUGINDIR@/liborg-gnome-mark-calendar-offline@SOEXT@">
-	<author name="Harish Krishnaswamy" email="kharish@novell.com"/>
-       	<_description>Marks the selected calendar for offline viewing.</_description>
-
-		<hook class="org.gnome.evolution.calendar.popup:1.0">
-			<menu id="org.gnome.evolution.calendar.source.popup" target="source">
-				<item type="item" path="38.mark_calendar_offline" _label="_Make available for offline use" icon="stock_disconnect"  visible="offline" activate="org_gnome_mark_offline"/>
-			</menu>
-			<menu id="org.gnome.evolution.calendar.source.popup" target="source">
-				<item type="item" path="38.mark_calendar_no_offline" _label="_Do not make available for offline use" icon="stock_connect"  visible="no-offline" activate="org_gnome_mark_no_offline"/>
-			</menu>
-
-			<menu id="org.gnome.evolution.memos.source.popup" target="source">
-				<item type="item" path="38.mark_memos_offline" _label="_Make available for offline use" icon="stock_disconnect"  visible="offline" activate="org_gnome_mark_offline"/>
-			</menu>
-			<menu id="org.gnome.evolution.memos.source.popup" target="source">
-				<item type="item" path="38.mark_memos_no_offline" _label="_Do not make available for offline use" icon="stock_connect"  visible="no-offline" activate="org_gnome_mark_no_offline"/>
-			</menu>
-
-			<menu id="org.gnome.evolution.tasks.source.popup" target="source">
-				<item type="item" path="38.mark_tasks_offline" _label="_Make available for offline use" icon="stock_disconnect"  visible="offline" activate="org_gnome_mark_offline"/>
-			</menu>
-			<menu id="org.gnome.evolution.tasks.source.popup" target="source">
-				<item type="item" path="38.mark_tasks_no_offline" _label="_Do not make available for offline use" icon="stock_connect"  visible="no-offline" activate="org_gnome_mark_no_offline"/>
-			</menu>
-		</hook>
-
-	</e-plugin>
-</e-plugin-list>
diff --git a/plugins/select-one-source/ChangeLog b/plugins/select-one-source/ChangeLog
index de715176df..0534fee906 100644
--- a/plugins/select-one-source/ChangeLog
+++ b/plugins/select-one-source/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-13  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #424818 (bugzilla.novell.com)
+
+	* mark-calendar-offline.c: Removed this unused PoC file. The 
+	corresponding plugin has also been integrated into the main code. 
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/select-one-source/mark-calendar-offline.c b/plugins/select-one-source/mark-calendar-offline.c
deleted file mode 100644
index 3ef3330f60..0000000000
--- a/plugins/select-one-source/mark-calendar-offline.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
- *
- *
- * Authors:
- *		Harish Krishnaswamy <kharish@novell.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-/* This is prototype code only, this may, or may not, use undocumented
- * unstable or private internal function calls.
- * This code has been derived from the source of the sample eplugin
- * select_one_source.
- */
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <libedataserver/e-source.h>
-#include <libedataserverui/e-source-selector.h>
-#include <calendar/gui/e-cal-popup.h>
-
-void org_gnome_mark_calendar_offline (EPlugin *ep, ECalPopupTargetSource *target);
-void org_gnome_mark_calendar_no_offline (EPlugin *ep, ECalPopupTargetSource *target);
-
-void
-org_gnome_mark_calendar_no_offline (EPlugin *ep, ECalPopupTargetSource *target)
-{
-	ESource *source;
-
-	source = e_source_selector_peek_primary_selection (target->selector);
-	e_source_set_property (source, "offline", "0");
-}
-
-void
-org_gnome_mark_calendar_offline (EPlugin *ep, ECalPopupTargetSource *target)
-{
-	ESource *source;
-
-	source = e_source_selector_peek_primary_selection (target->selector);
-	e_source_set_property (source, "offline", "1");
-}
-