[arch-commits] Commit in gnome-control-center/repos (12 files)

Jan Steffens heftig at nymeria.archlinux.org
Tue Sep 24 14:33:34 UTC 2013


    Date: Tuesday, September 24, 2013 @ 16:33:34
  Author: heftig
Revision: 195025

archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64

Added:
  gnome-control-center/repos/gnome-unstable-i686/PKGBUILD
    (from rev 195024, gnome-control-center/trunk/PKGBUILD)
  gnome-control-center/repos/gnome-unstable-i686/gnome-control-center.install
    (from rev 195024, gnome-control-center/trunk/gnome-control-center.install)
  gnome-control-center/repos/gnome-unstable-i686/no-deprecated-upower.diff
    (from rev 195024, gnome-control-center/trunk/no-deprecated-upower.diff)
  gnome-control-center/repos/gnome-unstable-x86_64/PKGBUILD
    (from rev 195024, gnome-control-center/trunk/PKGBUILD)
  gnome-control-center/repos/gnome-unstable-x86_64/gnome-control-center.install
    (from rev 195024, gnome-control-center/trunk/gnome-control-center.install)
  gnome-control-center/repos/gnome-unstable-x86_64/no-deprecated-upower.diff
    (from rev 195024, gnome-control-center/trunk/no-deprecated-upower.diff)
Deleted:
  gnome-control-center/repos/gnome-unstable-i686/PKGBUILD
  gnome-control-center/repos/gnome-unstable-i686/gnome-control-center.install
  gnome-control-center/repos/gnome-unstable-i686/no-deprecated-upower.diff
  gnome-control-center/repos/gnome-unstable-x86_64/PKGBUILD
  gnome-control-center/repos/gnome-unstable-x86_64/gnome-control-center.install
  gnome-control-center/repos/gnome-unstable-x86_64/no-deprecated-upower.diff

----------------------------------------------------+
 /PKGBUILD                                          |   96 +++++++++++++
 /gnome-control-center.install                      |   22 +++
 /no-deprecated-upower.diff                         |  138 +++++++++++++++++++
 gnome-unstable-i686/PKGBUILD                       |   48 ------
 gnome-unstable-i686/gnome-control-center.install   |   11 -
 gnome-unstable-i686/no-deprecated-upower.diff      |   69 ---------
 gnome-unstable-x86_64/PKGBUILD                     |   48 ------
 gnome-unstable-x86_64/gnome-control-center.install |   11 -
 gnome-unstable-x86_64/no-deprecated-upower.diff    |   69 ---------
 9 files changed, 256 insertions(+), 256 deletions(-)

Deleted: gnome-unstable-i686/PKGBUILD
===================================================================
--- gnome-unstable-i686/PKGBUILD	2013-09-24 14:31:24 UTC (rev 195024)
+++ gnome-unstable-i686/PKGBUILD	2013-09-24 14:33:34 UTC (rev 195025)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.9.92
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-license=(GPL)
-arch=(i686 x86_64)
-depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menus
-         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
-         libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
-         gnome-color-manager smbclient modemmanager)
-makedepends=(gnome-doc-utils intltool docbook-xsl)
-optdepends=('system-config-printer: Printer settings'
-            'gnome-user-share: Bluetooth and WebDAV file sharing'
-            'rygel: media sharing'
-            'vino: screen sharing'
-            'openssh: remote login')
-groups=(gnome)
-url="http://www.gnome.org"
-install=gnome-control-center.install
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('77f477d80734f5dad5f7dd617737b1615c654df79f9fb0840e76383e00c00a61')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/$pkgname --disable-static --disable-silent-rules
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  # Fix a warning
-  chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
-  chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
-}

Copied: gnome-control-center/repos/gnome-unstable-i686/PKGBUILD (from rev 195024, gnome-control-center/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD	                        (rev 0)
+++ gnome-unstable-i686/PKGBUILD	2013-09-24 14:33:34 UTC (rev 195025)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=3.10.0
+pkgrel=1
+pkgdesc="The Control Center for GNOME"
+license=(GPL)
+arch=(i686 x86_64)
+depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menus
+         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
+         libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
+         gnome-color-manager smbclient modemmanager)
+makedepends=(gnome-doc-utils intltool docbook-xsl)
+optdepends=('system-config-printer: Printer settings'
+            'gnome-user-share: Bluetooth and WebDAV file sharing'
+            'rygel: media sharing'
+            'vino: screen sharing'
+            'openssh: remote login')
+groups=(gnome)
+url="http://www.gnome.org"
+install=gnome-control-center.install
+options=('!libtool' '!emptydirs')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ea74d87e255308f130039a9afab548ae0416e2c96e69adfc7c794d1775f1474f')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static --disable-silent-rules
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+
+  # Fix a warning
+  chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
+  chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
+}

Deleted: gnome-unstable-i686/gnome-control-center.install
===================================================================
--- gnome-unstable-i686/gnome-control-center.install	2013-09-24 14:31:24 UTC (rev 195024)
+++ gnome-unstable-i686/gnome-control-center.install	2013-09-24 14:33:34 UTC (rev 195025)
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}

Copied: gnome-control-center/repos/gnome-unstable-i686/gnome-control-center.install (from rev 195024, gnome-control-center/trunk/gnome-control-center.install)
===================================================================
--- gnome-unstable-i686/gnome-control-center.install	                        (rev 0)
+++ gnome-unstable-i686/gnome-control-center.install	2013-09-24 14:33:34 UTC (rev 195025)
@@ -0,0 +1,11 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}

Deleted: gnome-unstable-i686/no-deprecated-upower.diff
===================================================================
--- gnome-unstable-i686/no-deprecated-upower.diff	2013-09-24 14:31:24 UTC (rev 195024)
+++ gnome-unstable-i686/no-deprecated-upower.diff	2013-09-24 14:33:34 UTC (rev 195025)
@@ -1,69 +0,0 @@
-diff --git c/panels/power/cc-power-panel.c i/panels/power/cc-power-panel.c
-index d70496a..af71db9 100644
---- c/panels/power/cc-power-panel.c
-+++ i/panels/power/cc-power-panel.c
-@@ -70,6 +70,7 @@ struct _CcPowerPanelPrivate
-   GCancellable  *cancellable;
-   GtkBuilder    *builder;
-   UpClient      *up_client;
-+  GDBusProxy    *logind_proxy;
-   GDBusProxy    *screen_proxy;
-   gboolean       has_batteries;
- 
-@@ -137,6 +138,7 @@ cc_power_panel_dispose (GObject *object)
-     }
-   g_clear_object (&priv->builder);
-   g_clear_object (&priv->screen_proxy);
-+  g_clear_object (&priv->logind_proxy);
-   g_clear_object (&priv->up_client);
- #ifdef HAVE_BLUETOOTH
-   g_clear_object (&priv->bt_client);
-@@ -1737,6 +1739,7 @@ add_automatic_suspend_section (CcPowerPanel *self)
-   GtkWidget *dialog;
-   GtkWidget *combo;
-   GtkCellRenderer *cell;
-+  GVariant *result;
- 
-   /* The default values for these settings are unfortunate for us;
-    * timeout == 0, action == suspend means 'do nothing' - just
-@@ -1820,7 +1823,23 @@ add_automatic_suspend_section (CcPowerPanel *self)
-   gtk_widget_set_margin_bottom (label, 6);
-   gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
- 
--  if (up_client_get_can_hibernate (self->priv->up_client))
-+  value = 0;
-+  result = g_dbus_proxy_call_sync (self->priv->logind_proxy,
-+                                   "CanHibernate",
-+                                   NULL,
-+                                   G_DBUS_CALL_FLAGS_NONE,
-+                                   -1,
-+                                   NULL,
-+                                   NULL);
-+  if (result)
-+    {
-+      g_variant_get (result, "(s)", &s);
-+      if (g_strcmp0 (s, "yes") == 0)
-+        value = 1;
-+      g_variant_unref(result);
-+    }
-+
-+  if (value)
-     {
-       model = (GtkTreeModel*)gtk_builder_get_object (priv->builder, "liststore_critical");
-       priv->critical_battery_combo = sw = gtk_combo_box_new_with_model (model);
-@@ -2070,6 +2089,15 @@ cc_power_panel_init (CcPowerPanel *self)
-                             got_screen_proxy_cb,
-                             self);
- 
-+  priv->logind_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                                      G_DBUS_PROXY_FLAGS_NONE,
-+                                                      NULL,
-+                                                      "org.freedesktop.login1",
-+                                                      "/org/freedesktop/login1",
-+                                                      "org.freedesktop.login1.Manager",
-+                                                      NULL,
-+                                                      &error);
-+
-   priv->up_client = up_client_new ();
- 
-   priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");

Copied: gnome-control-center/repos/gnome-unstable-i686/no-deprecated-upower.diff (from rev 195024, gnome-control-center/trunk/no-deprecated-upower.diff)
===================================================================
--- gnome-unstable-i686/no-deprecated-upower.diff	                        (rev 0)
+++ gnome-unstable-i686/no-deprecated-upower.diff	2013-09-24 14:33:34 UTC (rev 195025)
@@ -0,0 +1,69 @@
+diff --git c/panels/power/cc-power-panel.c i/panels/power/cc-power-panel.c
+index d70496a..af71db9 100644
+--- c/panels/power/cc-power-panel.c
++++ i/panels/power/cc-power-panel.c
+@@ -70,6 +70,7 @@ struct _CcPowerPanelPrivate
+   GCancellable  *cancellable;
+   GtkBuilder    *builder;
+   UpClient      *up_client;
++  GDBusProxy    *logind_proxy;
+   GDBusProxy    *screen_proxy;
+   gboolean       has_batteries;
+ 
+@@ -137,6 +138,7 @@ cc_power_panel_dispose (GObject *object)
+     }
+   g_clear_object (&priv->builder);
+   g_clear_object (&priv->screen_proxy);
++  g_clear_object (&priv->logind_proxy);
+   g_clear_object (&priv->up_client);
+ #ifdef HAVE_BLUETOOTH
+   g_clear_object (&priv->bt_client);
+@@ -1737,6 +1739,7 @@ add_automatic_suspend_section (CcPowerPanel *self)
+   GtkWidget *dialog;
+   GtkWidget *combo;
+   GtkCellRenderer *cell;
++  GVariant *result;
+ 
+   /* The default values for these settings are unfortunate for us;
+    * timeout == 0, action == suspend means 'do nothing' - just
+@@ -1820,7 +1823,23 @@ add_automatic_suspend_section (CcPowerPanel *self)
+   gtk_widget_set_margin_bottom (label, 6);
+   gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+ 
+-  if (up_client_get_can_hibernate (self->priv->up_client))
++  value = 0;
++  result = g_dbus_proxy_call_sync (self->priv->logind_proxy,
++                                   "CanHibernate",
++                                   NULL,
++                                   G_DBUS_CALL_FLAGS_NONE,
++                                   -1,
++                                   NULL,
++                                   NULL);
++  if (result)
++    {
++      g_variant_get (result, "(s)", &s);
++      if (g_strcmp0 (s, "yes") == 0)
++        value = 1;
++      g_variant_unref(result);
++    }
++
++  if (value)
+     {
+       model = (GtkTreeModel*)gtk_builder_get_object (priv->builder, "liststore_critical");
+       priv->critical_battery_combo = sw = gtk_combo_box_new_with_model (model);
+@@ -2070,6 +2089,15 @@ cc_power_panel_init (CcPowerPanel *self)
+                             got_screen_proxy_cb,
+                             self);
+ 
++  priv->logind_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
++                                                      G_DBUS_PROXY_FLAGS_NONE,
++                                                      NULL,
++                                                      "org.freedesktop.login1",
++                                                      "/org/freedesktop/login1",
++                                                      "org.freedesktop.login1.Manager",
++                                                      NULL,
++                                                      &error);
++
+   priv->up_client = up_client_new ();
+ 
+   priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");

Deleted: gnome-unstable-x86_64/PKGBUILD
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	2013-09-24 14:31:24 UTC (rev 195024)
+++ gnome-unstable-x86_64/PKGBUILD	2013-09-24 14:33:34 UTC (rev 195025)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.9.92
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-license=(GPL)
-arch=(i686 x86_64)
-depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menus
-         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
-         libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
-         gnome-color-manager smbclient modemmanager)
-makedepends=(gnome-doc-utils intltool docbook-xsl)
-optdepends=('system-config-printer: Printer settings'
-            'gnome-user-share: Bluetooth and WebDAV file sharing'
-            'rygel: media sharing'
-            'vino: screen sharing'
-            'openssh: remote login')
-groups=(gnome)
-url="http://www.gnome.org"
-install=gnome-control-center.install
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('77f477d80734f5dad5f7dd617737b1615c654df79f9fb0840e76383e00c00a61')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/$pkgname --disable-static --disable-silent-rules
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  # Fix a warning
-  chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
-  chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
-}

Copied: gnome-control-center/repos/gnome-unstable-x86_64/PKGBUILD (from rev 195024, gnome-control-center/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD	2013-09-24 14:33:34 UTC (rev 195025)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=3.10.0
+pkgrel=1
+pkgdesc="The Control Center for GNOME"
+license=(GPL)
+arch=(i686 x86_64)
+depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menus
+         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
+         libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
+         gnome-color-manager smbclient modemmanager)
+makedepends=(gnome-doc-utils intltool docbook-xsl)
+optdepends=('system-config-printer: Printer settings'
+            'gnome-user-share: Bluetooth and WebDAV file sharing'
+            'rygel: media sharing'
+            'vino: screen sharing'
+            'openssh: remote login')
+groups=(gnome)
+url="http://www.gnome.org"
+install=gnome-control-center.install
+options=('!libtool' '!emptydirs')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ea74d87e255308f130039a9afab548ae0416e2c96e69adfc7c794d1775f1474f')
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static --disable-silent-rules
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+
+  # Fix a warning
+  chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
+  chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
+}

Deleted: gnome-unstable-x86_64/gnome-control-center.install
===================================================================
--- gnome-unstable-x86_64/gnome-control-center.install	2013-09-24 14:31:24 UTC (rev 195024)
+++ gnome-unstable-x86_64/gnome-control-center.install	2013-09-24 14:33:34 UTC (rev 195025)
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}

Copied: gnome-control-center/repos/gnome-unstable-x86_64/gnome-control-center.install (from rev 195024, gnome-control-center/trunk/gnome-control-center.install)
===================================================================
--- gnome-unstable-x86_64/gnome-control-center.install	                        (rev 0)
+++ gnome-unstable-x86_64/gnome-control-center.install	2013-09-24 14:33:34 UTC (rev 195025)
@@ -0,0 +1,11 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}

Deleted: gnome-unstable-x86_64/no-deprecated-upower.diff
===================================================================
--- gnome-unstable-x86_64/no-deprecated-upower.diff	2013-09-24 14:31:24 UTC (rev 195024)
+++ gnome-unstable-x86_64/no-deprecated-upower.diff	2013-09-24 14:33:34 UTC (rev 195025)
@@ -1,69 +0,0 @@
-diff --git c/panels/power/cc-power-panel.c i/panels/power/cc-power-panel.c
-index d70496a..af71db9 100644
---- c/panels/power/cc-power-panel.c
-+++ i/panels/power/cc-power-panel.c
-@@ -70,6 +70,7 @@ struct _CcPowerPanelPrivate
-   GCancellable  *cancellable;
-   GtkBuilder    *builder;
-   UpClient      *up_client;
-+  GDBusProxy    *logind_proxy;
-   GDBusProxy    *screen_proxy;
-   gboolean       has_batteries;
- 
-@@ -137,6 +138,7 @@ cc_power_panel_dispose (GObject *object)
-     }
-   g_clear_object (&priv->builder);
-   g_clear_object (&priv->screen_proxy);
-+  g_clear_object (&priv->logind_proxy);
-   g_clear_object (&priv->up_client);
- #ifdef HAVE_BLUETOOTH
-   g_clear_object (&priv->bt_client);
-@@ -1737,6 +1739,7 @@ add_automatic_suspend_section (CcPowerPanel *self)
-   GtkWidget *dialog;
-   GtkWidget *combo;
-   GtkCellRenderer *cell;
-+  GVariant *result;
- 
-   /* The default values for these settings are unfortunate for us;
-    * timeout == 0, action == suspend means 'do nothing' - just
-@@ -1820,7 +1823,23 @@ add_automatic_suspend_section (CcPowerPanel *self)
-   gtk_widget_set_margin_bottom (label, 6);
-   gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
- 
--  if (up_client_get_can_hibernate (self->priv->up_client))
-+  value = 0;
-+  result = g_dbus_proxy_call_sync (self->priv->logind_proxy,
-+                                   "CanHibernate",
-+                                   NULL,
-+                                   G_DBUS_CALL_FLAGS_NONE,
-+                                   -1,
-+                                   NULL,
-+                                   NULL);
-+  if (result)
-+    {
-+      g_variant_get (result, "(s)", &s);
-+      if (g_strcmp0 (s, "yes") == 0)
-+        value = 1;
-+      g_variant_unref(result);
-+    }
-+
-+  if (value)
-     {
-       model = (GtkTreeModel*)gtk_builder_get_object (priv->builder, "liststore_critical");
-       priv->critical_battery_combo = sw = gtk_combo_box_new_with_model (model);
-@@ -2070,6 +2089,15 @@ cc_power_panel_init (CcPowerPanel *self)
-                             got_screen_proxy_cb,
-                             self);
- 
-+  priv->logind_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                                      G_DBUS_PROXY_FLAGS_NONE,
-+                                                      NULL,
-+                                                      "org.freedesktop.login1",
-+                                                      "/org/freedesktop/login1",
-+                                                      "org.freedesktop.login1.Manager",
-+                                                      NULL,
-+                                                      &error);
-+
-   priv->up_client = up_client_new ();
- 
-   priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");

Copied: gnome-control-center/repos/gnome-unstable-x86_64/no-deprecated-upower.diff (from rev 195024, gnome-control-center/trunk/no-deprecated-upower.diff)
===================================================================
--- gnome-unstable-x86_64/no-deprecated-upower.diff	                        (rev 0)
+++ gnome-unstable-x86_64/no-deprecated-upower.diff	2013-09-24 14:33:34 UTC (rev 195025)
@@ -0,0 +1,69 @@
+diff --git c/panels/power/cc-power-panel.c i/panels/power/cc-power-panel.c
+index d70496a..af71db9 100644
+--- c/panels/power/cc-power-panel.c
++++ i/panels/power/cc-power-panel.c
+@@ -70,6 +70,7 @@ struct _CcPowerPanelPrivate
+   GCancellable  *cancellable;
+   GtkBuilder    *builder;
+   UpClient      *up_client;
++  GDBusProxy    *logind_proxy;
+   GDBusProxy    *screen_proxy;
+   gboolean       has_batteries;
+ 
+@@ -137,6 +138,7 @@ cc_power_panel_dispose (GObject *object)
+     }
+   g_clear_object (&priv->builder);
+   g_clear_object (&priv->screen_proxy);
++  g_clear_object (&priv->logind_proxy);
+   g_clear_object (&priv->up_client);
+ #ifdef HAVE_BLUETOOTH
+   g_clear_object (&priv->bt_client);
+@@ -1737,6 +1739,7 @@ add_automatic_suspend_section (CcPowerPanel *self)
+   GtkWidget *dialog;
+   GtkWidget *combo;
+   GtkCellRenderer *cell;
++  GVariant *result;
+ 
+   /* The default values for these settings are unfortunate for us;
+    * timeout == 0, action == suspend means 'do nothing' - just
+@@ -1820,7 +1823,23 @@ add_automatic_suspend_section (CcPowerPanel *self)
+   gtk_widget_set_margin_bottom (label, 6);
+   gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+ 
+-  if (up_client_get_can_hibernate (self->priv->up_client))
++  value = 0;
++  result = g_dbus_proxy_call_sync (self->priv->logind_proxy,
++                                   "CanHibernate",
++                                   NULL,
++                                   G_DBUS_CALL_FLAGS_NONE,
++                                   -1,
++                                   NULL,
++                                   NULL);
++  if (result)
++    {
++      g_variant_get (result, "(s)", &s);
++      if (g_strcmp0 (s, "yes") == 0)
++        value = 1;
++      g_variant_unref(result);
++    }
++
++  if (value)
+     {
+       model = (GtkTreeModel*)gtk_builder_get_object (priv->builder, "liststore_critical");
+       priv->critical_battery_combo = sw = gtk_combo_box_new_with_model (model);
+@@ -2070,6 +2089,15 @@ cc_power_panel_init (CcPowerPanel *self)
+                             got_screen_proxy_cb,
+                             self);
+ 
++  priv->logind_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
++                                                      G_DBUS_PROXY_FLAGS_NONE,
++                                                      NULL,
++                                                      "org.freedesktop.login1",
++                                                      "/org/freedesktop/login1",
++                                                      "org.freedesktop.login1.Manager",
++                                                      NULL,
++                                                      &error);
++
+   priv->up_client = up_client_new ();
+ 
+   priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");




More information about the arch-commits mailing list