Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=19be39e66dce8564c09904a0fd2a3ab7b6589ac3

commit 19be39e66dce8564c09904a0fd2a3ab7b6589ac3
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Fri Mar 18 22:06:26 2011 +0100

gnome-control-center-2.91.91-3-x86_64
*remove broken create superviseur user

diff --git a/source/gnome/gnome-control-center/FrugalBuild 
b/source/gnome/gnome-control-center/FrugalBuild
index 2b8aa7a..9e56440 100644
--- a/source/gnome/gnome-control-center/FrugalBuild
+++ b/source/gnome/gnome-control-center/FrugalBuild
@@ -6,7 +6,7 @@ USE_CHEESE=${USE_CHEESE:-"y"}

pkgname=gnome-control-center
pkgver=2.91.91
-pkgrel=2
+pkgrel=3
pkgdesc="GNOME Control Center"
depends=('libxml2>=2.7.8' 'gnome-desktop>=2.91.90' 'mutter' 
'libgnomekbd>=2.91.90' 'gnome-menus' \
'nautilus>=2.91.90' 'gst-plugins-base>=0.10.19-2' 'desktop-file-utils' \
@@ -30,8 +30,9 @@ Fconfopts="$Fconfopts --enable-aboutme --disable-doc 
--with-libsocialweb=yes \
if Fuse $USE_CHEESE; then
depend=("${depends[@]}" "cheese")
fi
-
-sha1sums=('a100899d478285f97d46231ed005861a2a8e6381')
+source=($source account.diff)
+sha1sums=('a100899d478285f97d46231ed005861a2a8e6381' \
+          '91dfda87a60defb06ebf181d802fcc774f1a7d7f')
replaces=('accountsdialog')

build() {
diff --git a/source/gnome/gnome-control-center/account.diff 
b/source/gnome/gnome-control-center/account.diff
new file mode 100644
index 0000000..1293a2d
--- /dev/null
+++ b/source/gnome/gnome-control-center/account.diff
@@ -0,0 +1,74 @@
+From bc160c45377ae513c4ed30722a40a086613a9fe0 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <dav...@redhat.com>
+Date: Thu, 17 Mar 2011 14:34:25 +0000
+Subject: Nuke supervised accounts
+
+The org.freedesktop.Accounts mechanism no longer supports supervised
+accounts as per the patch in
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=35390
+
+Therefore, nuke supervised accounts from the user interface as well.
+
+Signed-off-by: David Zeuthen <dav...@redhat.com>
+---
+diff --git a/panels/user-accounts/data/account-dialog.ui 
b/panels/user-accounts/data/account-dialog.ui
+index fc75484..3ae2fc3 100644
+--- a/panels/user-accounts/data/account-dialog.ui
++++ b/panels/user-accounts/data/account-dialog.ui
+@@ -24,10 +24,6 @@
+         <col id="0" translatable="yes" context="Account 
type">Administrator</col>
+         <col id="1">1</col>
+       </row>
+-      <row>
+-        <col id="0" translatable="yes" context="Account type">Supervised</col>
+-        <col id="1">2</col>
+-      </row>
+     </data>
+   </object>
+   <object class="GtkDialog" id="dialog">
+diff --git a/panels/user-accounts/data/user-accounts-dialog.ui 
b/panels/user-accounts/data/user-accounts-dialog.ui
+index 71d0db3..43ecdbd 100644
+--- a/panels/user-accounts/data/user-accounts-dialog.ui
++++ b/panels/user-accounts/data/user-accounts-dialog.ui
+@@ -24,10 +24,6 @@
+         <col id="0" translatable="yes" context="Account 
type">Administrator</col>
+         <col id="1">1</col>
+       </row>
+-      <row>
+-        <col id="0" translatable="yes" context="Account type">Supervised</col>
+-        <col id="1">2</col>
+-      </row>
+     </data>
+   </object>
+   <object class="GtkListStore" id="language-model">
+diff --git a/panels/user-accounts/um-account-type.c 
b/panels/user-accounts/um-account-type.c
+index 55064a8..30aeec7 100644
+--- a/panels/user-accounts/um-account-type.c
++++ b/panels/user-accounts/um-account-type.c
+@@ -35,8 +35,6 @@ um_account_type_get_name (UmAccountType account_type)
+                 return C_("Account type", "Standard");
+         case UM_ACCOUNT_TYPE_ADMINISTRATOR:
+                 return C_("Account type", "Administrator");
+-        case UM_ACCOUNT_TYPE_SUPERVISED:
+-                return C_("Account type", "Supervised");
+         default:
+                 g_assert_not_reached ();
+         }
+diff --git a/panels/user-accounts/um-account-type.h 
b/panels/user-accounts/um-account-type.h
+index 1e42e00..8967f2b 100644
+--- a/panels/user-accounts/um-account-type.h
++++ b/panels/user-accounts/um-account-type.h
+@@ -26,8 +26,7 @@ G_BEGIN_DECLS
+
+ typedef enum {
+   UM_ACCOUNT_TYPE_STANDARD,
+-  UM_ACCOUNT_TYPE_ADMINISTRATOR,
+-  UM_ACCOUNT_TYPE_SUPERVISED
++  UM_ACCOUNT_TYPE_ADMINISTRATOR
+ } UmAccountType;
+
+ const gchar *um_account_type_get_name (UmAccountType account_type);
+--
+cgit v0.8.3.4
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to