[arch-commits] Commit in cinnamon/repos (12 files)
Balló György
bgyorgy at archlinux.org
Wed Oct 1 06:07:45 UTC 2014
Date: Wednesday, October 1, 2014 @ 08:07:45
Author: bgyorgy
Revision: 119915
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
cinnamon/repos/community-testing-i686/
cinnamon/repos/community-testing-i686/PKGBUILD
(from rev 119914, cinnamon/trunk/PKGBUILD)
cinnamon/repos/community-testing-i686/calendar-applet-upower-support.patch
(from rev 119914, cinnamon/trunk/calendar-applet-upower-support.patch)
cinnamon/repos/community-testing-i686/cinnamon.install
(from rev 119914, cinnamon/trunk/cinnamon.install)
cinnamon/repos/community-testing-i686/gnome-3.14.patch
(from rev 119914, cinnamon/trunk/gnome-3.14.patch)
cinnamon/repos/community-testing-i686/set_wheel.patch
(from rev 119914, cinnamon/trunk/set_wheel.patch)
cinnamon/repos/community-testing-x86_64/
cinnamon/repos/community-testing-x86_64/PKGBUILD
(from rev 119914, cinnamon/trunk/PKGBUILD)
cinnamon/repos/community-testing-x86_64/calendar-applet-upower-support.patch
(from rev 119914, cinnamon/trunk/calendar-applet-upower-support.patch)
cinnamon/repos/community-testing-x86_64/cinnamon.install
(from rev 119914, cinnamon/trunk/cinnamon.install)
cinnamon/repos/community-testing-x86_64/gnome-3.14.patch
(from rev 119914, cinnamon/trunk/gnome-3.14.patch)
cinnamon/repos/community-testing-x86_64/set_wheel.patch
(from rev 119914, cinnamon/trunk/set_wheel.patch)
---------------------------------------------------------------+
community-testing-i686/PKGBUILD | 83 ++++++++++
community-testing-i686/calendar-applet-upower-support.patch | 17 ++
community-testing-i686/cinnamon.install | 12 +
community-testing-i686/gnome-3.14.patch | 25 +++
community-testing-i686/set_wheel.patch | 53 ++++++
community-testing-x86_64/PKGBUILD | 83 ++++++++++
community-testing-x86_64/calendar-applet-upower-support.patch | 17 ++
community-testing-x86_64/cinnamon.install | 12 +
community-testing-x86_64/gnome-3.14.patch | 25 +++
community-testing-x86_64/set_wheel.patch | 53 ++++++
10 files changed, 380 insertions(+)
Copied: cinnamon/repos/community-testing-i686/PKGBUILD (from rev 119914, cinnamon/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2014-10-01 06:07:45 UTC (rev 119915)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: M0Rf30
+# Contributor: unifiedlinux
+# Contributor: CReimer
+
+pkgname=cinnamon
+pkgver=2.2.16
+pkgrel=2
+pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
+arch=('i686' 'x86_64')
+url="http://cinnamon.linuxmint.com/"
+license=('GPL2')
+depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
+ 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds' 'gconf'
+ 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'librsvg'
+ 'networkmanager' 'muffin' 'python2-cairo' 'python2-dbus' 'python2-pillow'
+ 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
+ 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
+ 'network-manager-applet' 'nemo' 'polkit-gnome')
+makedepends=('gnome-common' 'intltool')
+options=('!emptydirs')
+install=${pkgname}.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
+ "calendar-applet-upower-support.patch"
+ "set_wheel.patch"
+ "gnome-3.14.patch")
+sha256sums=('1fc0bc1b6dbd071ca61f90c5cac5e41abfddbfa77577bdf3407afd1c1ca04793'
+ '9ba15442531537759a78a4ab6d0be55dc2fa84a5157bb3fd912c259bfe24dcd8'
+ '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444'
+ 'da763a88b4ee2e889afffd189b877708ca34b704fe7e9b62c0cc2bd970564058')
+
+prepare() {
+ cd ${srcdir}/Cinnamon*
+
+ # Python2 fix
+ sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor
+ find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+ # Fix calendar applet with upower 0.99
+ patch -Np1 -i ../calendar-applet-upower-support.patch
+
+ # Use wheel group instread of sudo
+ patch -Np1 -i ../set_wheel.patch
+
+ # Some fixes for GNOME 3.14
+ patch -Np1 -i ../gnome-3.14.patch
+
+ # Add polkit agent to required components
+ sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
+
+ # Fix for the python2 PAM module
+ sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
+
+ # Use pkexec instead of gksu
+ sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
+
+ # Check for the cc-panel path, not for the unneeded binary
+ sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
+
+ # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
+ sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
+ files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+}
+
+build() {
+ cd ${srcdir}/Cinnamon*
+
+ ./autogen.sh --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/cinnamon \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-schemas-compile \
+ --enable-compile-warnings=yes \
+ --with-session-tracking=systemd
+ make
+}
+
+package() {
+ cd ${srcdir}/Cinnamon*
+ make DESTDIR="${pkgdir}" install
+}
Copied: cinnamon/repos/community-testing-i686/calendar-applet-upower-support.patch (from rev 119914, cinnamon/trunk/calendar-applet-upower-support.patch)
===================================================================
--- community-testing-i686/calendar-applet-upower-support.patch (rev 0)
+++ community-testing-i686/calendar-applet-upower-support.patch 2014-10-01 06:07:45 UTC (rev 119915)
@@ -0,0 +1,17 @@
+Index: cinnamon/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js
+===================================================================
+--- cinnamon.orig/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js 2014-04-27 11:56:10.582581808 +0200
++++ cinnamon/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js 2014-07-14 00:44:37.882215797 +0200
+@@ -94,7 +94,11 @@
+
+ // https://bugzilla.gnome.org/show_bug.cgi?id=655129
+ this._upClient = new UPowerGlib.Client();
+- this._upClient.connect('notify-resume', this._updateClockAndDate);
++ try {
++ this._upClient.connect('notify-resume', this._updateClockAndDate);
++ } catch (e) {
++ this._upClient.connect('notify::resume', this._updateClockAndDate);
++ }
+
+ // Start the clock
+ this.on_settings_changed();
Copied: cinnamon/repos/community-testing-i686/cinnamon.install (from rev 119914, cinnamon/trunk/cinnamon.install)
===================================================================
--- community-testing-i686/cinnamon.install (rev 0)
+++ community-testing-i686/cinnamon.install 2014-10-01 06:07:45 UTC (rev 119915)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: cinnamon/repos/community-testing-i686/gnome-3.14.patch (from rev 119914, cinnamon/trunk/gnome-3.14.patch)
===================================================================
--- community-testing-i686/gnome-3.14.patch (rev 0)
+++ community-testing-i686/gnome-3.14.patch 2014-10-01 06:07:45 UTC (rev 119915)
@@ -0,0 +1,25 @@
+diff -Naur Cinnamon-2.2.16.orig/data/theme/cinnamon.css Cinnamon-2.2.16/data/theme/cinnamon.css
+--- Cinnamon-2.2.16.orig/data/theme/cinnamon.css 2014-08-12 13:00:36.000000000 +0200
++++ Cinnamon-2.2.16/data/theme/cinnamon.css 2014-10-01 02:51:45.859630151 +0200
+@@ -1445,7 +1445,8 @@
+ .applet-icon:hover,
+ .applet-box:hover > .applet-icon {
+ color: #fff;
+- icon-shadow: white 0px 0px 3px;
++/* Broken with GNOME 3.14 (icon-size is not honoured)
++ * icon-shadow: white 0px 0px 3px;*/
+ }
+
+ /* ===================================================================
+diff -Naur Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py
+--- Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-08-12 13:00:36.000000000 +0200
++++ Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-10-01 02:52:56.897767729 +0200
+@@ -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:
Copied: cinnamon/repos/community-testing-i686/set_wheel.patch (from rev 119914, cinnamon/trunk/set_wheel.patch)
===================================================================
--- community-testing-i686/set_wheel.patch (rev 0)
+++ community-testing-i686/set_wheel.patch 2014-10-01 06:07:45 UTC (rev 119915)
@@ -0,0 +1,53 @@
+--- 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()
+
Copied: cinnamon/repos/community-testing-x86_64/PKGBUILD (from rev 119914, cinnamon/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2014-10-01 06:07:45 UTC (rev 119915)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: M0Rf30
+# Contributor: unifiedlinux
+# Contributor: CReimer
+
+pkgname=cinnamon
+pkgver=2.2.16
+pkgrel=2
+pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
+arch=('i686' 'x86_64')
+url="http://cinnamon.linuxmint.com/"
+license=('GPL2')
+depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
+ 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds' 'gconf'
+ 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'librsvg'
+ 'networkmanager' 'muffin' 'python2-cairo' 'python2-dbus' 'python2-pillow'
+ 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
+ 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
+ 'network-manager-applet' 'nemo' 'polkit-gnome')
+makedepends=('gnome-common' 'intltool')
+options=('!emptydirs')
+install=${pkgname}.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
+ "calendar-applet-upower-support.patch"
+ "set_wheel.patch"
+ "gnome-3.14.patch")
+sha256sums=('1fc0bc1b6dbd071ca61f90c5cac5e41abfddbfa77577bdf3407afd1c1ca04793'
+ '9ba15442531537759a78a4ab6d0be55dc2fa84a5157bb3fd912c259bfe24dcd8'
+ '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444'
+ 'da763a88b4ee2e889afffd189b877708ca34b704fe7e9b62c0cc2bd970564058')
+
+prepare() {
+ cd ${srcdir}/Cinnamon*
+
+ # Python2 fix
+ sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor
+ find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+ # Fix calendar applet with upower 0.99
+ patch -Np1 -i ../calendar-applet-upower-support.patch
+
+ # Use wheel group instread of sudo
+ patch -Np1 -i ../set_wheel.patch
+
+ # Some fixes for GNOME 3.14
+ patch -Np1 -i ../gnome-3.14.patch
+
+ # Add polkit agent to required components
+ sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
+
+ # Fix for the python2 PAM module
+ sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
+
+ # Use pkexec instead of gksu
+ sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
+
+ # Check for the cc-panel path, not for the unneeded binary
+ sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
+
+ # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
+ sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
+ files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+}
+
+build() {
+ cd ${srcdir}/Cinnamon*
+
+ ./autogen.sh --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/cinnamon \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-schemas-compile \
+ --enable-compile-warnings=yes \
+ --with-session-tracking=systemd
+ make
+}
+
+package() {
+ cd ${srcdir}/Cinnamon*
+ make DESTDIR="${pkgdir}" install
+}
Copied: cinnamon/repos/community-testing-x86_64/calendar-applet-upower-support.patch (from rev 119914, cinnamon/trunk/calendar-applet-upower-support.patch)
===================================================================
--- community-testing-x86_64/calendar-applet-upower-support.patch (rev 0)
+++ community-testing-x86_64/calendar-applet-upower-support.patch 2014-10-01 06:07:45 UTC (rev 119915)
@@ -0,0 +1,17 @@
+Index: cinnamon/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js
+===================================================================
+--- cinnamon.orig/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js 2014-04-27 11:56:10.582581808 +0200
++++ cinnamon/files/usr/share/cinnamon/applets/calendar at cinnamon.org/applet.js 2014-07-14 00:44:37.882215797 +0200
+@@ -94,7 +94,11 @@
+
+ // https://bugzilla.gnome.org/show_bug.cgi?id=655129
+ this._upClient = new UPowerGlib.Client();
+- this._upClient.connect('notify-resume', this._updateClockAndDate);
++ try {
++ this._upClient.connect('notify-resume', this._updateClockAndDate);
++ } catch (e) {
++ this._upClient.connect('notify::resume', this._updateClockAndDate);
++ }
+
+ // Start the clock
+ this.on_settings_changed();
Copied: cinnamon/repos/community-testing-x86_64/cinnamon.install (from rev 119914, cinnamon/trunk/cinnamon.install)
===================================================================
--- community-testing-x86_64/cinnamon.install (rev 0)
+++ community-testing-x86_64/cinnamon.install 2014-10-01 06:07:45 UTC (rev 119915)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: cinnamon/repos/community-testing-x86_64/gnome-3.14.patch (from rev 119914, cinnamon/trunk/gnome-3.14.patch)
===================================================================
--- community-testing-x86_64/gnome-3.14.patch (rev 0)
+++ community-testing-x86_64/gnome-3.14.patch 2014-10-01 06:07:45 UTC (rev 119915)
@@ -0,0 +1,25 @@
+diff -Naur Cinnamon-2.2.16.orig/data/theme/cinnamon.css Cinnamon-2.2.16/data/theme/cinnamon.css
+--- Cinnamon-2.2.16.orig/data/theme/cinnamon.css 2014-08-12 13:00:36.000000000 +0200
++++ Cinnamon-2.2.16/data/theme/cinnamon.css 2014-10-01 02:51:45.859630151 +0200
+@@ -1445,7 +1445,8 @@
+ .applet-icon:hover,
+ .applet-box:hover > .applet-icon {
+ color: #fff;
+- icon-shadow: white 0px 0px 3px;
++/* Broken with GNOME 3.14 (icon-size is not honoured)
++ * icon-shadow: white 0px 0px 3px;*/
+ }
+
+ /* ===================================================================
+diff -Naur Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py
+--- Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-08-12 13:00:36.000000000 +0200
++++ Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-10-01 02:52:56.897767729 +0200
+@@ -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:
Copied: cinnamon/repos/community-testing-x86_64/set_wheel.patch (from rev 119914, cinnamon/trunk/set_wheel.patch)
===================================================================
--- community-testing-x86_64/set_wheel.patch (rev 0)
+++ community-testing-x86_64/set_wheel.patch 2014-10-01 06:07:45 UTC (rev 119915)
@@ -0,0 +1,53 @@
+--- 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()
+
More information about the arch-commits
mailing list