cinnamon: update to 2.6.7.

This commit is contained in:
Enno Boland 2015-06-07 20:16:30 +02:00
parent 447dfbaa03
commit ccde9eb389
2 changed files with 19 additions and 15 deletions

View File

@ -14,19 +14,22 @@
self.set_modal(True) self.set_modal(True)
self.set_skip_taskbar_hint(True) self.set_skip_taskbar_hint(True)
@@ -215,12 +214,6 @@ class PasswordDialog(Gtk.Dialog): @@ -218,13 +217,7 @@ class PasswordDialog(Gtk.Dialog):
def change_password(self):
newpass = self.new_password.get_text() newpass = self.new_password.get_text()
self.user.set_password(newpass, "") self.user.set_password(newpass, "")
- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name()) mask = self.group_mask.get_text()
- mask = self.group_mask.get_text() - if "nopasswdlogin" in mask:
- mask = mask.split(", ") - os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
- mask.remove("nopasswdlogin") - mask = mask.split(", ")
- mask = ", ".join(mask) - mask.remove("nopasswdlogin")
- self.group_mask.set_text(mask) - mask = ", ".join(mask)
self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') - self.group_mask.set_text(mask)
- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
self.destroy() self.destroy()
def set_passwords_visibility(self):
@@ -515,7 +508,7 @@ class Module: @@ -515,7 +508,7 @@ class Module:
model, treeiter = self.users_treeview.get_selection().get_selected() model, treeiter = self.users_treeview.get_selection().get_selected()
if treeiter != None: if treeiter != None:

View File

@ -1,7 +1,7 @@
# Template file for 'cinnamon' # Template file for 'cinnamon'
pkgname=cinnamon pkgname=cinnamon
version=2.4.8 version=2.6.7
revision=3 revision=1
wrksrc="Cinnamon-${version}" wrksrc="Cinnamon-${version}"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect" short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
build_style=gnu-configure build_style=gnu-configure
@ -12,10 +12,10 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel webkitgtk-devel libgnomekbd-devel polkit-devel libcanberra-devel muffin-devel webkitgtk-devel libgnomekbd-devel polkit-devel libcanberra-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel GConf-devel startup-notification-devel pulseaudio-devel dbus-glib-devel GConf-devel
libgnome-keyring-devel NetworkManager-devel libcroco-devel" libgnome-keyring-devel NetworkManager-devel libcroco-devel gtk+3-devel"
depends=" depends="
accountsservice caribou cinnamon-settings-daemon>=2.4 cinnamon-session>=2.4 muffin>=2.4 accountsservice caribou cinnamon-settings-daemon>=${version%.*} cinnamon-session>=${version%.*} muffin>=${version%.*}
cinnamon-control-center>=2.4 cinnamon-screensaver>=2.4 cinnamon-translations>=2.4 nemo>=2.4 cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*} cinnamon-translations>=${version%.*} nemo>=${version%.*}
gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds network-manager-applet gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
python-cairo python-dbus python-pam python-pexpect python-inotify python-lxml python-Pillow python-cairo python-dbus python-pam python-pexpect python-inotify python-lxml python-Pillow
polkit-gnome upower0" polkit-gnome upower0"
@ -23,7 +23,8 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3" license="GPL-3"
homepage="http://cinnamon.linuxmint.com/" homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=5dc693cb57adce95cf917c94ee4e02fa8740e5cd5edbd8ee9cdeed81604aefd3 checksum=839ab0ea86b718809e53a0209d72701638ab3ac68263f2469e70967aaf21a004
CFLAGS+="-I/usr/include/gtk-3.0"
pycompile_dirs=" pycompile_dirs="
/usr/lib/cinnamon-slideshow /usr/lib/cinnamon-slideshow