Added EVOLUTION_CALENDAR_CFLAGS and widgets in 'INCLUDES'. Added the hooks

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

        * Makefile.am: Added EVOLUTION_CALENDAR_CFLAGS and widgets in 'INCLUDES'.
        * org-gnome-exchange-operations.eplug.in: Added the hooks for Calendar,
        Tasks and Contacts.
        * exchange-folder-permission.c: Added new functions to support
        'File->Permissions' for all the components.
        * org-gnome-folder-permissions.xml: Changed the placeholder from 'Folder'
        to 'File' menu for 'Permissions' menu-item.

        Fixes bug #231968 (Partly).

svn path=/trunk/; revision=29880

5 files changed, 99 insertions, 8 deletions

diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 2a7161a6ed..4033d09874 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,15 @@
+2005-07-25  Shakti Sen <shprasad@novell.com>
+
+	* Makefile.am: Added EVOLUTION_CALENDAR_CFLAGS and widgets in 'INCLUDES'.
+	* org-gnome-exchange-operations.eplug.in: Added the hooks for Calendar,
+	Tasks and Contacts.
+	* exchange-folder-permission.c: Added new functions to support 
+	'File->Permissions' for all the components.
+	* org-gnome-folder-permissions.xml: Changed the placeholder from 'Folder'
+	to 'File' menu for 'Permissions' menu-item.
+	
+	Fixes bug #231968 (Partly).
+
 2005-07-25  Sarfraaz Ahmed <asarfraaz@novell.com>
 
 	* exchange-account-setup.c 
diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am
index 55ac36244e..fd1779c6fb 100644
--- a/plugins/exchange-operations/Makefile.am
+++ b/plugins/exchange-operations/Makefile.am
@@ -1,9 +1,11 @@
 INCLUDES = -I .						\
 	-I$(top_srcdir)	                                \
+	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_MAIL_CFLAGS) 			\
 	$(CAMEL_EXCHANGE_CFLAGS)                        \
 	$(CAMEL_CFLAGS)					\
 	$(LDAP_CFLAGS)					\
+	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"          \
 	-DCONNECTOR_GLADEDIR=\""$(gladedir)"\"
 
diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c
index e7aef33877..78d190c5a4 100644
--- a/plugins/exchange-operations/exchange-folder-permission.c
+++ b/plugins/exchange-operations/exchange-folder-permission.c
@@ -38,12 +38,18 @@
 #include "exchange-operations.h"
 #include "exchange-permissions-dialog.h"
 #include "addressbook/gui/widgets/eab-popup.h"
+#include "calendar/gui/e-cal-menu.h"
+#include "calendar/gui/e-cal-model.h"
+#include "addressbook/gui/widgets/eab-menu.h"
 
 static void org_folder_permissions_cb (EPopup *ep, EPopupItem *p, void *data);
 void org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *t);
 void org_gnome_exchange_menu_folder_permissions (EPlugin *ep, EMMenuTargetSelect *target);
 void org_gnome_exchange_calendar_permissions (EPlugin *ep, ECalPopupTargetSource *target);
 void org_gnome_exchange_addressbook_permissions (EPlugin *ep, EABPopupTargetSource *target);
+void org_gnome_exchange_menu_ab_permissions (EPlugin *ep, EABMenuTargetSelect *target);
+void org_gnome_exchange_menu_tasks_permissions (EPlugin *ep, ECalMenuTargetSelect *target);
+void org_gnome_exchange_menu_cal_permissions (EPlugin *ep, ECalMenuTargetSelect *target);
 
 gchar *selected_exchange_folder_uri = NULL;
 
@@ -217,3 +223,41 @@ org_gnome_exchange_menu_folder_permissions (EPlugin *ep, EMMenuTargetSelect *tar
 	if (folder)
 		exchange_permissions_dialog_new (account, folder, NULL);
 }
+
+void
+org_gnome_exchange_menu_cal_permissions (EPlugin *ep, ECalMenuTargetSelect *target)
+{
+#if 0
+	ExchangeAccount *account = NULL;
+	EFolder *folder = NULL;
+	ECalModel *model = target->model;
+	ECal *ecal;
+	ecal = e_cal_model_get_default_client (model);
+	gchar *uri = e_cal_get_uri (ecal);
+	
+
+	if (target == NULL)
+		return;
+
+	account = exchange_operations_get_exchange_account ();
+
+	if (!account)
+		return;
+
+	//folder = exchange_account_get_folder (account, target->target->uri);
+	//if (folder)
+	//	exchange_permissions_dialog_new (account, folder, NULL);
+#endif
+}
+
+void
+org_gnome_exchange_menu_tasks_permissions (EPlugin *ep, ECalMenuTargetSelect *target)
+{
+
+}
+
+void
+org_gnome_exchange_menu_ab_permissions (EPlugin *ep, EABMenuTargetSelect *target)
+{
+
+}
diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in
index 79bdc254bd..f7962c4bb8 100644
--- a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in
+++ b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in
@@ -101,6 +101,39 @@
 		activate="org_gnome_exchange_menu_folder_permissions"/>
 	</menu>
 	</hook>
+	<hook class="org.gnome.evolution.calendar.bonobomenu:1.0">
+	<menu id="org.gnome.evolution.calendar.view" target="select">
+	<ui file="@PLUGINDIR@/org-gnome-folder-permissions.xml"/>
+	<item
+		type="item"
+		verb="CheckFolderPermission"
+		path="/commands/CheckFolderPermission"
+		enable="all"
+		activate="org_gnome_exchange_menu_cal_permissions"/>
+	</menu>
+	</hook>
+	<hook class="org.gnome.evolution.calendar.bonobomenu:1.0">
+	<menu id="org.gnome.evolution.tasks.view" target="select">
+	<ui file="@PLUGINDIR@/org-gnome-folder-permissions.xml"/>
+	<item
+		type="item"
+		verb="CheckFolderPermission"
+		path="/commands/CheckFolderPermission"
+		enable="all"
+		activate="org_gnome_exchange_menu_tasks_permissions"/>
+	</menu>
+	</hook>
+	<hook class="org.gnome.evolution.addressbook.bonobomenu:1.0">
+	<menu id="org.gnome.evolution.addressbook.view" target="select">
+	<ui file="@PLUGINDIR@/org-gnome-folder-permissions.xml"/>
+	<item
+		type="item"
+		verb="CheckFolderPermission"
+		path="/commands/CheckFolderPermission"
+		enable="all"
+		activate="org_gnome_exchange_menu_ab_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"/>
diff --git a/plugins/exchange-operations/org-gnome-folder-permissions.xml b/plugins/exchange-operations/org-gnome-folder-permissions.xml
index eb35bd89d4..c938990175 100644
--- a/plugins/exchange-operations/org-gnome-folder-permissions.xml
+++ b/plugins/exchange-operations/org-gnome-folder-permissions.xml
@@ -5,13 +5,13 @@
   </commands>
 
   <menu>
-    <placeholder name="FolderPlaceholder">
-      <submenu name="Folder">
-	<placeholder name="MessagesInFolder">
-	  <separator f="" name="emaillist5"/>
-	  <menuitem name="CheckFolderPermission" verb=""/>
-	</placeholder>
-      </submenu>
-    </placeholder>
+    <submenu name="File">
+      <placeholder name="FileOps">
+        <menuitem name="CheckFolderPermission" verb=""/>
+      </placeholder>
+    </submenu>
+    <submenu name="Tools">
+      <placeholder name="ComponentPlaceholder"/>
+    </submenu>
   </menu>
 </Root>