From 2febb125d6abd0e9f485a13ae99281112a97416a Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 12 Aug 2009 11:37:59 -0400
Subject: Get the backup-restore plugin working.

---
 .../org-gnome-backup-restore.eplug.xml             | 39 +++++++++-------------
 1 file changed, 16 insertions(+), 23 deletions(-)

(limited to 'plugins/backup-restore/org-gnome-backup-restore.eplug.xml')

diff --git a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
index 2ed7222adc..6d92cf48ae 100644
--- a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
+++ b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
@@ -9,31 +9,24 @@
     <author name="JP Rosevear" email="jpr@novell.com"/>
     <_description>Backup and restore your Evolution data and settings.</_description>
 
-    <hook class="org.gnome.evolution.shell.bonobomenu:1.0">
-
-      <menu id="org.gnome.evolution.shell" target="shell">
-	<!-- the path to the bonobo menu description -->
-	<ui file="@PLUGINDIR@/org-gnome-backup-restore.xml"/>
-	<item
-	  type="item"
-	  verb="EPBRBackup"
-	  path="/commands/EPBRBackup"
-	  enable="one"
-	  activate="org_gnome_backup_restore_backup"/>
-	<item
-	  type="item"
-	  verb="EPBRRestore"
-	  path="/commands/EPBRRestore"
-	  enable="one"
-	  activate="org_gnome_backup_restore_restore"/>
-      </menu>
+    <hook class="org.gnome.evolution.ui:1.0">
+      <ui-manager id="org.gnome.evolution.shell">
+        <menubar name='main-menu'>
+          <menu action='file-menu'>
+            <placeholder name='file-actions'>
+              <menuitem action='settings-backup'/>
+              <menuitem action='settings-restore'/>
+            </placeholder>
+          </menu>
+        </menubar>
+      </ui-manager>
+    </hook>
 
+    <hook class="org.gnome.evolution.mail.config:1.0">
+      <group target="account" id="org.gnome.evolution.mail.config.accountWizard" commit="backup_restore_commit" abort="backup_restore_abort">
+        <item type="page" path="0.startup_page.10" factory="backup_restore_page"/>
+      </group>
     </hook>
-	    <hook class="org.gnome.evolution.mail.config:1.0">
-		      <group target="account" id="org.gnome.evolution.mail.config.accountWizard" commit="backup_restore_commit" abort="backup_restore_abort">
-			<item type="page" path="0.startup_page.10" factory="backup_restore_page"/>
-		      </group>
-	    </hook>
 
   </e-plugin>
 </e-plugin-list>
-- 
cgit v1.2.3


From de528db6c18b7ecee83bb8b52850d935c1244ebf Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 18 Aug 2009 10:00:23 -0400
Subject: =?UTF-8?q?Bug=C2=A0567260=20-=20Migrate=20from=20GnomeDruid=20to?=
 =?UTF-8?q?=20GtkAssistant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/backup-restore/org-gnome-backup-restore.eplug.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/backup-restore/org-gnome-backup-restore.eplug.xml')

diff --git a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
index 6d92cf48ae..c78b376296 100644
--- a/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
+++ b/plugins/backup-restore/org-gnome-backup-restore.eplug.xml
@@ -24,7 +24,7 @@
 
     <hook class="org.gnome.evolution.mail.config:1.0">
       <group target="account" id="org.gnome.evolution.mail.config.accountWizard" commit="backup_restore_commit" abort="backup_restore_abort">
-        <item type="page" path="0.startup_page.10" factory="backup_restore_page"/>
+        <item type="page" path="0.startup_page.10.backup_restore" factory="backup_restore_page"/>
       </group>
     </hook>
 
-- 
cgit v1.2.3