--- /dev/null
+--- a/files/usr/share/cinnamon-session/sessions/cinnamon.session
++++ b/files/usr/share/cinnamon-session/sessions/cinnamon.session
+@@ -1,5 +1,5 @@
+ [Cinnamon Session]
+ Name=Cinnamon
+-RequiredComponents=cinnamon;cinnamon-settings-daemon;cinnamon-screensaver;nemo-autostart;nm-applet;
++RequiredComponents=cinnamon;cinnamon-settings-daemon;cinnamon-screensaver;nemo-autostart;polkit-cinnamon-authentication-agent-1;
+ DesktopName=GNOME
+
+--- a/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
++++ b/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
+@@ -1,5 +1,5 @@
+ [Cinnamon Session]
+ Name=Cinnamon (Software Rendering)
+-RequiredComponents=cinnamon2d;cinnamon-settings-daemon;cinnamon-screensaver;nemo-autostart;nm-applet;
++RequiredComponents=cinnamon2d;cinnamon-settings-daemon;cinnamon-screensaver;nemo-autostart;polkit-cinnamon-authentication-agent-1;
+ DesktopName=GNOME
+
--- /dev/null
+--- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
++++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+@@ -198,7 +198,7 @@ class Module:
+ def get_system_backgrounds(self):
+ picture_list = []
+ folder_list = []
+- properties_dir = "/usr/share/cinnamon-background-properties"
++ properties_dir = "/usr/share/gnome-background-properties"
+ backgrounds = []
+ if os.path.exists(properties_dir):
+ for i in os.listdir(properties_dir):
+++ /dev/null
---- cinnamon-1.1.3/data/org.cinnamon.gschema1.xml.in 2012-01-02 12:03:30.000000000 +0000
-+++ cinnamon-1.1.3/data/org.cinnamon.gschema.xml.in 2012-01-02 16:41:39.242419968 +0000
-@@ -231,7 +231,7 @@
- </key>
-
- <key name="panel-launchers" type="as">
-- <default>[ 'firefox.desktop', 'gnome-terminal.desktop', 'nautilus.desktop']</default>
-+ <default>[ 'mozilla-firefox.desktop', 'gnome-terminal.desktop', 'nautilus.desktop']</default>
- <_summary>Desktop files of the applications to put in the panel launchers applet</_summary>
- <_description>
- Cinnamon allows to show applications launchers on the panel.
-@@ -251,7 +251,7 @@
- </key>
-
- <key name="favorite-apps" type="as">
-- <default>[ 'firefox.desktop', 'mintInstall.desktop', 'cinnamon-settings.desktop', 'xchat.desktop', 'gnome-terminal.desktop', 'nautilus.desktop' ]</default>
-+ <default>[ 'cinnamon-settings.desktop', 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
- <_summary>List of desktop file IDs for favorite applications</_summary>
- <_description>
- The applications corresponding to these identifiers
--- /dev/null
+[org.cinnamon]
+desktop-effects-minimize-effect="traditional"
+enabled-applets=['panel1:left:0:menu@cinnamon.org', 'panel1:left:1:show-desktop@cinnamon.org', 'panel1:left:2:panel-launchers@cinnamon.org', 'panel1:left:3:window-list@cinnamon.org', 'panel1:right:0:notifications@cinnamon.org', 'panel1:right:1:user@cinnamon.org', 'panel1:right:2:removable-drives@cinnamon.org', 'panel1:right:3:keyboard@cinnamon.org', 'panel1:right:4:network@cinnamon.org', 'panel1:right:5:sound@cinnamon.org', 'panel1:right:6:power@cinnamon.org', 'panel1:right:7:systray@cinnamon.org', 'panel1:right:8:calendar@cinnamon.org', 'panel1:right:9:windows-quick-list@cinnamon.org']
+favorite-apps=['firefox.desktop', 'cinnamon-settings.desktop', 'gnome-terminal.desktop', 'nemo.desktop']
+number-workspaces=4
+startup-animation=false
+workspace-expo-view-as-grid=true
+
+[org.cinnamon.sounds]
+login-enabled=true
+login-file="/usr/share/cinnamon-control-center/sounds/login.oga"
+logout-enabled=true
+logout-file="/usr/share/cinnamon-control-center/sounds/logout.ogg"
+switch-enabled=true
+switch-file="/usr/share/cinnamon-control-center/sounds/switch.oga"
+close-enabled=true
+close-file="/usr/share/cinnamon-control-center/sounds/close.oga"
+map-enabled=true
+map-file="/usr/share/cinnamon-control-center/sounds/map.oga"
+minimize-enabled=true
+minimize-file="/usr/share/cinnamon-control-center/sounds/minimize.oga"
+maximize-enabled=true
+maximize-file="/usr/share/cinnamon-control-center/sounds/maximize.oga"
+unmaximize-enabled=true
+unmaximize-file="/usr/share/cinnamon-control-center/sounds/unmaximize.oga"
+tile-enabled=true
+tile-file="/usr/share/cinnamon-control-center/sounds/tile.oga"
+plug-enabled=true
+plug-file="/usr/share/cinnamon-control-center/sounds/plug.oga"
+unplug-enabled=true
+unplug-file="/usr/share/cinnamon-control-center/sounds/unplug.oga"
+
+[org.cinnamon.desktop.sound]
+event-sounds=false
+input-feedback-sounds=false
+volume-sound-enabled=true
+volume-sound-file='/usr/share/cinnamon-control-center/sounds/volume.oga'
+
+[org.cinnamon.screensaver]
+ask-for-away-message=false
+
+[org.cinnamon.settings-daemon.peripherals.keyboard]
+input-sources-switcher='alt-shift'
+
+[org.cinnamon.desktop.background]
+picture-uri='file:///usr/share/backgrounds/images/default.png'
+primary-color='#023c88'
+secondary-color='#5789ca'
+
+[org.cinnamon.desktop.interface]
+menus-have-icons=true
+font-name='Cantarell 11'
+gtk-theme='Zukitwo'
+icon-theme='nimbus'
+
+[org.cinnamon.desktop.wm.preferences]
+button-layout=':minimize,maximize,close'
+titlebar-font='Cantarell Bold 11'
+theme='Clearlooks'
+
+[org.cinnamon.settings-daemon.plugins.xsettings]
+hinting="slight"
+menus-have-icons=true
+
+[org.cinnamon.settings-daemon.plugins.power]
+lock-on-suspend=true
+
+[org.cinnamon.theme]
+name="cinnamon"
--- /dev/null
+--- a/files/usr/lib/cinnamon-settings/modules/cs_themes.py
++++ b/files/usr/lib/cinnamon-settings/modules/cs_themes.py
+@@ -91,7 +91,7 @@
+
+ def _load_icon_themes(self):
+ dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons"))
+- valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme")))
++ valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme")))
+ valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
+ res = []
+ for i in valid:
--- /dev/null
+--- a/files/usr/lib/cinnamon-settings/cinnamon-settings.py
++++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
+@@ -68,7 +68,7 @@ CONTROL_CENTER_MODULES = [
+ STANDALONE_MODULES = [
+ # Label Executable Icon Category Keywords for filter
+ [_("Printers"), "system-config-printer", "cs-printer", "hardware", _("printers, laser, inkjet")],
+- [_("Firewall"), "gufw", "cs-firewall", "admin", _("firewall, block, filter, programs")],
++ [_("Firewall"), "firewall-config", "cs-firewall", "admin", _("firewall, block, filter, programs")],
+ [_("Languages"), "mintlocale", "cs-language", "prefs", _("language, install, foreign")],
+ [_("Login Screen"), "gksu /usr/sbin/mdmsetup", "cs-login", "admin", _("login, mdm, gdm, manager, user, password, startup, switch")],
+ [_("Startup Programs"), "cinnamon-session-properties", "cs-startup-programs","prefs", _("startup, programs, boot, init, session")],
+++ /dev/null
-[Desktop Entry]
-Encoding=UTF-8
-Name=Cinnamon
-Name[en_GB]=Cinnamon
-Comment=This session logs you into Cinnamon
-Comment[en_GB]=This session logs you into Cinnamon
-Exec=/usr/bin/gnome-session --session=cinnamon
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
+++ /dev/null
-[GNOME Session]
-Name=Cinnamon
-RequiredComponents=cinnamon;gnome-settings-daemon;
-IsRunnableHelper=/usr/libexec/gnome-session-check-accelerated
-FallbackSession=gnome-fallback
-DesktopName=GNOME
# Source0-md5: 3ef4250eb889c4f8e99e85601a6d750d
Source1: polkit-%{name}-authentication-agent-1.desktop
Source2: %{name}-fedora.gschema.override
-Source3: %{name}-fedora-20.gschema.override
Patch0: background.patch
Patch1: autostart.patch
Patch2: %{name}-settings-apps.patch
--- /dev/null
+--- a/files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/settings-schema.json 2014-11-10 10:01:15.000000000 +0000
++++ b/files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/settings-schema.json 2014-11-18 17:00:46.521666889 +0000
+@@ -1,7 +1,7 @@
+ {
+ "launcherList": {
+ "type": "generic",
+- "default": ["firefox.desktop", "gnome-terminal.desktop", "nemo.desktop"]
++ "default": ["firefox.desktop", "mozilla-thunderbird.desktop", "gnome-terminal.desktop", "nemo.desktop"]
+ },
+ "allow-dragging": {
+ "type": "checkbox",
+++ /dev/null
---- a/configure.ac 2012-03-13 16:15:41.000000000 +0000
-+++ b/configure.ac 2012-03-31 08:39:24.489010332 +0100
-@@ -130,6 +130,7 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >=
- [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
- BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
- AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
-+ AC_SUBST([BLUETOOTH_DIR],["$BLUETOOTH_DIR"])
- AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
- AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
- AC_SUBST([HAVE_BLUETOOTH],[1])
---- a/src/Makefile.am 2012-03-13 16:15:41.000000000 +0000
-+++ b/src/Makefile.am 2012-03-31 08:41:42.958012667 +0100
-@@ -277,7 +277,7 @@ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_
- Cinnamon_0_1_gir_LIBS = libcinnamon.la
- Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
- Cinnamon_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \
-- --add-include-path=$(MUFFIN_GIR_DIR)
-+ --add-include-path=$(MUFFIN_GIR_DIR) $(if $(BLUETOOTH_DIR),-L $(BLUETOOTH_DIR),)
- INTROSPECTION_GIRS += Cinnamon-0.1.gir
- CLEANFILES += Cinnamon-0.1.gir
-
+++ /dev/null
---- a/data/theme/cinnamon.css 2012-03-13 19:58:16.000000000 +0000
-+++ b/data/theme/cinnamon.css 2012-03-14 18:41:22.097504815 +0000
-@@ -919,7 +919,7 @@ StTooltip StLabel {
- .end-session-dialog-subject {
- font-size: 12pt;
- font-weight: bold;
-- color: #666666;
-+ color: #cccccc;
- padding-top: 10px;
- padding-left: 17px;
- padding-bottom: 30px;
---- a/js/ui/endSessionDialog.js 2012-03-13 16:15:41.000000000 +0000
-+++ b/js/ui/endSessionDialog.js 2012-03-14 18:34:32.676510248 +0000
-@@ -29,8 +29,9 @@ const Gtk = imports.gi.Gtk;
- const Pango = imports.gi.Pango;
- const St = imports.gi.St;
- const Cinnamon = imports.gi.Cinnamon;
--
--const GnomeSession = imports.misc.gnomeSession
-+const UPowerGlib = imports.gi.UPowerGlib;
-+const ScreenSaver = imports.misc.screenSaver;
-+const GnomeSession = imports.misc.gnomeSession;
- const ModalDialog = imports.ui.modalDialog;
- const Tweener = imports.ui.tweener;
-
-@@ -83,7 +84,11 @@ const shutdownDialogContent = {
- seconds).format(seconds);
- },
- endDescription: _("Powering off the system."),
-- confirmButtons: [{ signal: 'ConfirmedReboot',
-+ confirmButtons: [{ signal: 'ConfirmedSuspend',
-+ label: _("Suspend") },
-+ { signal: 'ConfirmedHibernate',
-+ label: _("Hibernate") },
-+ { signal: 'ConfirmedReboot',
- label: _("Restart") },
- { signal: 'ConfirmedShutdown',
- label: _("Power Off") }],
-@@ -251,6 +256,9 @@ EndSessionDialog.prototype = {
- _init: function() {
- ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'end-session-dialog' });
-
-+ this._upClient = new UPowerGlib.Client();
-+ this._screenSaverProxy = new ScreenSaver.ScreenSaverProxy();
-+
- this._user = AccountsService.UserManager.get_default().get_user(GLib.get_user_name());
-
- this._secondsLeft = 0;
-@@ -427,9 +435,27 @@ EndSessionDialog.prototype = {
- for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
- let signal = dialogContent.confirmButtons[i].signal;
- let label = dialogContent.confirmButtons[i].label;
-- buttons.push({ action: Lang.bind(this, function() {
-- this._confirm(signal);
-- }),
-+ let action = null;
-+
-+ switch (signal) {
-+ case 'ConfirmedSuspend':
-+ if (this._upClient.get_can_suspend())
-+ action = Lang.bind(this, this._doSuspend);
-+ break;
-+ case 'ConfirmedHibernate':
-+ if (this._upClient.get_can_hibernate())
-+ action = Lang.bind(this, this._doHibernate);
-+ break;
-+ default:
-+ action = Lang.bind(this, function() {
-+ this._confirm(signal);
-+ });
-+ }
-+
-+ if (action == null)
-+ continue;
-+
-+ buttons.push({ action: action,
- label: label });
- }
-
-@@ -459,6 +485,22 @@ EndSessionDialog.prototype = {
- signal, '', []);
- },
-
-+ _doSuspend: function() {
-+ this.cancel(); //cancel auto-shutdown and close dialog
-+
-+ this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
-+ this._upClient.suspend_sync(null);
-+ }));
-+ },
-+
-+ _doHibernate: function() {
-+ this.cancel(); //cancel auto-shutdown and close dialog
-+
-+ this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
-+ this._upClient.hibernate_sync(null);
-+ }));
-+ },
-+
- _onOpened: function() {
- if (this._inhibitors.length == 0)
- this._startTimer();
---- a/src/main.c 2012-03-07 02:56:24.000000000 +0000
-+++ b/src/main.c 2012-03-07 12:56:10.400750499 +0000
-@@ -30,7 +30,7 @@
-
- extern GType gnome_cinnamon_plugin_get_type (void);
-
--#define CINNAMON_DBUS_SERVICE "org.Cinnamon"
-+#define CINNAMON_DBUS_SERVICE "org.gnome.Shell"
- #define MAGNIFIER_DBUS_SERVICE "org.gnome.Magnifier"
-
- static gboolean is_gdm_mode = FALSE;
+++ /dev/null
---- a/files/etc/xdg/menus/cinnamon-applications.menu
-+++ b/files/etc/xdg/menus/cinnamon-applications.menu
-@@ -4,12 +4,12 @@
- <Menu>
-
- <Name>Applications</Name>
-- <Directory>cinnamon-menu-applications.directory</Directory>
-+ <Directory>X-GNOME-Menu-Applications.directory</Directory>
-
- <!-- Scan legacy dirs first, as later items take priority -->
- <KDELegacyDirs/>
- <LegacyDir>/etc/X11/applnk</LegacyDir>
-- <LegacyDir>/usr/share/cinnamon/apps</LegacyDir>
-+ <LegacyDir>/usr/share/gnome/apps</LegacyDir>
-
- <!-- Read standard .directory and .desktop file locations -->
- <DefaultAppDirs/>
-@@ -21,7 +21,7 @@
- <!-- Accessories submenu -->
- <Menu>
- <Name>Accessories</Name>
-- <Directory>cinnamon-utility.directory</Directory>
-+ <Directory>Utility.directory</Directory>
- <Include>
- <And>
- <Category>Utility</Category>
-@@ -38,7 +38,7 @@
- <!-- Accessibility submenu -->
- <Menu>
- <Name>Universal Access</Name>
-- <Directory>cinnamon-utility-accessibility.directory</Directory>
-+ <Directory>Utility-Accessibility.directory</Directory>
- <Include>
- <And>
- <Category>Accessibility</Category>
-@@ -50,7 +50,7 @@
- <!-- Development Tools -->
- <Menu>
- <Name>Development</Name>
-- <Directory>cinnamon-development.directory</Directory>
-+ <Directory>Development.directory</Directory>
- <Include>
- <And>
- <Category>Development</Category>
-@@ -62,7 +62,7 @@
- <!-- Education -->
- <Menu>
- <Name>Education</Name>
-- <Directory>cinnamon-education.directory</Directory>
-+ <Directory>Education.directory</Directory>
- <Include>
- <And>
- <Category>Education</Category>
-@@ -73,7 +73,7 @@
- <!-- Games -->
- <Menu>
- <Name>Games</Name>
-- <Directory>cinnamon-game.directory</Directory>
-+ <Directory>Game.directory</Directory>
- <Include>
- <And>
- <Category>Game</Category>
-@@ -84,7 +84,7 @@
- <!-- Graphics -->
- <Menu>
- <Name>Graphics</Name>
-- <Directory>cinnamon-graphics.directory</Directory>
-+ <Directory>Graphics.directory</Directory>
- <Include>
- <And>
- <Category>Graphics</Category>
-@@ -95,7 +95,7 @@
- <!-- Internet -->
- <Menu>
- <Name>Internet</Name>
-- <Directory>cinnamon-network.directory</Directory>
-+ <Directory>Network.directory</Directory>
- <Include>
- <And>
- <Category>Network</Category>
-@@ -106,7 +106,7 @@
- <!-- Multimedia -->
- <Menu>
- <Name>Multimedia</Name>
-- <Directory>cinnamon-audio-video.directory</Directory>
-+ <Directory>AudioVideo.directory</Directory>
- <Include>
- <And>
- <Category>AudioVideo</Category>
-@@ -117,7 +117,7 @@
- <!-- Office -->
- <Menu>
- <Name>Office</Name>
-- <Directory>cinnamon-office.directory</Directory>
-+ <Directory>Office.directory</Directory>
- <Include>
- <And>
- <Category>Office</Category>
-@@ -128,7 +128,7 @@
- <!-- System Tools-->
- <Menu>
- <Name>System</Name>
-- <Directory>cinnamon-system-tools.directory</Directory>
-+ <Directory>System-Tools.directory</Directory>
- <Include>
- <And>
- <Category>System</Category>
-@@ -140,13 +140,15 @@
- <!-- Other -->
- <Menu>
- <Name>Other</Name>
-- <Directory>cinnamon-other.directory</Directory>
-+ <Directory>X-GNOME-Other.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <And>
- <Not><Category>Core</Category></Not>
- <Not><Category>Settings</Category></Not>
- <Not><Category>Screensaver</Category></Not>
-+ <Not><Category>X-GNOME-Settings-Panel</Category></Not>
-+ <Not><Category>Documentation</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Other -->
-@@ -154,10 +156,10 @@
- <!-- Wine -->
- <Menu>
- <Name>Wine</Name>
-- <Directory>wine-wine.directory</Directory>
-+ <Directory>Wine.directory</Directory>
- <Include>
- <And>
-- <Category>Wine</Category>
-+ <Category>X-Wine</Category>
- </And>
- </Include>
- </Menu> <!-- End Wine -->
---- a/files/etc/xdg/menus/cinnamon-settings.menu
-+++ b/files/etc/xdg/menus/cinnamon-settings.menu
-@@ -18,9 +18,14 @@
- <Name>Preferences</Name>
- <Directory>cinnamon-settings.directory</Directory>
- <Include>
-- <And>
-- <Category>Settings</Category>
-- </And>
-+ <And>
-+ <Category>Settings</Category>
-+ <Not>
-+ <Or>
-+ <Category>System</Category>
-+ </Or>
-+ </Not>
-+ </And>
- </Include>
- </Menu>
-
-
--- /dev/null
+Description: Set new wireless connections as user-owned
+ Set connections and passwords as user-owned, following matching changes in
+ nm-applet and gnome-control-center. The logic is
+ - Wired connections: always system-owned.
+ - Modem (GSM/UMTS) connections are created by the control center.
+ - Bluetooth PAN connections are now always user-owned.
+ - Wireless connections are system-owned if the user has
+ permissions (in Debian this means group sudo or netdev). Otherwise,
+ it is user-owned, with the password in the keyring only for WPA.
+ - 802.1x (wired or wireless) is always handled by the control center.
+Author: Josselin Mouette <joss@debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2013-05-16
+---
+--- a/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js
+@@ -100,6 +100,11 @@
+ this._init.apply(this, arguments);
+ }
+
++function default_to_private_connections(client) {
++ let perms = client.get_permission_result (NMClient.ClientPermission.SETTINGS_MODIFY_SYSTEM);
++ return (perms != NMClient.ClientPermissionResult.YES);
++}
++
+ NMNetworkMenuItem.prototype = {
+ __proto__: PopupMenu.PopupBaseMenuItem.prototype,
+
+@@ -899,12 +904,14 @@
+ let connection = new NetworkManager.Connection;
+ connection._uuid = NetworkManager.utils_uuid_generate();
+ connection.add_setting(new NetworkManager.SettingBluetooth);
+- connection.add_setting(new NetworkManager.SettingConnection({
++ let setting_conn = new NetworkManager.SettingConnection({
+ uuid: connection._uuid,
+ id: this._autoConnectionName,
+ type: NetworkManager.SETTING_BLUETOOTH_SETTING_NAME,
+ autoconnect: false
+- }));
++ });
++ setting_conn.add_permission('user', GLib.get_user_name(), null);
++ connection.add_setting(setting_conn);
+ return connection;
+ },
+
+@@ -986,6 +993,8 @@
+ this._overflowItem = null;
+ this._networks = [ ];
+
++ this._client = client;
++
+ // breaking the layers with this, but cannot call
+ // this.connectionValid until I have a device
+ this.device = device;
+@@ -1520,12 +1529,27 @@
+
+ let connection = new NetworkManager.Connection();
+ connection.add_setting(new NetworkManager.SettingWireless());
+- connection.add_setting(new NetworkManager.SettingConnection({
++ let setting_conn = new NetworkManager.SettingConnection({
+ id: name,
+ autoconnect: true, // NetworkManager will know to ignore this if appropriate
+ uuid: NetworkManager.utils_uuid_generate(),
+ type: NetworkManager.SETTING_WIRELESS_SETTING_NAME
+- }));
++ });
++ if (default_to_private_connections(this._client)) {
++ setting_conn.add_permission('user', GLib.get_user_name(), null);
++ if (apObj.security == NMAccessPointSecurity.WPA2_PSK ||
++ apObj.security == NMAccessPointSecurity.WPA_PSK) {
++ connection.add_setting(new NetworkManager.SettingWirelessSecurity({
++ psk_flags: NetworkManager.SettingSecretFlags.AGENT_OWNED
++ }));
++ }
++ if (apObj.security == NMAccessPointSecurity.WEP) {
++ connection.add_setting(new NetworkManager.SettingWirelessSecurity({
++ wep_key_flags: NetworkManager.SettingSecretFlags.AGENT_OWNED
++ }));
++ }
++ }
++ connection.add_setting(setting_conn);
+ return connection;
+ },
+
--- /dev/null
+[Desktop Entry]
+Name=PolicyKit Authentication Agent
+Comment=PolicyKit Authentication Agent
+Exec=/usr/libexec/polkit-gnome-authentication-agent-1
+Terminal=false
+Type=Application
+Categories=
+NoDisplay=true
+OnlyShowIn=X-Cinnamon;
+X-GNOME-AutoRestart=true
--- /dev/null
+--- a/files/usr/lib/cinnamon-settings/modules/cs_general.py
++++ b/files/usr/lib/cinnamon-settings/modules/cs_general.py
+@@ -31,8 +31,5 @@ class Module:
+ button = GSettingsCheckButton(_("Disable compositing for full-screen windows"), "org.cinnamon.muffin", "unredirect-fullscreen-windows", None)
+ button.set_tooltip_text(_("Select this option to let full-screen applications skip the compositing manager and run at maximum speed. Unselect it if you're experiencing screen-tearing in full screen mode."))
+ section.add(button)
+- section.add(GSettingsCheckButton(_("Enable timer when logging out or shutting down"), "org.cinnamon.SessionManager", "quit-delay-toggle", None))
+- spin = GSettingsSpinButton(_("Timer delay:"), "org.cinnamon.SessionManager", "quit-time-delay", "org.cinnamon.SessionManager/quit-delay-toggle", 0, 36000, 1, 60, _("seconds"))
+- section.add_indented(spin)
+ section.add(GSettingsCheckButton(_("Log LookingGlass output to ~/.cinnamon/glass.log (Requires Cinnamon restart)"), "org.cinnamon", "enable-looking-glass-logs", None))
+ vbox.add(section)
--- /dev/null
+--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py 2014-09-30 09:55:06.000000000 +0100
++++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py 2014-09-30 19:20:48.151829597 +0100
+@@ -45,10 +45,9 @@ class GroupDialog (Gtk.Dialog):
+ print detail
+
+ def _on_entry_changed(self, entry):
+- name = entry.get_text()
+- if " " in name or name.lower() != name:
++ if " " in entry.get_text():
+ entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_DIALOG_WARNING)
+- entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The group name cannot contain upper-case or space characters"))
++ entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The group name cannot contain space characters"))
+ self.set_response_sensitive(Gtk.ResponseType.OK, False)
+ else:
+ entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, None)
+@@ -314,9 +313,9 @@ class NewUserDialog(Gtk.Dialog):
+ fullname = self.realname_entry.get_text()
+ username = self.username_entry.get_text()
+ valid = True
+- if " " in username or username.lower() != username:
++ if " " in username:
+ self.username_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_DIALOG_WARNING)
+- self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The username cannot contain upper-case or space characters"))
++ self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The username cannot contain space characters"))
+ valid = False
+ else:
+ self.username_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, None)
--- /dev/null
+--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
++++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -144,12 +144,11 @@ class EditableEntry (Gtk.Notebook):
+
+ class PasswordDialog(Gtk.Dialog):
+
+- def __init__ (self, user, password_mask, group_mask):
++ def __init__ (self, user, password_mask):
+ super(PasswordDialog, self).__init__()
+
+ self.user = user
+ self.password_mask = password_mask
+- self.group_mask = group_mask
+
+ self.set_modal(True)
+ self.set_skip_taskbar_hint(True)
+@@ -215,12 +214,6 @@ class PasswordDialog(Gtk.Dialog):
+ def change_password(self):
+ newpass = self.new_password.get_text()
+ self.user.set_password(newpass, "")
+- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
+- mask = self.group_mask.get_text()
+- mask = mask.split(", ")
+- mask.remove("nopasswdlogin")
+- mask = ", ".join(mask)
+- self.group_mask.set_text(mask)
+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.destroy()
+
+@@ -515,7 +508,7 @@ class Module:
+ model, treeiter = self.users_treeview.get_selection().get_selected()
+ if treeiter != None:
+ user = model[treeiter][INDEX_USER_OBJECT]
+- dialog = PasswordDialog(user, self.password_mask, self.groups_label)
++ dialog = PasswordDialog(user, self.password_mask)
+ response = dialog.run()
+
+ def _on_groups_button_clicked(self, widget):
+@@ -745,11 +738,11 @@ class Module:
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
+ description = "<b>%s</b>\n%s" % (fullname, username)
+ piter = self.users.append(None, [new_user, pixbuf, description])
+- # Add the user to his/her own group and sudo if Administrator was selected
++ # Add the user to his/her own group and wheel if Administrator was selected
+ if dialog.account_type_combo.get_active() == 1:
+- os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username))
++ os.system("usermod %s -G %s,wheel" % (username, username))
+ else:
+- os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
++ os.system("usermod %s -G %s" % (username, username))
+ self.load_groups()
+ dialog.destroy()
+
+++ /dev/null
---- a/files/usr/lib/cinnamon-settings/cinnamon-settings.py 2012-03-12 14:31:34.000000000 +0000
-+++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py 2012-03-13 10:58:01.866049626 +0000
-@@ -11,9 +11,6 @@ try:
- import gconf
- import json
- import dbus
-- import tz
-- import time
-- from datetime import datetime
- from user import home
- import thread
- except Exception, detail:
-@@ -737,244 +734,7 @@ class GSettingsComboBox(Gtk.HBox):
- value = self.model[tree_iter][0]
- self.settings.set_string(self.key, value)
-
--class TimeZoneSelectorWidget(Gtk.HBox):
-- def __init__(self):
-- super(TimeZoneSelectorWidget, self).__init__()
--
-- proxy = dbus.SystemBus().get_object("org.gnome.SettingsDaemon.DateTimeMechanism", "/")
-- self.dbus_iface = dbus.Interface(proxy, dbus_interface="org.gnome.SettingsDaemon.DateTimeMechanism")
--
-- self.timezones = tz.load_db()
--
-- self.selected_region, self.selected_city = self.get_selected_zone()
--
-- region_label = Gtk.Label(_("Region"))
-- self.pack_start(region_label, False, False, 2)
--
-- regions = self.timezones.keys()
-- regions.sort()
-- self.region_model = Gtk.ListStore(str, str)
-- selected_region_iter = None
-- for region in regions:
-- iter = self.region_model.insert_before(None, None)
-- self.region_model.set_value(iter, 0, region)
-- self.region_model.set_value(iter, 1, region.replace("_", " "))
-- if (region == self.selected_region):
-- selected_region_iter = iter
--
-- self.region_widget = Gtk.ComboBox.new_with_model(self.region_model)
-- renderer_text = Gtk.CellRendererText()
-- self.region_widget.pack_start(renderer_text, True)
-- self.region_widget.add_attribute(renderer_text, "text", 1)
-- if selected_region_iter is not None:
-- self.region_widget.set_active_iter(selected_region_iter)
-- self.pack_start(self.region_widget, False, False, 2)
--
-- city_label = Gtk.Label(_("City"))
-- self.pack_start(city_label, False, False, 2)
--
-- self.city_model = Gtk.ListStore(str, str)
-- self.city_widget = Gtk.ComboBox.new_with_model(self.city_model)
-- renderer_text = Gtk.CellRendererText()
-- self.city_widget.pack_start(renderer_text, True)
-- self.city_widget.add_attribute(renderer_text, "text", 1)
-- self.pack_start(self.city_widget, False, False, 2)
--
-- self.update_cities_list()
--
-- self.region_widget.connect("changed", self.on_region_changed)
-- self.city_widget.connect("changed", self.on_city_changed)
-- def on_city_changed(self, widget):
-- tree_iter = widget.get_active_iter()
-- if tree_iter != None:
-- self.selected_city = self.city_model[tree_iter][0]
-- self.dbus_iface.SetTimezone(self.selected_region+"/"+self.selected_city)
-- def on_region_changed(self, widget):
-- tree_iter = widget.get_active_iter()
-- if tree_iter != None:
-- self.selected_region = self.region_model[tree_iter][0]
-- self.update_cities_list()
-- def update_cities_list(self):
-- self.city_model.clear()
-- if self.selected_region and self.selected_region in self.timezones.keys():
-- cities = self.timezones[self.selected_region]
-- cities.sort()
-- selected_city_iter = None
-- for city in cities:
-- iter = self.city_model.insert_before(None, None)
-- self.city_model.set_value(iter, 0, city)
-- self.city_model.set_value(iter, 1, city.replace("_", " "))
-- if (city == self.selected_city):
-- selected_city_iter = iter
-- if selected_city_iter is not None:
-- self.city_widget.set_active_iter(selected_city_iter)
-- def get_selected_zone(self):
-- tz = self.dbus_iface.GetTimezone()
-- if "/" in tz:
-- i = tz.index("/")
-- region = tz[:i]
-- city = tz[i+1:]
-- return region, city
-- else:
-- return "", ""
--
--class ChangeTimeWidget(Gtk.HBox):
-- def __init__(self):
-- super(ChangeTimeWidget, self).__init__()
-- proxy = dbus.SystemBus().get_object("org.gnome.SettingsDaemon.DateTimeMechanism", "/")
-- self.dbus_iface = dbus.Interface(proxy, dbus_interface="org.gnome.SettingsDaemon.DateTimeMechanism")
--
-- # Ensures we are setting the system time only when the user changes it
-- self.changedOnTimeout = False
--
-- # Ensures we do not update the values in the date/time fields during the DBus call to set the time
-- self._setting_time = False
-- self._setting_time_lock = thread.allocate()
-- self._time_to_set = None
--
-- self.thirtyDays = [3, 5, 8, 10]
-- months = ['January','February','March','April','May','June','July','August','September','October','November','December']
--
-- # Boxes
-- timeBox = Gtk.HBox()
-- dateBox = Gtk.HBox()
--
-- # Combo Boxes
-- self.monthBox = Gtk.ComboBoxText()
--
-- for month in months:
-- self.monthBox.append_text(month)
--
-- # Adjustments
-- hourAdj = Gtk.Adjustment(0, 0, 23, 1, 1)
-- minAdj = Gtk.Adjustment(0, 0, 59, 1, 1)
-- yearAdj = Gtk.Adjustment(0, 0, 9999, 1, 5)
-- dayAdj = Gtk.Adjustment(0, 1, 31, 1, 1)
--
-- # Spin buttons
-- self.hourSpin = Gtk.SpinButton()
-- self.minSpin = Gtk.SpinButton()
-- self.yearSpin = Gtk.SpinButton()
-- self.daySpin = Gtk.SpinButton()
--
-- self.hourSpin.configure(hourAdj, 0.5, 0)
-- self.minSpin.configure(minAdj, 0.5, 0)
-- self.yearSpin.configure(yearAdj, 0.5, 0)
-- self.daySpin.configure(dayAdj, 0.5, 0)
-- self.hourSpin.set_editable(False)
-- self.minSpin.set_editable(False)
-- self.yearSpin.set_editable(False)
-- self.daySpin.set_editable(False)
--
-- self.update_time()
-- GObject.timeout_add(1000, self.update_time)
--
-- # Connect to callback
-- self.hourSpin.connect('changed', self._change_system_time)
-- self.minSpin.connect('changed', self._change_system_time)
-- self.monthBox.connect('changed', self._change_system_time)
-- self.yearSpin.connect('changed', self._change_system_time)
-- self.daySpin.connect('changed', self._change_system_time)
--
-- timeBox.pack_start(self.hourSpin, False, False, 2)
-- timeBox.pack_start(Gtk.Label(_(":")), False, False, 2)
-- timeBox.pack_start(self.minSpin, False, False, 2)
--
-- dateBox.pack_start(self.monthBox, False, False, 2)
-- dateBox.pack_start(self.daySpin, False, False, 2)
-- dateBox.pack_start(self.yearSpin, False, False, 2)
--
-- self.pack_start(Gtk.Label(_("Date : ")), False, False, 2)
-- self.pack_start(dateBox, True, True, 2)
-- self.pack_start(Gtk.Label(_("Time : ")), False, False, 2)
-- self.pack_start(timeBox, True, True, 2)
--
-- def update_time(self):
-- self._setting_time_lock.acquire()
-- do_update = not self._setting_time
-- self._setting_time_lock.release()
--
-- if not do_update:
-- return True
--
-- dt = datetime.now()
--
-- self.changedOnTimeout = True
--
-- # Time
-- self.hourSpin.set_value( dt.hour )
-- self.minSpin.set_value( dt.minute )
--
-- # Date
-- self.monthBox.set_active( dt.month-1 )
-- self.daySpin.set_value( dt.day )
-- self.yearSpin.set_value( dt.year )
--
-- self.changedOnTimeout = False
--
-- # Update the max of the day spin box
-- maxDay = 31
-- if dt.month == 2:
-- if dt.year % 4 == 0:
-- maxDay = 29
-- else:
-- maxDay = 28
-- elif dt.month-1 in self.thirtyDays:
-- maxDay = 30
--
-- self.daySpin.get_adjustment().set_upper(maxDay)
--
-- return True
--
-- def change_using_ntp(self, usingNtp):
-- # Check if we were using Ntp by seeing if the spin button
-- # is sensitive
-- self.set_sensitive(not usingNtp)
--
-- def _do_change_system_time(self):
-- self._setting_time_lock.acquire()
-- do_set = not self._setting_time
-- self._setting_time = True
-- self._setting_time_lock.release()
--
-- # If there is already another thread updating the time, we let it do the job
-- if not do_set:
-- return
--
-- done = False
-- while not done:
-- self._setting_time_lock.acquire()
-- time_to_set = self._time_to_set
-- self._time_to_set = None
-- self._setting_time_lock.release()
--
-- self.dbus_iface.SetTime(time_to_set)
--
-- # Check whether another request to set the time was done since this thread started
-- self._setting_time_lock.acquire()
-- if self._time_to_set==None:
-- done = True
-- self._setting_time_lock.release()
--
-- self._setting_time_lock.acquire()
-- self._setting_time = False
-- self._setting_time_lock.release()
--
-- def _change_system_time(self, widget):
-- if not self.changedOnTimeout:
-- hour = int( self.hourSpin.get_value() )
-- minute = int( self.minSpin.get_value() )
-- month = self.monthBox.get_active() + 1
-- day = int( self.daySpin.get_value() )
-- year = int( self.yearSpin.get_value() )
--
-- newDt = datetime(year, month, day, hour, minute)
--
-- self._setting_time_lock.acquire()
-- self._time_to_set = time.mktime(newDt.utctimetuple())
-- self._setting_time_lock.release()
--
-- thread.start_new_thread(self._do_change_system_time, ())
-+
-
- class TitleBarButtonsOrderSelector(Gtk.Table):
- def __init__(self):
-@@ -1120,27 +880,12 @@ class MainWindow:
- sidePage.add_widget(GSettingsCheckButton(_("Panel Launchers draggable"), "org.cinnamon", "panel-launchers-draggable"))
-
- sidePage = SidePage(_("Calendar"), "clock.svg", self.content_box)
-- self.sidePages.append((sidePage, "calendar"))
-- self.changeTimeWidget = ChangeTimeWidget()
-+ self.sidePages.append((sidePage, "calendar"))
- sidePage.add_widget(GSettingsCheckButton(_("Show week dates in calendar"), "org.cinnamon.calendar", "show-weekdate"))
- sidePage.add_widget(GSettingsEntry(_("Date format for the panel"), "org.cinnamon.calendar", "date-format"))
- sidePage.add_widget(GSettingsEntry(_("Date format inside the date applet"), "org.cinnamon.calendar", "date-format-full"))
- sidePage.add_widget(Gtk.LinkButton.new_with_label("http://www.foragoodstrftime.com/", _("Generate your own date formats")))
-- self.ntpCheckButton = None
-- try:
-- self.ntpCheckButton = DBusCheckButton(_("Use network time"), "org.gnome.SettingsDaemon.DateTimeMechanism", "/", "GetUsingNtp", "SetUsingNtp")
-- sidePage.add_widget(self.ntpCheckButton)
-- except:
-- pass
-- sidePage.add_widget(self.changeTimeWidget)
-- try:
-- sidePage.add_widget(TimeZoneSelectorWidget())
-- except:
-- pass
--
-- if self.ntpCheckButton != None:
-- self.ntpCheckButton.connect('toggled', self._ntp_toggled)
-- self.changeTimeWidget.change_using_ntp( self.ntpCheckButton.get_active() )
-+
-
- sidePage = SidePage(_("Hot corner"), "overview.svg", self.content_box)
- self.sidePages.append((sidePage, "hotcorner"))
-@@ -1314,7 +1059,6 @@ class MainWindow:
- sidePage.add_widget(GSettingsFontButton(_("Default font"), "org.gnome.desktop.interface", "font-name"))
- sidePage.add_widget(GSettingsFontButton(_("Document font"), "org.gnome.desktop.interface", "document-font-name"))
- sidePage.add_widget(GSettingsFontButton(_("Monospace font"), "org.gnome.desktop.interface", "monospace-font-name"))
-- sidePage.add_widget(GConfFontButton(_("Window title font"), "/apps/metacity/general/titlebar_font"))
- sidePage.add_widget(GSettingsComboBox(_("Hinting"), "org.gnome.settings-daemon.plugins.xsettings", "hinting", [(i, i.title()) for i in ("none", "slight", "medium", "full")]))
- sidePage.add_widget(GSettingsComboBox(_("Antialiasing"), "org.gnome.settings-daemon.plugins.xsettings", "antialiasing", [(i, i.title()) for i in ("none", "grayscale", "rgba")]))
-
-@@ -1355,9 +1099,6 @@ class MainWindow:
- self.content_box_sw.hide()
- self.top_button_box.hide()
- self.side_view_sw.show_all()
--
-- def _ntp_toggled(self, widget):
-- self.changeTimeWidget.change_using_ntp( self.ntpCheckButton.get_active() )
-
-
- if __name__ == "__main__":
---- a/files/usr/lib/cinnamon-settings/tz.py 2012-03-12 14:31:34.000000000 +0000
-+++ /dev/null 2012-03-13 10:08:58.957000026 +0000
-@@ -1,35 +0,0 @@
--import os
--
--def load_db():
-- tz_db = {}
--
-- filename = '/usr/share/zoneinfo/zone.tab'
-- if not os.path.exists(filename):
-- filename = '/usr/share/lib/zoneinfo/tab/zone_sun.tab'
-- if not os.path.exists(filename):
-- return {}
--
-- tz_file = open(filename)
--
-- for line in tz_file:
-- line = line.rstrip().lstrip()
-- if line=="" or line[0] == '#':
-- continue
--
-- tz_info = line.split('\t')
-- if len(tz_info)<3:
-- continue
-- tz = tz_info[2]
-- if "/" in tz:
-- i = tz.index("/")
-- region = tz[:i]
-- zone = tz[i+1:]
--
-- if region not in tz_db:
-- tz_db[region] = []
--
-- tz_db[region].append(zone)
--
-- tz_file.close()
--
-- return tz_db
---- a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js 2012-03-12 14:31:34.000000000 +0000
-+++ b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js 2012-03-13 10:56:47.918048379 +0000
-@@ -62,9 +62,7 @@ MyApplet.prototype = {
- this._calendar = new Calendar.Calendar(this._eventSource);
- vbox.add(this._calendar.actor);
-
-- let item = new PopupMenu.PopupMenuItem(_("Date and Time Settings"))
-- item.connect("activate", Lang.bind(this, this._onLaunchSettings));
-- //this.menu.addMenuItem(item);
-+ item = this.menu.addSettingsAction(_("Date and Time Settings"), 'gnome-datetime-panel.desktop');
- if (item) {
- let separator = new PopupMenu.PopupSeparatorMenuItem();
- separator.setColumnWidths(1);
-@@ -96,11 +94,6 @@ MyApplet.prototype = {
- on_applet_clicked: function(event) {
- this.menu.toggle();
- },
--
-- _onLaunchSettings: function() {
-- this.menu.close();
-- Util.spawnCommandLine("cinnamon-settings calendar");
-- },
-
- _updateClockAndDate: function() {
- let dateFormat = this._calendarSettings.get_string('date-format');
--- /dev/null
+--- a/files/usr/lib/cinnamon-settings/modules/cs_power.py 2014-11-26 10:02:59.000000000 +0000
++++ b/files/usr/lib/cinnamon-settings/modules/cs_power.py 2014-12-02 10:20:08.218282012 +0000
+@@ -57,7 +57,7 @@ class Module:
+ screen = CinnamonDesktop.RRScreen.new(Gdk.Screen.get_default())
+ outputs = CinnamonDesktop.RRScreen.list_outputs(screen)
+ for output in outputs:
+- if (output.is_connected() and output.is_laptop() and output.get_backlight_min() >= 0 and output.get_backlight_max() > 0):
++ if (output.is_connected() and output.is_laptop()):
+ primary_output = output
+ break
+ except Exception, detail:
projects / packages / cinnamon.git / commitdiff
