[arch-commits] Commit in cinnamon-control-center/trunk (PKGBUILD idle-delay.patch)

[Balló György]

    Date: Monday, April 22, 2013 @ 14:28:48
  Author: bgyorgy
Revision: 88798

upgpkg: cinnamon-control-center 1.7.3-3

Fix idle-delay setting

Modified:
  cinnamon-control-center/trunk/PKGBUILD
  cinnamon-control-center/trunk/idle-delay.patch

------------------+
 PKGBUILD         |    4 ++--
 idle-delay.patch |   24 ++++++++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-22 11:33:22 UTC (rev 88797)
+++ PKGBUILD	2013-04-22 12:28:48 UTC (rev 88798)
@@ -6,7 +6,7 @@
 
 pkgname=cinnamon-control-center
 pkgver=1.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
 depends=('cinnamon' 'cheese' 'libgnomekbd' 'libgtop' 'network-manager-applet')
@@ -22,7 +22,7 @@
         "idle-delay.patch")
 sha256sums=('44a4484238c2b9e9060d062028438df589fc29c9e3da45edad068198a990c8be'
             '826de61fa60349a99c6895f2ffb0ea1c7f71031b17dd80bb245e3834b30b6ff6'
-            '9ca1a56b19413cc86dfce10558e1f696d63b93134afc76c0cb467944a9ea10f5')
+            '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67')
 
 build() {
   cd $pkgname-$pkgver

Modified: idle-delay.patch
===================================================================
--- idle-delay.patch	2013-04-22 11:33:22 UTC (rev 88797)
+++ idle-delay.patch	2013-04-22 12:28:48 UTC (rev 88798)
@@ -30,29 +30,37 @@
  
 diff -Naur cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c
 --- cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c	2013-04-15 16:04:38.000000000 +0200
-+++ cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c	2013-04-22 04:48:28.047061908 +0200
-@@ -351,9 +351,8 @@
++++ cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c	2013-04-22 14:15:28.440488342 +0200
+@@ -351,10 +351,6 @@
                        1, &value,
                        -1);
  
 -  /* set both battery and ac keys */
 -  g_settings_set_int (self->priv->gsd_settings, "sleep-display-ac", value);
 -  g_settings_set_int (self->priv->gsd_settings, "sleep-display-battery", value);
-+  /* set idle-delay key */
-+  g_settings_set_int (self->priv->session_settings, "idle-delay", value);
- 
+-
    set_idle_delay_from_dpms (self, value);
  }
-@@ -399,7 +398,7 @@
+ 
+@@ -384,7 +380,7 @@
+ {
+   GtkTreeIter iter;
+   GtkTreeModel *model;
+-  gint value;
++  guint value;
+   gint value_tmp, value_prev;
+   gboolean ret;
+   guint i;
+@@ -399,7 +395,7 @@
    i = 0;
  
    /* try to make the UI match the AC setting */
 -  value = g_settings_get_int (self->priv->gsd_settings, "sleep-display-ac");
-+  value = g_settings_get_int (self->priv->session_settings, "idle-delay");
++  g_settings_get (self->priv->session_settings, "idle-delay", "u", &value);
    do
      {
        gtk_tree_model_get (model, &iter,
-@@ -510,7 +509,7 @@
+@@ -510,7 +506,7 @@
    /* bind the auto dim checkbox */
    widget = WID ("screen_auto_reduce_checkbutton");
    g_settings_bind (self->priv->gsd_settings,