r23494 - in /desktop/unstable/gnome-power-manager/debian: changelog patches/09-fix-critical-warning-from-gpmscreensaver.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Mar 31 15:23:57 UTC 2010
Author: biebl
Date: Wed Mar 31 15:23:55 2010
New Revision: 23494
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23494
Log:
* debian/patches/09-fix-critical-warning-from-gpmscreensaver.patch
- Fix up a critical warning from the GpmScreensaver code on startup. Patch
pulled from upstream Git.
Added:
desktop/unstable/gnome-power-manager/debian/patches/09-fix-critical-warning-from-gpmscreensaver.patch
Modified:
desktop/unstable/gnome-power-manager/debian/changelog
desktop/unstable/gnome-power-manager/debian/patches/series
Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=23494&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog [utf-8] Wed Mar 31 15:23:55 2010
@@ -21,6 +21,9 @@
- Add debian/source/format.
- Drop quilt from Build-Depends.
- Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk include.
+ * debian/patches/09-fix-critical-warning-from-gpmscreensaver.patch
+ - Fix up a critical warning from the GpmScreensaver code on startup. Patch
+ pulled from upstream Git.
-- Michael Biebl <biebl at debian.org> Wed, 31 Mar 2010 14:19:19 +0200
Added: desktop/unstable/gnome-power-manager/debian/patches/09-fix-critical-warning-from-gpmscreensaver.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/09-fix-critical-warning-from-gpmscreensaver.patch?rev=23494&op=file
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/09-fix-critical-warning-from-gpmscreensaver.patch (added)
+++ desktop/unstable/gnome-power-manager/debian/patches/09-fix-critical-warning-from-gpmscreensaver.patch [utf-8] Wed Mar 31 15:23:55 2010
@@ -1,0 +1,64 @@
+commit b6c6a18be40a39aae69bac564e2d63732be20593
+Author: Richard Hughes <richard at hughsie.com>
+Date: Wed Mar 31 16:08:07 2010 +0100
+
+ Fix up a critical warning from the GpmScreensaver code
+
+diff --git a/src/gpm-screensaver.c b/src/gpm-screensaver.c
+index d727b57..a0787e7 100644
+--- a/src/gpm-screensaver.c
++++ b/src/gpm-screensaver.c
+@@ -342,26 +342,6 @@ gpm_screensaver_class_init (GpmScreensaverClass *klass)
+ }
+
+ /**
+- * gpm_screensaver_proxy_status_cb:
+- * @proxy: The dbus raw proxy
+- * @status: The status of the service, where TRUE is connected
+- * @screensaver: This class instance
+- **/
+-static void
+-gpm_screensaver_proxy_status_cb (DBusGProxy *proxy, gboolean status, GpmScreensaver *screensaver)
+-{
+- g_return_if_fail (GPM_IS_SCREENSAVER (screensaver));
+-
+-#if 0
+- if (status) {
+- gpm_screensaver_proxy_connect_more (screensaver);
+- } else {
+- gpm_screensaver_proxy_disconnect_more (screensaver);
+- }
+-#endif
+-}
+-
+-/**
+ * gpm_screensaver_init:
+ * @screensaver: This class instance
+ **/
+@@ -373,16 +353,10 @@ gpm_screensaver_init (GpmScreensaver *screensaver)
+ screensaver->priv = GPM_SCREENSAVER_GET_PRIVATE (screensaver);
+
+ connection = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
+-
+ screensaver->priv->proxy = dbus_g_proxy_new_for_name (connection,
+ GS_LISTENER_SERVICE,
+ GS_LISTENER_PATH,
+ GS_LISTENER_INTERFACE);
+-
+- g_signal_connect (screensaver->priv->proxy, "proxy-status",
+- G_CALLBACK (gpm_screensaver_proxy_status_cb),
+- screensaver);
+-
+ screensaver->priv->conf = gconf_client_get_default ();
+ }
+
+@@ -400,9 +374,6 @@ gpm_screensaver_finalize (GObject *object)
+ screensaver = GPM_SCREENSAVER (object);
+ screensaver->priv = GPM_SCREENSAVER_GET_PRIVATE (screensaver);
+
+-#if 0
+- gpm_screensaver_proxy_disconnect_more (screensaver);
+-#endif
+ g_object_unref (screensaver->priv->conf);
+ g_object_unref (screensaver->priv->proxy);
+
Modified: desktop/unstable/gnome-power-manager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/series?rev=23494&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/patches/series [utf-8] Wed Mar 31 15:23:55 2010
@@ -1,3 +1,4 @@
02_autostart_init.patch
06-bugreport-debian.patch
08-desktop-bugreport-path.patch
+09-fix-critical-warning-from-gpmscreensaver.patch
More information about the pkg-gnome-commits
mailing list