Included files exchange-folder-subscription.c,

2005-07-11  Shakti Sen <shprasad@novell.com>

        * Makefile.am: Included files exchange-folder-subscription.c,
        exchange-folder-subscription.h, exchange-folder.c and
        org-gnome-folder-subscription.xml
        * exchange-folder.c: Renamed all the function names starting with
        org_gnome_* to org_gnome_exchnage* to resolve name space collision.
        * org-gnome-exchange-operations.eplug.in: Added the hook class for
        'Subscribe/Unsubscribe Folder'.

svn path=/trunk/; revision=29706

4 files changed, 62 insertions, 19 deletions

diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index be613cf169..6eed7b9ba0 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-11  Shakti Sen <shprasad@novell.com>
+
+	* Makefile.am: Included files exchange-folder-subscription.c,
+	exchange-folder-subscription.h, exchange-folder.c and 
+	org-gnome-folder-subscription.xml 
+	* exchange-folder.c: Renamed all the function names starting with
+	org_gnome_* to org_gnome_exchnage* to resolve name space collision.
+	* org-gnome-exchange-operations.eplug.in: Added the hook class for
+	'Subscribe/Unsubscribe Folder'.
+
 2005-07-08  Praveen Kumar <kpraveen@novell.com>
 
 	* Makefile.am : Added entries for the files providing the delegation
diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am
index 554436ad17..727560fc72 100644
--- a/plugins/exchange-operations/Makefile.am
+++ b/plugins/exchange-operations/Makefile.am
@@ -11,7 +11,8 @@ INCLUDES = -I .						\
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-exchange-operations.eplug 	\
-	org-gnome-folder-permissions.xml
+	org-gnome-folder-permissions.xml		\
+	org-gnome-folder-subscription.xml
 
 plugin_LTLIBRARIES = liborg-gnome-exchange-operations.la
 
@@ -35,7 +36,10 @@ liborg_gnome_exchange_operations_la_SOURCES = 		\
 	exchange-account-setup.c			\
 	exchange-permissions-dialog.c			\
 	exchange-permissions-dialog.h			\
-	exchange-folder-permission.c
+	exchange-folder-permission.c			\
+	exchange-folder-subscription.c			\
+	exchange-folder-subscription.h			\
+	exchange-folder.c
 
 liborg_gnome_exchange_operations_la_LIBADD = 		\
 	$(top_builddir)/e-util/libeutil.la 			\
@@ -54,5 +58,6 @@ glade_DATA =							\
 EXTRA_DIST = 							\
 	org-gnome-exchange-operations.eplug.in			\
 	org-gnome-folder-permissions.xml			\
+	org-gnome-folder-subscription.xml			\
 	$(glade_DATA)
 
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index ac9269902a..70f264e0a0 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -35,13 +35,13 @@
 #include "addressbook/gui/widgets/eab-popup.h"
 
 
-void org_gnome_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target);
-void org_gnome_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target);
-void org_gnome_folder_unsubscribe (EPlugin *ep, EPopupItem *p, void *data);
-void org_gnome_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target);
-void org_gnome_folder_ab_unsubscribe (EPlugin *ep, EPopupItem *p, void *data);
-void org_gnome_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *target);
-void org_gnome_folder_inbox_unsubscribe (EPlugin *ep, EPopupItem *p, void *data);
+void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target);
+void org_gnome_exchange_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target);
+void org_gnome_exchange_folder_unsubscribe (EPlugin *ep, EPopupItem *p, void *data);
+void org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target);
+void org_gnome_exchange_folder_ab_unsubscribe (EPlugin *ep, EPopupItem *p, void *data);
+void org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *target);
+void org_gnome_exchange_folder_inbox_unsubscribe (EPlugin *ep, EPopupItem *p, void *data);
 void popup_free (EPopup *ep, GSList *items, void *data);
 void popup_inbox_free (EPopup *ep, GSList *items, void *data);
 void popup_ab_free (EPopup *ep, GSList *items, void *data);
@@ -50,7 +50,7 @@ void popup_ab_free (EPopup *ep, GSList *items, void *data);
 
 
 static EPopupItem popup_inbox_items[] = {
-	{ E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_folder_inbox_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }
+	{ E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }
 };
 
 void
@@ -60,13 +60,13 @@ popup_inbox_free (EPopup *ep, GSList *items, void *data)
 }
 
 void
-org_gnome_folder_inbox_unsubscribe (EPlugin *ep, EPopupItem *p, void *data)
+org_gnome_exchange_folder_inbox_unsubscribe (EPlugin *ep, EPopupItem *p, void *data)
 {
 	// To be done:
 }
 
 void
-org_gnome_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *target)
+org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *target)
 {
 	GSList *menus = NULL;
 	int i = 0;
@@ -94,7 +94,7 @@ org_gnome_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *target)
 }
 
 static EPopupItem popup_items[] = {
-	{ E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_folder_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }
+	{ E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }
 };
 
 void
@@ -104,7 +104,7 @@ popup_free (EPopup *ep, GSList *items, void *data)
 }
 
 static EPopupItem popup_ab_items[] = {
-	{ E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_folder_ab_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }
+	{ E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }
 };
 
 void
@@ -114,7 +114,7 @@ popup_ab_free (EPopup *ep, GSList *items, void *data)
 }
 
 void
-org_gnome_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target)  
+org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target)  
 {
 	GSList *menus = NULL;
 	int i = 0;
@@ -147,7 +147,7 @@ org_gnome_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *targ
 }
 
 void
-org_gnome_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target)
+org_gnome_exchange_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target)
 {
 	GSList *menus = NULL;
 	int i = 0;
@@ -277,7 +277,7 @@ unsubscribe_dialog_response (GtkDialog *dialog, int response, gpointer data)
 }
 
 void
-org_gnome_folder_ab_unsubscribe (EPlugin *ep, EPopupItem *p, void *data)
+org_gnome_exchange_folder_ab_unsubscribe (EPlugin *ep, EPopupItem *p, void *data)
 {
 	GtkWidget *dialog = NULL;
 	EABPopupTargetSource *target = data;
@@ -321,7 +321,7 @@ org_gnome_folder_ab_unsubscribe (EPlugin *ep, EPopupItem *p, void *data)
 	unsubscribe_dialog_ab_response (dialog, response, data);
 }
 void
-org_gnome_folder_unsubscribe (EPlugin *ep, EPopupItem *p, void *data)
+org_gnome_exchange_folder_unsubscribe (EPlugin *ep, EPopupItem *p, void *data)
 {
 	GtkWidget *dialog = NULL;
 	ECalPopupTargetSource *target = data;
@@ -367,7 +367,7 @@ org_gnome_folder_unsubscribe (EPlugin *ep, EPopupItem *p, void *data)
 
 
 void
-org_gnome_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target)
+org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target)
 {
 	GSList *accounts, *acc;
 	ExchangeAccount *account = NULL;
diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in
index 591a453728..569609d06e 100644
--- a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in
+++ b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in
@@ -86,6 +86,34 @@
 		activate="org_gnome_exchange_menu_folder_permissions"/>
 	</menu>
 	</hook>
+	<hook class="org.gnome.evolution.mail.bonobomenu:1.0">
+		<menu id="org.gnome.evolution.mail.browser" target="select">
+		<ui file="@PLUGINDIR@/org-gnome-folder-subscription.xml"/>
+		<item
+			type="item"
+			verb="FolderSubscription"
+			path="/commands/FolderSubscription"
+			enable="all"
+			activate="org_gnome_exchange_folder_subscription"/>
+		</menu>
+	</hook>
+	<hook class="org.gnome.evolution.calendar.popup:1.0">
+		<menu id="org.gnome.evolution.calendar.source.popup" target="source" factory="org_gnome_exchange_check_subscribed">
+		</menu>
+	</hook>
+	<hook class="org.gnome.evolution.calendar.popup:1.0">
+		<menu id="org.gnome.evolution.tasks.source.popup" target="source" factory="org_gnome_exchange_check_subscribed">
+		</menu>
+	</hook>
+	<hook class="org.gnome.evolution.addressbook.popup:1.0">
+		<menu id="org.gnome.evolution.addressbook.source.popup" target="source" factory="org_gnome_exchange_check_address_book_subscribed">
+		</menu>
+	</hook>
+	<hook class="org.gnome.evolution.mail.popup:1.0">
+		<menu id="org.gnome.evolution.mail.foldertree.popup" target="folder" factory = "org_gnome_exchange_check_inbox_subscribed">
+		</menu>
+	</hook>
+
 
   </e-plugin>
 </e-plugin-list>