[control-center/f15/master] * Thu Mar 17 2011 Ray Strode <rstrode at redhat.com> 2.91.91-6 - Drop incomplete "Supervised" account t

[Ray Strode]

commit 9270be0c8e88b790aec684fff3443886344120a3
Author: Ray Strode <rstrode at redhat.com>
Date:   Thu Mar 17 16:30:20 2011 -0400

    * Thu Mar 17 2011 Ray Strode <rstrode at redhat.com> 2.91.91-6
    - Drop incomplete "Supervised" account type
      Resolves: #688363

 admin-accounts-change.patch |   81 +++++++++++++++++++++++++++++++++++++++++++
 control-center.spec         |   10 ++++-
 2 files changed, 89 insertions(+), 2 deletions(-)
---
diff --git a/admin-accounts-change.patch b/admin-accounts-change.patch
new file mode 100644
index 0000000..4232e56
--- /dev/null
+++ b/admin-accounts-change.patch
@@ -0,0 +1,81 @@
+From bc160c45377ae513c4ed30722a40a086613a9fe0 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz at redhat.com>
+Date: Thu, 17 Mar 2011 10:34:25 -0400
+Subject: [PATCH] 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 <davidz at redhat.com>
+---
+ panels/user-accounts/data/account-dialog.ui       |    4 ----
+ panels/user-accounts/data/user-accounts-dialog.ui |    4 ----
+ panels/user-accounts/um-account-type.c            |    2 --
+ panels/user-accounts/um-account-type.h            |    3 +--
+ 4 files changed, 1 insertions(+), 12 deletions(-)
+
+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);
+-- 
+1.7.4.1
+
+
diff --git a/control-center.spec b/control-center.spec
index ba979aa..3e3aff4 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -18,7 +18,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.91.91
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -26,8 +26,9 @@ Group: User Interface/Desktops
 Source: http://download.gnome.org/sources/gnome-control-center/2.91/gnome-control-center-%{version}.tar.bz2
 URL: http://www.gnome.org
 
-# upstream fix
+# upstream fixes
 Patch0: 0001-Network-don-t-be-shy.patch
+Patch1: admin-accounts-change.patch
 
 Requires: gnome-settings-daemon >= 2.21.91-3
 Requires: redhat-menus >= %{redhat_menus_version}
@@ -133,6 +134,7 @@ utilities.
 %prep
 %setup -q -n gnome-control-center-%{version}
 %patch0 -p1 -b .fix-network
+%patch1 -p1 -b .admin-accounts-change
 
 %build
 autoreconf -f
@@ -253,6 +255,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Thu Mar 17 2011 Ray Strode <rstrode at redhat.com> 2.91.91-6
+- Drop incomplete "Supervised" account type
+  Resolves: #688363
+
 * Tue Mar 15 2011 Bastien Nocera <bnocera at redhat.com> 2.91.91-5
 - We now replace desktop-effects, with the info panel (#684565)