Date: Tuesday, June 9, 2020 @ 19:57:19 Author: felixonmars Revision: 640908
archrelease: copy trunk to community-x86_64 Added: cinnamon/repos/community-x86_64/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch (from rev 640907, cinnamon/trunk/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch) cinnamon/repos/community-x86_64/PKGBUILD (from rev 640907, cinnamon/trunk/PKGBUILD) cinnamon/repos/community-x86_64/default-theme.patch (from rev 640907, cinnamon/trunk/default-theme.patch) cinnamon/repos/community-x86_64/set_wheel.diff (from rev 640907, cinnamon/trunk/set_wheel.diff) Deleted: cinnamon/repos/community-x86_64/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch cinnamon/repos/community-x86_64/PKGBUILD cinnamon/repos/community-x86_64/default-theme.patch cinnamon/repos/community-x86_64/set_wheel.diff -----------------------------------------------------------------+ 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch | 76 ++-- PKGBUILD | 180 +++++----- default-theme.patch | 50 +- set_wheel.diff | 110 +++--- 4 files changed, 208 insertions(+), 208 deletions(-) Deleted: 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch =================================================================== --- 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch 2020-06-09 19:56:53 UTC (rev 640907) +++ 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch 2020-06-09 19:57:19 UTC (rev 640908) @@ -1,38 +0,0 @@ -From ac4d2fc9fafb38ebb02615a41b23cceca304e73a Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwart...@gmail.com> -Date: Tue, 20 Mar 2018 14:11:02 -0400 -Subject: [PATCH] cinnamon-settings: don't rely on the presence of - cinnamon-control-center - -The existence of the cinnamon-control-center binary does not even tell -us what control center libraries are available. So instead, do the same -thing we did for cinnamon-settings modules, and check if the library -exists. ---- - files/usr/bin/cinnamon-settings | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/files/usr/bin/cinnamon-settings b/files/usr/bin/cinnamon-settings -index 9fbdbecd2..98ca454a5 100755 ---- a/files/usr/bin/cinnamon-settings -+++ b/files/usr/bin/cinnamon-settings -@@ -58,6 +58,7 @@ Available types of sort, and corresponding numbers: - import getopt - import os - import sys -+import sysconfig - - def usage(): - print("""Usage: -@@ -119,7 +120,7 @@ if len(sys.argv) > 1: - os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) - elif os.path.exists("/usr/share/cinnamon/cinnamon-settings/modules/cs_%s.py" % module): - os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) -- elif os.path.exists("/usr/bin/cinnamon-control-center"): -+ elif os.path.exists(os.path.join(sysconfig.get_config_var("LIBDIR"), "cinnamon-control-center-1/panels/lib%s.so" % module)): - os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) - elif os.path.exists("/usr/bin/gnome-control-center"): - print ("Unknown module %s, calling gnome-control-center" % module) --- -2.22.0 - Copied: cinnamon/repos/community-x86_64/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch (from rev 640907, cinnamon/trunk/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch) =================================================================== --- 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch (rev 0) +++ 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch 2020-06-09 19:57:19 UTC (rev 640908) @@ -0,0 +1,38 @@ +From ac4d2fc9fafb38ebb02615a41b23cceca304e73a Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwart...@gmail.com> +Date: Tue, 20 Mar 2018 14:11:02 -0400 +Subject: [PATCH] cinnamon-settings: don't rely on the presence of + cinnamon-control-center + +The existence of the cinnamon-control-center binary does not even tell +us what control center libraries are available. So instead, do the same +thing we did for cinnamon-settings modules, and check if the library +exists. +--- + files/usr/bin/cinnamon-settings | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/files/usr/bin/cinnamon-settings b/files/usr/bin/cinnamon-settings +index 9fbdbecd2..98ca454a5 100755 +--- a/files/usr/bin/cinnamon-settings ++++ b/files/usr/bin/cinnamon-settings +@@ -58,6 +58,7 @@ Available types of sort, and corresponding numbers: + import getopt + import os + import sys ++import sysconfig + + def usage(): + print("""Usage: +@@ -119,7 +120,7 @@ if len(sys.argv) > 1: + os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) + elif os.path.exists("/usr/share/cinnamon/cinnamon-settings/modules/cs_%s.py" % module): + os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) +- elif os.path.exists("/usr/bin/cinnamon-control-center"): ++ elif os.path.exists(os.path.join(sysconfig.get_config_var("LIBDIR"), "cinnamon-control-center-1/panels/lib%s.so" % module)): + os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) + elif os.path.exists("/usr/bin/gnome-control-center"): + print ("Unknown module %s, calling gnome-control-center" % module) +-- +2.22.0 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-06-09 19:56:53 UTC (rev 640907) +++ PKGBUILD 2020-06-09 19:57:19 UTC (rev 640908) @@ -1,90 +0,0 @@ -# Maintainer: Eli Schwartz <eschwa...@archlinux.org> -# Contributor: Alexandre Filgueira <alexfilgue...@cinnarch.com> -# Contributor: M0Rf30 -# Contributor: unifiedlinux -# Contributor: CReimer - -pkgname=cinnamon -pkgver=4.6.2 -pkgrel=1 -pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" -arch=('x86_64') -url="https://github.com/linuxmint/${pkgname}" -license=('GPL2') -depends=('accountsservice' 'caribou' 'cinnamon-control-center' 'cinnamon-menus' 'cinnamon-screensaver' - 'cinnamon-session' 'cinnamon-settings-daemon' 'cjs' 'gnome-backgrounds' - 'gnome-themes-extra' 'gstreamer' 'libcroco' 'libgnomekbd' 'libkeybinder3' 'librsvg' 'muffin' - 'network-manager-applet' 'nemo' 'polkit-gnome' 'python-cairo' 'python-dbus' - 'python-gobject' 'python-pam' 'python-pexpect' 'python-pillow' 'python-pyinotify' - 'python-pytz' 'python-tinycss2' 'python-xapp' 'timezonemap' 'xapps') -optdepends=('blueberry: Bluetooth support' - 'cinnamon-translations: i18n' - 'gnome-panel: fallback mode' - 'metacity: fallback mode' - 'system-config-printer: printer settings') -makedepends=('intltool' 'gtk-doc' 'gobject-introspection') -options=('!emptydirs') -source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz" - "0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch" - "set_wheel.diff" - "default-theme.patch") -sha512sums=('7356e3fa08436dd5303bb85908273c5c9dbfecc919380c85ca7a3f166ea9cf27380fe6409981006b28c28513409cf3ae61d716d31819754edbf11851ca167c55' - '77c2229d350bb1445375d206af769f1dde9329ce3575e40e9c1d5fea3ec0f49c0a7ef36d78caf895d9224147947bd102bab924b5579dc8dc5f8d3269e0c76374' - 'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c' - '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563') -b2sums=('ad31c2f531c25c95d615e246bdb739cc993eff225158de519f7caaa0738929e8d6f0853144ad18b752e2dedb80bea1703ef57f666bb392364c61fe257d635eb4' - '1d873efa0d17e358f834c4374f39bbf3f74340849f9c28a0950c0a064772083798aba3435e564acdf43a94665389917788e295073d4a65cc18600d71b7a9f008' - '3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160' - '3a7515cc7b0ca1549289be62f6d5cbd79f4b076892194f4b6264555322d430a3d6474db9ec62439f3ba41d43d1017dc39a4c44add2e5e5c09f32012b772a7041') - -prepare() { - cd "${srcdir}"/${pkgname}-${pkgver} - - # Check for the cc-panel module path, not for the irrelevant binary - # https://github.com/linuxmint/cinnamon/pull/7382 - patch --no-backup-if-mismatch -p1 -i ../0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch - - # Use wheel group instread of sudo (taken from Fedora) - patch -Np1 -i ../set_wheel.diff - - # Set default theme to 'cinnamon' - patch -Np1 -i ../default-theme.patch - - # Replace MintInstall with GNOME Software - sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in - - # Add polkit agent to required components - sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ - files/cinnamon*.session.in - - # https://github.com/linuxmint/cinnamon/issues/3575#issuecomment-374887122 - # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead - sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \ - files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py - - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/cinnamon \ - --localstatedir=/var \ - --disable-static \ - --disable-gtk-doc \ - --disable-schemas-compile \ - --enable-compile-warnings=yes - - # https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - - make DESTDIR="${pkgdir}" install -} Copied: cinnamon/repos/community-x86_64/PKGBUILD (from rev 640907, cinnamon/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-06-09 19:57:19 UTC (rev 640908) @@ -0,0 +1,90 @@ +# Maintainer: Eli Schwartz <eschwa...@archlinux.org> +# Contributor: Alexandre Filgueira <alexfilgue...@cinnarch.com> +# Contributor: M0Rf30 +# Contributor: unifiedlinux +# Contributor: CReimer + +pkgname=cinnamon +pkgver=4.6.3 +pkgrel=1 +pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" +arch=('x86_64') +url="https://github.com/linuxmint/${pkgname}" +license=('GPL2') +depends=('accountsservice' 'caribou' 'cinnamon-control-center' 'cinnamon-menus' 'cinnamon-screensaver' + 'cinnamon-session' 'cinnamon-settings-daemon' 'cjs' 'gnome-backgrounds' + 'gnome-themes-extra' 'gstreamer' 'libcroco' 'libgnomekbd' 'libkeybinder3' 'librsvg' 'muffin' + 'network-manager-applet' 'nemo' 'polkit-gnome' 'python-cairo' 'python-dbus' + 'python-gobject' 'python-pam' 'python-pexpect' 'python-pillow' 'python-pyinotify' + 'python-pytz' 'python-tinycss2' 'python-xapp' 'timezonemap' 'xapps') +optdepends=('blueberry: Bluetooth support' + 'cinnamon-translations: i18n' + 'gnome-panel: fallback mode' + 'metacity: fallback mode' + 'system-config-printer: printer settings') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection') +options=('!emptydirs') +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz" + "0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch" + "set_wheel.diff" + "default-theme.patch") +sha512sums=('32042fa6864b9ab1f55ed3f86a2bd4228dcb3b8235873ed51b6b92eb1a66998bc2aa55568a45fcf42e860c5fe7582632c1effd6f0d3e15478487890b0a6961a9' + '77c2229d350bb1445375d206af769f1dde9329ce3575e40e9c1d5fea3ec0f49c0a7ef36d78caf895d9224147947bd102bab924b5579dc8dc5f8d3269e0c76374' + 'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c' + '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563') +b2sums=('d2a703b6d98bb79142abfdebd0c6c697ea57d11d130796018aefae194a56614e5a1ab4b4c6d1061ed7ad1fe26447f925be4c044cc6631ae524e5bf4c7777c319' + '1d873efa0d17e358f834c4374f39bbf3f74340849f9c28a0950c0a064772083798aba3435e564acdf43a94665389917788e295073d4a65cc18600d71b7a9f008' + '3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160' + '3a7515cc7b0ca1549289be62f6d5cbd79f4b076892194f4b6264555322d430a3d6474db9ec62439f3ba41d43d1017dc39a4c44add2e5e5c09f32012b772a7041') + +prepare() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # Check for the cc-panel module path, not for the irrelevant binary + # https://github.com/linuxmint/cinnamon/pull/7382 + patch --no-backup-if-mismatch -p1 -i ../0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch + + # Use wheel group instread of sudo (taken from Fedora) + patch -Np1 -i ../set_wheel.diff + + # Set default theme to 'cinnamon' + patch -Np1 -i ../default-theme.patch + + # Replace MintInstall with GNOME Software + sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in + + # Add polkit agent to required components + sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ + files/cinnamon*.session.in + + # https://github.com/linuxmint/cinnamon/issues/3575#issuecomment-374887122 + # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead + sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \ + files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py + + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/cinnamon \ + --localstatedir=/var \ + --disable-static \ + --disable-gtk-doc \ + --disable-schemas-compile \ + --enable-compile-warnings=yes + + # https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install +} Deleted: default-theme.patch =================================================================== --- default-theme.patch 2020-06-09 19:56:53 UTC (rev 640907) +++ default-theme.patch 2020-06-09 19:57:19 UTC (rev 640908) @@ -1,25 +0,0 @@ -From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> -Date: Sat, 22 Nov 2014 22:39:39 +0100 -Subject: [PATCH] Set default theme to 'cinnamon' - ---- - data/org.cinnamon.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index 91fa171..9f56e4c 100644 ---- a/data/org.cinnamon.gschema.xml.in -+++ b/data/org.cinnamon.gschema.xml.in -@@ -581,7 +581,7 @@ - <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/" - gettext-domain="@GETTEXT_PACKAGE@"> - <key name="name" type="s"> -- <default>""</default> -+ <default>"cinnamon"</default> - <_summary>Theme name</_summary> - <_description> - The name of the theme --- -2.1.3 - Copied: cinnamon/repos/community-x86_64/default-theme.patch (from rev 640907, cinnamon/trunk/default-theme.patch) =================================================================== --- default-theme.patch (rev 0) +++ default-theme.patch 2020-06-09 19:57:19 UTC (rev 640908) @@ -0,0 +1,25 @@ +From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +Date: Sat, 22 Nov 2014 22:39:39 +0100 +Subject: [PATCH] Set default theme to 'cinnamon' + +--- + data/org.cinnamon.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in +index 91fa171..9f56e4c 100644 +--- a/data/org.cinnamon.gschema.xml.in ++++ b/data/org.cinnamon.gschema.xml.in +@@ -581,7 +581,7 @@ + <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/" + gettext-domain="@GETTEXT_PACKAGE@"> + <key name="name" type="s"> +- <default>""</default> ++ <default>"cinnamon"</default> + <_summary>Theme name</_summary> + <_description> + The name of the theme +-- +2.1.3 + Deleted: set_wheel.diff =================================================================== --- set_wheel.diff 2020-06-09 19:56:53 UTC (rev 640907) +++ set_wheel.diff 2020-06-09 19:57:19 UTC (rev 640908) @@ -1,55 +0,0 @@ ---- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -@@ -153,12 +153,11 @@ - - class PasswordDialog(Gtk.Dialog): - -- def __init__ (self, user, password_mask, group_mask, parent = None): -+ def __init__ (self, user, password_mask, parent = None): - super(PasswordDialog, self).__init__(None, parent) - - self.user = user - self.password_mask = password_mask -- self.group_mask = group_mask - - self.set_modal(True) - self.set_skip_taskbar_hint(True) -@@ -224,14 +223,7 @@ - def change_password(self): - newpass = self.new_password.get_text() - self.user.set_password(newpass, "") -- mask = self.group_mask.get_text() -- if "nopasswdlogin" in mask: -- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"]) -- mask = mask.split(", ") -- mask.remove("nopasswdlogin") -- mask = ", ".join(mask) -- self.group_mask.set_text(mask) -- self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') -+ self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') - self.destroy() - - def set_passwords_visibility(self): -@@ -563,7 +555,7 @@ - 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, self.window) -+ dialog = PasswordDialog(user, self.password_mask, self.window) - response = dialog.run() - - def _on_groups_button_clicked(self, widget): -@@ -807,11 +799,11 @@ - 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: -- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) -+ subprocess.call(["usermod", username, "-G", "%s,wheel" % username]) - else: -- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username]) -+ subprocess.call(["usermod", username, "-G", "%s" % username]) - self.load_groups() - dialog.destroy() Copied: cinnamon/repos/community-x86_64/set_wheel.diff (from rev 640907, cinnamon/trunk/set_wheel.diff) =================================================================== --- set_wheel.diff (rev 0) +++ set_wheel.diff 2020-06-09 19:57:19 UTC (rev 640908) @@ -0,0 +1,55 @@ +--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py ++++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +@@ -153,12 +153,11 @@ + + class PasswordDialog(Gtk.Dialog): + +- def __init__ (self, user, password_mask, group_mask, parent = None): ++ def __init__ (self, user, password_mask, parent = None): + super(PasswordDialog, self).__init__(None, parent) + + self.user = user + self.password_mask = password_mask +- self.group_mask = group_mask + + self.set_modal(True) + self.set_skip_taskbar_hint(True) +@@ -224,14 +223,7 @@ + def change_password(self): + newpass = self.new_password.get_text() + self.user.set_password(newpass, "") +- mask = self.group_mask.get_text() +- if "nopasswdlogin" in mask: +- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"]) +- mask = mask.split(", ") +- mask.remove("nopasswdlogin") +- mask = ", ".join(mask) +- self.group_mask.set_text(mask) +- self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') ++ self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') + self.destroy() + + def set_passwords_visibility(self): +@@ -563,7 +555,7 @@ + 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, self.window) ++ dialog = PasswordDialog(user, self.password_mask, self.window) + response = dialog.run() + + def _on_groups_button_clicked(self, widget): +@@ -807,11 +799,11 @@ + 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: +- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) ++ subprocess.call(["usermod", username, "-G", "%s,wheel" % username]) + else: +- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username]) ++ subprocess.call(["usermod", username, "-G", "%s" % username]) + self.load_groups() + dialog.destroy()