[cinnamon/f17] update to 1.6.3 release
leigh123linux
leigh123linux at fedoraproject.org
Sat Oct 20 21:26:09 UTC 2012
commit c7c90e65c52436ed199bd9623077daa26d6517fb
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Sat Oct 20 22:25:51 2012 +0100
update to 1.6.3 release
nemo.patch | 87 ++++++++++++++---------------------------------------------
1 files changed, 21 insertions(+), 66 deletions(-)
---
diff --git a/nemo.patch b/nemo.patch
index 758c7a7..f516686 100644
--- a/nemo.patch
+++ b/nemo.patch
@@ -1,17 +1,17 @@
--- 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):
+@@ -881,8 +881,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)
++ if 'org.gnome.nautilus' in Gio.Settings.list_schemas():
++ alwaysUseLocationEntryCB = GSettingsCheckButton(_("Always Use Location Entry In Nautilus"), "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:
+@@ -2844,23 +2844,23 @@ class MainWindow:
sidePage = ExtensionViewSidePage(_("Extensions"), "extensions.svg", self.content_box)
self.sidePages.append((sidePage, "extensions"))
@@ -24,73 +24,28 @@
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))
+- #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)
+- sidePage.add_widget(GSettingsCheckButton(_("Computer icon visible on desktop"), "org.nemo.desktop", "computer-icon-visible", None))
- 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)
+- sidePage.add_widget(GSettingsCheckButton(_("Home icon visible on desktop"), "org.nemo.desktop", "home-icon-visible", None))
- 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)
+- sidePage.add_widget(GSettingsCheckButton(_("Network Servers icon visible on desktop"), "org.nemo.desktop", "network-icon-visible", None))
- 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)
+- sidePage.add_widget(GSettingsCheckButton(_("Trash icon visible on desktop"), "org.nemo.desktop", "trash-icon-visible", None))
- if "volumes-visible" in nemo_desktop_keys:
+- sidePage.add_widget(GSettingsCheckButton(_("Show mounted volumes on the desktop"), "org.nemo.desktop", "volumes-visible", None))
++ #sidePage.add_widget(GSettingsCheckButton(_("Have file manager (Nautilus) handle the desktop"), "org.gnome.desktop.background", "show-desktop-icons", None))
++ if "computer-icon-visible" in nautilus_desktop_keys:
++ sidePage.add_widget(GSettingsCheckButton(_("Computer icon visible on desktop"), "org.gnome.nautilus.desktop", "computer-icon-visible", None))
++ if "home-icon-visible" in nautilus_desktop_keys:
++ sidePage.add_widget(GSettingsCheckButton(_("Home icon visible on desktop"), "org.gnome.nautilus.desktop", "home-icon-visible", None))
++ if "network-icon-visible" in nautilus_desktop_keys:
++ sidePage.add_widget(GSettingsCheckButton(_("Network Servers icon visible on desktop"), "org.gnome.nautilus.desktop", "network-icon-visible", None))
++ if "trash-icon-visible" in nautilus_desktop_keys:
++ sidePage.add_widget(GSettingsCheckButton(_("Trash icon visible on desktop"), "org.gnome.nautilus.desktop", "trash-icon-visible", None))
+ 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.add_widget(GSettingsCheckButton(_("Show mounted volumes on the desktop"), "org.gnome.nautilus.desktop", "volumes-visible", None))
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());
- });
-
+ self.sidePages.append((sidePage, "windows"))
More information about the scm-commits
mailing list