[gnome-shell-extensions/gnome-3-6] PlacesMenu: support historical location for bookmarks file

[Giovanni Campagna <gcampagna src gnome org>]

commit 7428d1702fc7a89ebf8c827bdd5aac4cad5b8837
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Fri Nov 16 20:28:01 2012 +0100

    PlacesMenu: support historical location for bookmarks file
    
    Ubuntu is shipping with Nautilus 3.4 in 12.10, so the bookmarks file
    was not moved to .config/gtk-3.0.

 extensions/places-menu/placeDisplay.js |   51 ++++++++++++++++++++-----------
 1 files changed, 33 insertions(+), 18 deletions(-)
---
diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js
index ab7211c..fdb7ada 100644
--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -134,22 +134,25 @@ const PlacesManager = new Lang.Class({
         this._connectVolumeMonitorSignals();
         this._updateMounts();
 
-        this._bookmarksPath = GLib.build_filenamev([GLib.get_user_config_dir(), 'gtk-3.0', 'bookmarks']);
-        this._bookmarksFile = Gio.file_new_for_path(this._bookmarksPath);
-        this._monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
+        this._bookmarksFile = this._findBookmarksFile()
         this._bookmarkTimeoutId = 0;
-        this._monitor.connect('changed', Lang.bind(this, function () {
-            if (this._bookmarkTimeoutId > 0)
-                return;
-            /* Defensive event compression */
-            this._bookmarkTimeoutId = Mainloop.timeout_add(100, Lang.bind(this, function () {
-                this._bookmarkTimeoutId = 0;
-                this._reloadBookmarks();
-                return false;
+        this._monitor = null;
+
+        if (this._bookmarksFile) {
+            this._monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
+            this._monitor.connect('changed', Lang.bind(this, function () {
+                if (this._bookmarkTimeoutId > 0)
+                    return;
+                /* Defensive event compression */
+                this._bookmarkTimeoutId = Mainloop.timeout_add(100, Lang.bind(this, function () {
+                    this._bookmarkTimeoutId = 0;
+                    this._reloadBookmarks();
+                    return false;
+                }));
             }));
-        }));
 
-        this._reloadBookmarks();
+            this._reloadBookmarks();
+        }
     },
 
     _connectVolumeMonitorSignals: function() {
@@ -169,7 +172,8 @@ const PlacesManager = new Lang.Class({
         for (let i = 0; i < this._volumeMonitorSignals.length; i++)
             this._volumeMonitor.disconnect(this._volumeMonitorSignals[i]);
 
-        this._monitor.cancel();
+        if (this._monitor)
+            this._monitor.cancel();
         if (this._bookmarkTimeoutId)
             Mainloop.source_remove(this._bookmarkTimeoutId);
     },
@@ -242,14 +246,25 @@ const PlacesManager = new Lang.Class({
         this.emit('network-updated');
     },
 
+    _findBookmarksFile: function() {
+        let paths = [
+            GLib.build_filenamev([GLib.get_user_config_dir(), 'gtk-3.0', 'bookmarks']),
+            GLib.build_filenamev([GLib.get_home_dir(), '.gtk-bookmarks']),
+        ];
+
+        for (let i = 0; i < paths.length; i++) {
+            if (GLib.file_test(paths[i], GLib.FileTest.EXISTS))
+                return Gio.File.new_for_path(paths[i]);
+        }
+
+        return null;
+    },
+
     _reloadBookmarks: function() {
 
         this._bookmarks = [];
 
-        if (!GLib.file_test(this._bookmarksPath, GLib.FileTest.EXISTS))
-            return;
-
-        let content = Shell.get_file_contents_utf8_sync(this._bookmarksPath);
+        let content = Shell.get_file_contents_utf8_sync(this._bookmarksFile.get_path());
         let lines = content.split('\n');
 
         let bookmarks = [];