[Frugalware-git] gnometesting: gnome-control-center-2.91.92-1-x86_64

[bouleetbil]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=7b0f9c8b20b9aa700a0606dece121378009df5c5

commit 7b0f9c8b20b9aa700a0606dece121378009df5c5
Author: bouleetbil <bouleetbil at frogdev.info>
Date:   Mon Mar 21 23:17:12 2011 +0100

gnome-control-center-2.91.92-1-x86_64

*Version bump

diff --git a/source/gnome/gnome-control-center/FrugalBuild b/source/gnome/gnome-control-center/FrugalBuild
index 9e56440..30ef592 100644
--- a/source/gnome/gnome-control-center/FrugalBuild
+++ b/source/gnome/gnome-control-center/FrugalBuild
@@ -5,8 +5,8 @@ USE_CHEESE=${USE_CHEESE:-"y"}
#not yet ported to gnome3

pkgname=gnome-control-center
-pkgver=2.91.91
-pkgrel=3
+pkgver=2.91.92
+pkgrel=1
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,9 +30,7 @@ Fconfopts="$Fconfopts --enable-aboutme --disable-doc --with-libsocialweb=yes \
if Fuse $USE_CHEESE; then
depend=("${depends[@]}" "cheese")
fi
-source=($source account.diff)
-sha1sums=('a100899d478285f97d46231ed005861a2a8e6381' \
-          '91dfda87a60defb06ebf181d802fcc774f1a7d7f')
+sha1sums=('4f62a524af2890bdd1f32915a4d7b1ce8c02e1c1')
replaces=('accountsdialog')

build() {
diff --git a/source/gnome/gnome-control-center/account.diff b/source/gnome/gnome-control-center/account.diff
deleted file mode 100644
index 1293a2d..0000000
--- a/source/gnome/gnome-control-center/account.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-From bc160c45377ae513c4ed30722a40a086613a9fe0 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz at 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 <davidz at 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
-