Merge lp:~dobey/ubuntuone-client/bookmark-fixins into lp:ubuntuone-client

[dobey]

Remove the remove_from_places code
Add a config option to only create the bookmark on first authorization
Only set the bookmark on first authorization

[John O'Brien (jdobrien)]

Looks good.

When reviewing this I noticed I had the following bookmark:
file:///home/john/Ubuntu%20One/My%20Files Ubuntu One

I am guessing it's an old one and that it was overridden by the correct one that came after it.

review: Approve

[Mark G. Saye (markgsaye)]

Bookmark appears when first expected, but not after deleting it. Code looks good, tests pass (apart from one unrelated failure)

review: Approve

=== modified file 'bin/ubuntuone-client-applet'
--- bin/ubuntuone-client-applet	2009-09-30 14:31:41 +0000
+++ bin/ubuntuone-client-applet	2009-10-02 18:00:27 +0000
@@ -121,6 +121,9 @@
             if not self.config.has_option("ubuntuone", "connected"):
                   self.config.set("ubuntuone", "connected", "False")
 
+            if not self.config.has_option("ubuntuone", "bookmarked"):
+                  self.config.set("ubuntuone", "bookmarked", "False")
+
             self.show_applet = self.config.getint("ubuntuone", "show_applet")
             self.connect = self.config.getint("ubuntuone", "connect")
             self.connected = self.config.getboolean("ubuntuone", "connected")
@@ -756,8 +759,6 @@
             iface = dbus.Interface(client, DBUS_IFACE_SYNC_NAME)
             def got_root(root):
                   """We got the root dir."""
-                  if self.__managed_dir:
-                        self.__remove_from_places(self.__managed_dir)
                   self.__managed_dir = root
                   if os.path.isdir(self.__managed_dir) and \
                             os.access(self.__managed_dir,
@@ -961,9 +962,10 @@
 
       def __add_to_places(self):
             """Add the managed directory to the .gtk-bookmarks file."""
-            # migrate from the old places bookmark
-            if os.path.basename(self.__managed_dir) != BOOKMARK_NAME:
-                self.__remove_from_places(os.path.dirname(self.__managed_dir))
+            # Only add once
+            if self.__config.getboolean("ubuntuone", "bookmarked"):
+                  return
+
             path = os.path.join(os.path.expanduser("~"), ".gtk-bookmarks")
             with open(path, "a+") as f:
                   bookmarks_entry = "file://%s %s\n" % (
@@ -975,19 +977,9 @@
                   if not in_file:
                         f.write(bookmarks_entry)
 
-      def __remove_from_places(self, dir):
-            """Remove the old path from the .gtk-bookmarks file."""
-            path = os.path.join(os.path.expanduser("~"), ".gtk-bookmarks")
-            with open(path, "a+") as f:
-                  entry = "file://%s %s\n" % (quote(dir), os.path.basename(dir))
-                  lines = []
-                  for line in f:
-                        if line != entry:
-                              lines.append(line)
-                  f.truncate(0)
-                  f.seek(0)
-                  output = "".join(lines)
-                  f.write(output)
+            self.__config.set("ubuntuone", "bookmarked", "True")
+            with open(CONF_FILE, "w+b") as f:
+                  self.__config.write(f)
 
       def sd_dbus_error(self, error):
             """