Included files org-gnome-exchange-ab-subscription.xml,

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

        * Makefile.am: Included files org-gnome-exchange-ab-subscription.xml,
        org-gnome-exchange-tasks-subscription.xml and
        org-gnome-exchange-cal-subscription.xml.
        * org-gnome-exchange-ab-subscription.xml: Added newly to add
        "Subscribe to Other User's Contacts' menu-item in 'File' menu for
        address book.
        * org-gnome-exchange-tasks-subscription.xml: Same for 'Tasks'.
        * org-gnome-exchange-cal-subscription.xml: Same for 'Calendar'.

        Fixes bug #310985.

svn path=/trunk/; revision=29846

7 files changed, 117 insertions, 9 deletions

diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 4f2d072abe..82fafcb8fd 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,16 @@
+2005-07-20  Shakti Sen <shprasad@novell.com>
+
+	* Makefile.am: Included files org-gnome-exchange-ab-subscription.xml,
+	org-gnome-exchange-tasks-subscription.xml and
+	org-gnome-exchange-cal-subscription.xml.
+	* org-gnome-exchange-ab-subscription.xml: Added newly to add
+	"Subscribe to Other User's Contacts' menu-item in 'File' menu for
+	address book.
+	* org-gnome-exchange-tasks-subscription.xml: Same for 'Tasks'.
+	* org-gnome-exchange-cal-subscription.xml: Same for 'Calendar'.
+
+	Fixes bug #310985.
+
 2005-07-22  Praveen Kumar <kpraveen@novell.com>
 
 	* exchange-calendar.c : Handling the rename of calendars. This
diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am
index 48e51efa20..55ac36244e 100644
--- a/plugins/exchange-operations/Makefile.am
+++ b/plugins/exchange-operations/Makefile.am
@@ -12,7 +12,10 @@ INCLUDES = -I .						\
 
 plugin_DATA = org-gnome-exchange-operations.eplug 	\
 	org-gnome-folder-permissions.xml		\
-	org-gnome-folder-subscription.xml
+	org-gnome-folder-subscription.xml		\
+	org-gnome-exchange-tasks-subscription.xml	\
+	org-gnome-exchange-cal-subscription.xml		\
+	org-gnome-exchange-ab-subscription.xml
 
 plugin_LTLIBRARIES = liborg-gnome-exchange-operations.la
 
@@ -64,6 +67,9 @@ EXTRA_DIST = 							\
 	org-gnome-exchange-operations.error.xml			\
 	org-gnome-folder-permissions.xml			\
 	org-gnome-folder-subscription.xml			\
+	org-gnome-exchange-tasks-subscription.xml		\
+	org-gnome-exchange-cal-subscription.xml			\
+	org-gnome-exchange-ab-subscription.xml			\
 	$(glade_DATA)						
 
 BUILT_SOURCES = $(error_DATA)
diff --git a/plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml b/plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml
new file mode 100644
index 0000000000..eb7b8dac0e
--- /dev/null
+++ b/plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml
@@ -0,0 +1,18 @@
+<Root>
+  <commands>
+    <cmd name="FolderSubscription" _label="Subscribe to Other User's Contacts"
+      _tip="Subscribe to Other User's Contacts"/>
+  </commands>
+
+  <menu>
+    <submenu name="File">
+      <placeholder name="FileOps">
+        <menuitem name="FolderSubscription" verb=""/>
+      </placeholder>
+    </submenu>
+    <submenu name="Tools">
+      <placeholder name="ComponentPlaceholder"/>
+    </submenu>
+  </menu>
+
+</Root>
diff --git a/plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml b/plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml
new file mode 100644
index 0000000000..4b4c5e54fe
--- /dev/null
+++ b/plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml
@@ -0,0 +1,18 @@
+<Root>
+  <commands>
+    <cmd name="FolderSubscription" _label="Subscribe to Other User's Calendar"
+      _tip="Subscribe to Other User's Calendar"/>
+  </commands>
+
+  <menu>
+    <submenu name="File">
+      <placeholder name="FileOps">
+        <menuitem name="FolderSubscription" verb=""/>
+      </placeholder>
+    </submenu>
+    <submenu name="Tools">
+      <placeholder name="ComponentPlaceholder"/>
+    </submenu>
+  </menu>
+
+</Root>
diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in
index 6538c980b7..e459e0be2c 100644
--- a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in
+++ b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.in
@@ -112,6 +112,39 @@
 			activate="org_gnome_exchange_folder_subscription"/>
 		</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-exchange-cal-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.bonobomenu:1.0">
+		<menu id="org.gnome.evolution.tasks.view" target="select">
+		<ui file="@PLUGINDIR@/org-gnome-exchange-task-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.addressbook.bonobomenu:1.0">
+		<menu id="org.gnome.evolution.addressbook.view" target="select">
+		<ui file="@PLUGINDIR@/org-gnome-exchange-ab-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>
diff --git a/plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml b/plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml
new file mode 100644
index 0000000000..dfd7ccaca7
--- /dev/null
+++ b/plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml
@@ -0,0 +1,18 @@
+<Root>
+  <commands>
+    <cmd name="FolderSubscription" _label="Subscribe to Other User's Tasks"
+      _tip="Subscribe to Other User's Tasks"/>
+  </commands>
+
+  <menu>
+    <submenu name="File">
+      <placeholder name="FileOps">
+        <menuitem name="FolderSubscription" verb=""/>
+      </placeholder>
+    </submenu>
+    <submenu name="Tools">
+      <placeholder name="ComponentPlaceholder"/>
+    </submenu>
+  </menu>
+
+</Root>
diff --git a/plugins/exchange-operations/org-gnome-folder-subscription.xml b/plugins/exchange-operations/org-gnome-folder-subscription.xml
index 6831902612..07a270792a 100644
--- a/plugins/exchange-operations/org-gnome-folder-subscription.xml
+++ b/plugins/exchange-operations/org-gnome-folder-subscription.xml
@@ -5,13 +5,15 @@
   </commands>
 
   <menu>
-    <placeholder name="FolderPlaceholder">
-      <submenu name="Folder">
-	<placeholder name="MessagesInFolder">
-	  <separator f="" name="emaillist5"/>
-	  <menuitem name="FolderSubscription" verb=""/>
-	</placeholder>
-      </submenu>
-    </placeholder>
+    <submenu name="File">
+      <placeholder name="FileOps">
+        <menuitem name="FolderSubscription" verb=""/>
+      </placeholder>
+    </submenu>
+    <submenu name="Tools">
+      <placeholder name="ComponentPlaceholder"/>
+    </submenu>
+
+
   </menu>
 </Root>