Package: sensors-applet
Version: 2.2.7-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

The attached patch allows sensors-applet to build against libnotify 0.7 in
Ubuntu.  Please consider applying it in Debian as well when libnotify 0.7
reaches unstable.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru sensors-applet-2.2.7/debian/patches/libnotify_0.7_api_change sensors-applet-2.2.7/debian/patches/libnotify_0.7_api_change
--- sensors-applet-2.2.7/debian/patches/libnotify_0.7_api_change	1969-12-31 16:00:00.000000000 -0800
+++ sensors-applet-2.2.7/debian/patches/libnotify_0.7_api_change	2011-06-17 17:34:18.000000000 -0700
@@ -0,0 +1,40 @@
+Description: Port sensors-applet to the new libnotify 0.7 API
+ Version 0.7 of libnotify drops an argument from the notify_notification_new()
+ call; fix up our invocation accordingly.
+Author: Steve Langasek <steve.langa...@canonical.com>
+Bug-Debian: http://bugs.debian.org/630301
+
+Index: sensors-applet-2.2.7/sensors-applet/sensors-applet.c
+===================================================================
+--- sensors-applet-2.2.7.orig/sensors-applet/sensors-applet.c
++++ sensors-applet-2.2.7/sensors-applet/sensors-applet.c
+@@ -306,8 +306,7 @@
+         
+         sensors_applet->notification = notify_notification_new(summary,
+                                                                message,
+-                                                               GTK_STOCK_DIALOG_WARNING,
+-                                                               GTK_WIDGET(sensors_applet->applet));
++                                                               GTK_STOCK_DIALOG_WARNING);
+         g_free(summary);
+         g_free(message);
+         
+Index: sensors-applet-2.2.7/sensors-applet/active-sensor-libnotify.c
+===================================================================
+--- sensors-applet-2.2.7.orig/sensors-applet/active-sensor-libnotify.c
++++ sensors-applet-2.2.7/sensors-applet/active-sensor-libnotify.c
+@@ -86,8 +86,7 @@
+         g_debug("Creating new notification");
+         active_sensor->notification[notif_type] = notify_notification_new(summary,
+                                                                           message,
+-                                                                          icon_filename,
+-                                                                          attach);
++                                                                          icon_filename);
+         g_signal_connect(active_sensor->notification[notif_type], "closed",
+                          G_CALLBACK(notif_closed_cb),
+                          active_sensor);
+--- sensors-applet-2.2.7.orig/po/POTFILES.skip
++++ sensors-applet-2.2.7/po/POTFILES.skip
+@@ -1 +1,3 @@
+ SensorsApplet.server.in
++.pc/libnotify_0.7_api_change/sensors-applet/sensors-applet.c
++
diff -Nru sensors-applet-2.2.7/debian/patches/series sensors-applet-2.2.7/debian/patches/series
--- sensors-applet-2.2.7/debian/patches/series	2011-06-17 15:52:00.000000000 -0700
+++ sensors-applet-2.2.7/debian/patches/series	2011-06-17 17:35:39.000000000 -0700
@@ -1 +1,2 @@
 link-to-libdl.patch
+libnotify_0.7_api_change

Reply via email to