[Pkg-bazaar-commits] ./bzr-gtk/unstable r460: Removed duplicate code

[Martin Albisetti]

------------------------------------------------------------
revno: 460
committer: Martin Albisetti <argentina at gmail.com>
branch nick: gtk.nautilus
timestamp: Thu 2008-04-03 22:46:01 -0300
message:
  Removed duplicate code
modified:
  nautilus-bzr.py
-------------- next part --------------
=== modified file 'nautilus-bzr.py'
--- a/nautilus-bzr.py	2008-04-04 00:44:37 +0000
+++ b/nautilus-bzr.py	2008-04-04 01:46:01 +0000
@@ -250,13 +250,13 @@
             item = nautilus.MenuItem('BzrNautilus::enable',
                                      'Enable Bazaar Plugin for this Branch',
                                      'Enable Bazaar plugin for nautilus')
-            item.connect('activate', self.enable_integration, vfs_file)
+            item.connect('activate', self.toggle_integration, 'True', vfs_file)
             return item,
         else:
             item = nautilus.MenuItem('BzrNautilus::disable',
                                       'Disable Bazaar Plugin for the Branch',
                                       'Disable Bazaar plugin for nautilus')
-            item.connect('activate', self.disable_integration, vfs_file)
+            item.connect('activate', self.toggle_integration, 'False', vfs_file)
             items.append(item)
 
         item = nautilus.MenuItem('BzrNautilus::log',
@@ -436,7 +436,7 @@
                 disabled_flag = config.get_user_option('nautilus_integration')
         return disabled_flag
 
-    def enable_integration(self, menu, vfs_file=None):
+    def toggle_integration(self, menu, action, vfs_file=None):
         try:
             tree, path = WorkingTree.open_containing(vfs_file.get_uri())
         except NotBranchError:
@@ -448,18 +448,5 @@
             config = GlobalConfig()
         else:
             config = branch.get_config()
-        config.set_user_option('nautilus_integration','True')
+        config.set_user_option('nautilus_integration', action)
 
-    def disable_integration(self, menu, vfs_file=None):
-        try:
-            tree, path = WorkingTree.open_containing(vfs_file.get_uri())
-        except NotBranchError:
-            return
-        except NoWorkingTree:
-            return   
-        branch = tree.branch
-        if branch is None:
-            config = GlobalConfig()
-        else:
-            config = branch.get_config()
-        config.set_user_option('nautilus_integration','False')