r41767 - in /desktop/unstable/gnome-applets/debian: changelog patches/01_battstat_upower.patch
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Thu May 22 14:12:40 UTC 2014
Author: mitya57-guest
Date: Thu May 22 14:12:40 2014
New Revision: 41767
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41767
Log:
Update 01_battstat_upower.patch for changed API in upower 0.99
(closes: #748930).
Modified:
desktop/unstable/gnome-applets/debian/changelog
desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch
Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=41767&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/changelog [utf-8] Thu May 22 14:12:40 2014
@@ -1,3 +1,10 @@
+gnome-applets (3.4.1-4) UNRELEASED; urgency=medium
+
+ * Update 01_battstat_upower.patch for changed API in upower 0.99
+ (closes: #748930).
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Thu, 22 May 2014 17:58:14 +0400
+
gnome-applets (3.4.1-4) unstable; urgency=low
* Disable weather applet, it is no longer compatible with libgweather 3.8
Modified: desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch?rev=41767&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch [utf-8] Thu May 22 14:12:40 2014
@@ -19,10 +19,8 @@
create mode 100644 battstat/battstat-upower.c
create mode 100644 battstat/battstat-upower.h
-Index: gnome-applets-3.4.1/battstat/Makefile.am
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/Makefile.am 2012-04-13 19:02:29.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/Makefile.am 2012-04-19 00:28:17.246029051 +0200
+--- a/battstat/Makefile.am
++++ b/battstat/Makefile.am
@@ -27,6 +27,7 @@
$(GNOME_APPLETS_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
@@ -50,11 +48,9 @@
$(APMLIB)
schemasdir = @GCONF_SCHEMA_FILE_DIR@
-Index: gnome-applets-3.4.1/battstat/battstat-upower.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-3.4.1/battstat/battstat-upower.c 2012-04-19 00:28:17.246029051 +0200
-@@ -0,0 +1,301 @@
+--- /dev/null
++++ b/battstat/battstat-upower.c
+@@ -0,0 +1,319 @@
+/*
+ * Copyright (C) 2010 by Joachim Breitner <mail at joachim-breitner.de>
+ *
@@ -124,12 +120,18 @@
+ schedule_status_callback();
+}
+
++static void
++device_removed_cb (UpClient *client, const gchar *object_path, gpointer user_data) {
++ schedule_status_callback();
++}
++
+/* ---- public functions ---- */
+
+char *
+battstat_upower_initialise (void (*callback) (void))
+{
+ status_updated_callback = callback;
++ GPtrArray *devices;
+
+ if( upc != NULL )
+ return g_strdup( "Already initialised!" );
@@ -137,13 +139,25 @@
+ if( (upc = up_client_new() ) == NULL )
+ goto error_out;
+
++#if UP_CHECK_VERSION(0, 99, 0)
++ devices = up_client_get_devices(upc);
++ if (!devices) {
++ goto error_shutdownclient;
++ }
++ g_ptr_array_unref(devices);
++#else
+ if (! up_client_enumerate_devices_sync( upc, NULL, NULL ) ) {
+ goto error_shutdownclient;
+ }
-+
++#endif
++
++ g_signal_connect_after( upc, "device-added", device_cb, NULL );
++#if UP_CHECK_VERSION(0, 99, 0)
++ g_signal_connect_after( upc, "device-removed", device_removed_cb, NULL );
++#else
+ g_signal_connect_after( upc, "device-changed", device_cb, NULL );
-+ g_signal_connect_after( upc, "device-added", device_cb, NULL );
+ g_signal_connect_after( upc, "device-removed", device_cb, NULL );
++#endif
+
+ return NULL;
+
@@ -356,10 +370,8 @@
+}
+
+#endif /* HAVE_UPOWER */
-Index: gnome-applets-3.4.1/battstat/battstat-upower.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-3.4.1/battstat/battstat-upower.h 2012-04-19 00:28:17.254029051 +0200
+--- /dev/null
++++ b/battstat/battstat-upower.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2010 by Joachim Breitner <mail at joachim-breitner.de>
@@ -394,10 +406,8 @@
+void battstat_upower_get_battery_info (BatteryStatus *status);
+
+#endif /* _battstat_upower_h_ */
-Index: gnome-applets-3.4.1/battstat/battstat_applet.c
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/battstat_applet.c 2012-04-13 19:02:29.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/battstat_applet.c 2012-04-19 00:28:17.254029051 +0200
+--- a/battstat/battstat_applet.c
++++ b/battstat/battstat_applet.c
@@ -1188,9 +1188,12 @@
char *comments = g_strdup_printf ("%s\n\n%s",
@@ -413,10 +423,8 @@
gtk_show_about_dialog( NULL,
"version", VERSION,
-Index: gnome-applets-3.4.1/battstat/docs/C/battstat.xml
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/docs/C/battstat.xml 2012-04-15 15:49:58.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/docs/C/battstat.xml 2012-04-19 00:28:17.254029051 +0200
+--- a/battstat/docs/C/battstat.xml
++++ b/battstat/docs/C/battstat.xml
@@ -226,10 +226,13 @@
<title>Power Management Backends</title>
@@ -450,10 +458,8 @@
<figure id="battstat-credits-hal">
<title>Check you're using the HAL backend</title>
<screenshot>
-Index: gnome-applets-3.4.1/battstat/power-management.c
-===================================================================
---- gnome-applets-3.4.1.orig/battstat/power-management.c 2012-04-13 19:02:29.000000000 +0200
-+++ gnome-applets-3.4.1/battstat/power-management.c 2012-04-19 00:28:17.254029051 +0200
+--- a/battstat/power-management.c
++++ b/battstat/power-management.c
@@ -41,6 +41,7 @@
#include "battstat.h"
@@ -570,10 +576,8 @@
power_management_using_hal( void )
{
#ifdef HAVE_HAL
-Index: gnome-applets-3.4.1/configure.in
-===================================================================
---- gnome-applets-3.4.1.orig/configure.in 2012-04-15 15:45:36.000000000 +0200
-+++ gnome-applets-3.4.1/configure.in 2012-04-19 00:28:17.254029051 +0200
+--- a/configure.in
++++ b/configure.in
@@ -23,6 +23,7 @@
LIBWNCK_REQUIRED=2.91.0
LIBNOTIFY_REQUIRED=0.7
More information about the pkg-gnome-commits
mailing list