[cinnamon/f17] update to 1.6.0 release

[leigh123linux]

commit dfb49551a9f4c5b24b5ec2a48ebe321356877451
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Sep 18 14:27:16 2012 +0100

    update to 1.6.0 release
    
    - drop upstream patches
    - add requires python-imaging, gnome-python2-gconf and python-imaging
    - patch to use nautilus instead of nemo

 nemo.patch |   96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 96 insertions(+), 0 deletions(-)
---
diff --git a/nemo.patch b/nemo.patch
new file mode 100644
index 0000000..758c7a7
--- /dev/null
+++ b/nemo.patch
@@ -0,0 +1,96 @@
+--- a/files/usr/lib/cinnamon-settings/cinnamon-settings.py
++++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
+@@ -653,8 +653,8 @@ class ThemeViewSidePage (SidePage):
+         other_settings_box.pack_start(menusHaveIconsCB, False, False, 2)
+         buttonsHaveIconsCB = GSettingsCheckButton(_("Buttons Have Icons"), "org.gnome.desktop.interface", "buttons-have-icons", None)
+         other_settings_box.pack_start(buttonsHaveIconsCB, False, False, 2)
+-        if 'org.nemo' in Gio.Settings.list_schemas():
+-            alwaysUseLocationEntryCB = GSettingsCheckButton(_("Always Use Location Entry In Nemo"), "org.nemo.preferences", "show-location-entry", None)
++        if 'org.org.gnome.nautilus' in Gio.Settings.list_schemas():
++            alwaysUseLocationEntryCB = GSettingsCheckButton(_("Always Use Location Entry In Natilus"), "org.gnome.nautilus.preferences", "show-location-entry", None)
+             other_settings_box.pack_start(alwaysUseLocationEntryCB, False, False, 2)
+         cursorThemeSwitcher = GSettingsComboBox(_("Cursor theme"), "org.gnome.desktop.interface", "cursor-theme", None, self._load_cursor_themes())
+         other_settings_box.pack_start(cursorThemeSwitcher, False, False, 2)
+@@ -1942,32 +1942,32 @@ class MainWindow:
+         sidePage = ExtensionViewSidePage(_("Extensions"), "extensions.svg", self.content_box)
+         self.sidePages.append((sidePage, "extensions"))
+         
+-        if 'org.nemo' in Gio.Settings.list_schemas():
+-            nemo_desktop_schema = Gio.Settings.new("org.nemo.desktop")
+-            nemo_desktop_keys = nemo_desktop_schema.list_keys()
++        if 'org.gnome.nautilus' in Gio.Settings.list_schemas():
++            nautilus_desktop_schema = Gio.Settings.new("org.gnome.nautilus.desktop")
++            nautilus_desktop_keys = nautilus_desktop_schema.list_keys()
+                             
+             sidePage = SidePage(_("Desktop"), "desktop.svg", self.content_box)
+             self.sidePages.append((sidePage, "desktop"))
+-            sidePage.add_widget(GSettingsCheckButton(_("Have file manager (Nemo) handle the desktop"), "org.gnome.desktop.background", "show-desktop-icons", None))
+-            if "computer-icon-visible" in nemo_desktop_keys:
++            sidePage.add_widget(GSettingsCheckButton(_("Have file manager (Natilus) handle the desktop"), "org.gnome.desktop.background", "show-desktop-icons", None))
++            if "computer-icon-visible" in nautilus_desktop_keys:
+                 box = IndentedHBox()
+-                box.add(GSettingsCheckButton(_("Computer icon visible on desktop"), "org.nemo.desktop", "computer-icon-visible", "org.gnome.desktop.background/show-desktop-icons"))
++                box.add(GSettingsCheckButton(_("Computer icon visible on desktop"), "org.gnome.nautilus.desktop", "computer-icon-visible", "org.gnome.desktop.background/show-desktop-icons"))
+                 sidePage.add_widget(box)
+-            if "home-icon-visible" in nemo_desktop_keys:
++            if "home-icon-visible" in nautilus_desktop_keys:
+                 box = IndentedHBox()
+-                box.add(GSettingsCheckButton(_("Home icon visible on desktop"), "org.nemo.desktop", "home-icon-visible", "org.gnome.desktop.background/show-desktop-icons"))
++                box.add(GSettingsCheckButton(_("Home icon visible on desktop"), "org.gnome.nautilus.desktop", "home-icon-visible", "org.gnome.desktop.background/show-desktop-icons"))
+                 sidePage.add_widget(box)
+-            if "network-icon-visible" in nemo_desktop_keys:
++            if "network-icon-visible" in nautilus_desktop_keys:
+                 box = IndentedHBox()
+-                box.add(GSettingsCheckButton(_("Network Servers icon visible on desktop"), "org.nemo.desktop", "network-icon-visible", "org.gnome.desktop.background/show-desktop-icons"))
++                box.add(GSettingsCheckButton(_("Network Servers icon visible on desktop"), "org.gnome.nautilus.desktop", "network-icon-visible", "org.gnome.desktop.background/show-desktop-icons"))
+                 sidePage.add_widget(box)
+-            if "trash-icon-visible" in nemo_desktop_keys:
++            if "trash-icon-visible" in nautilus_desktop_keys:
+                 box = IndentedHBox()
+-                box.add(GSettingsCheckButton(_("Trash icon visible on desktop"), "org.nemo.desktop", "trash-icon-visible", "org.gnome.desktop.background/show-desktop-icons"))
++                box.add(GSettingsCheckButton(_("Trash icon visible on desktop"), "org.gnome.nautilus.desktop", "trash-icon-visible", "org.gnome.desktop.background/show-desktop-icons"))
+                 sidePage.add_widget(box)
+-            if "volumes-visible" in nemo_desktop_keys:
++            if "volumes-visible" in nautilus_desktop_keys:
+                 box = IndentedHBox()
+-                box.add(GSettingsCheckButton(_("Show mounted volumes on the desktop"), "org.nemo.desktop", "volumes-visible", "org.gnome.desktop.background/show-desktop-icons"))
++                box.add(GSettingsCheckButton(_("Show mounted volumes on the desktop"), "org.gnome.nautilus.desktop", "volumes-visible", "org.gnome.desktop.background/show-desktop-icons"))
+                 sidePage.add_widget(box)
+ 
+         sidePage = SidePage(_("Windows"), "windows.svg", self.content_box)
+--- a/js/ui/placesManager.js
++++ b/js/ui/placesManager.js
+@@ -166,11 +166,11 @@ PlacesManager.prototype = {
+                                      icon_size: size });
+             },
+             function (params) {
+-                // BUG: nemo-connect-server doesn't have a desktop file, so we can't
++                // BUG: nautilus-connect-server doesn't have a desktop file, so we can't
+                 // launch it with the workspace from params. It's probably pretty rare
+                 // and odd to drag this place onto a workspace in any case
+ 
+-                Util.spawn(['nemo-connect-server']);
++                Util.spawn(['nautilus-connect-server']);
+             });
+ 
+         this._defaultPlaces.push(this._home);
+@@ -178,7 +178,7 @@ PlacesManager.prototype = {
+         this._defaultPlaces.push(this._connect);
+ 
+         /*
+-        * Show devices, code more or less ported from nemo-places-sidebar.c
++        * Show devices, code more or less ported from nautilus-places-sidebar.c
+         */
+         this._volumeMonitor = Gio.VolumeMonitor.get();
+         this._volumeMonitor.connect('volume-added', Lang.bind(this, this._updateDevices));
+--- a/files/usr/share/cinnamon/applets/removable-drives at cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/removable-drives at cinnamon.org/applet.js
+@@ -64,7 +64,7 @@ MyApplet.prototype = {
+             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+             this.menu.addAction(_("Open file manager"), function(event) {
+                 let appSystem = Cinnamon.AppSystem.get_default();
+-                let app = appSystem.lookup_app('nemo.desktop');
++                let app = appSystem.lookup_app('nautilus.desktop');
+                 app.activate_full(-1, event.get_time());
+             });     
+