packages: dhcpcd-ui/dhcpcd-ui-libnotify.patch - more fixes

[lisu]

Author: lisu                         Date: Thu Apr  7 09:44:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more fixes

---- Files affected:
packages/dhcpcd-ui:
   dhcpcd-ui-libnotify.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/dhcpcd-ui/dhcpcd-ui-libnotify.patch
diff -u packages/dhcpcd-ui/dhcpcd-ui-libnotify.patch:1.1 packages/dhcpcd-ui/dhcpcd-ui-libnotify.patch:1.2
--- packages/dhcpcd-ui/dhcpcd-ui-libnotify.patch:1.1	Thu Apr  7 11:31:57 2011
+++ packages/dhcpcd-ui/dhcpcd-ui-libnotify.patch	Thu Apr  7 11:44:20 2011
@@ -1,15 +1,18 @@
 --- dhcpcd-ui-0.5.1/src/dhcpcd-gtk/main.c~	2010-06-09 15:55:38.000000000 +0200
-+++ dhcpcd-ui-0.5.1/src/dhcpcd-gtk/main.c	2011-04-07 11:30:09.459298809 +0200
-@@ -198,7 +198,11 @@
++++ dhcpcd-ui-0.5.1/src/dhcpcd-gtk/main.c	2011-04-07 11:43:05.405993616 +0200
+@@ -194,11 +194,15 @@
+ 	g_strfreev(msgs);
+ 	if (nn != NULL)
+ 		notify_notification_close(nn, NULL);
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
+ 	if (gtk_status_icon_get_visible(status_icon))
  		nn = notify_notification_new_with_status_icon(title,
  		    msg, icon, status_icon);
  	else
--		nn = notify_notification_new(title, msg, icon, NULL);
-+		nn = notify_notification_new(title, msg, icon
-+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
-+				, NULL
+ 		nn = notify_notification_new(title, msg, icon, NULL);
++#else
++	nn = notify_notification_new(title, msg, icon);
 +#endif
-+				);
  	notify_notification_set_timeout(nn, 5000);
  	g_signal_connect(nn, "closed", G_CALLBACK(notify_closed), NULL);
  	notify_notification_show(nn, NULL);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcpcd-ui/dhcpcd-ui-libnotify.patch?r1=1.1&r2=1.2&f=u