[arch-commits] Commit in empathy/repos (2 files)

[Ionut Biru]

    Date: Sunday, March 6, 2011 @ 13:25:11
  Author: ibiru
Revision: 112780

commit patch

Added:
  empathy/repos/staging-i686/empathy-2.32.2-libnotify-0.7.patch
  empathy/repos/staging-x86_64/empathy-2.32.2-libnotify-0.7.patch

---------------------------------------------------+
 staging-i686/empathy-2.32.2-libnotify-0.7.patch   |   54 ++++++++++++++++++++
 staging-x86_64/empathy-2.32.2-libnotify-0.7.patch |   54 ++++++++++++++++++++
 2 files changed, 108 insertions(+)

Added: staging-i686/empathy-2.32.2-libnotify-0.7.patch
===================================================================
--- staging-i686/empathy-2.32.2-libnotify-0.7.patch	                        (rev 0)
+++ staging-i686/empathy-2.32.2-libnotify-0.7.patch	2011-03-06 18:25:11 UTC (rev 112780)
@@ -0,0 +1,54 @@
+--- src/empathy-chat-window.c
++++ src/empathy-chat-window.c
+@@ -35,6 +35,11 @@
+ #include <gdk/gdkx.h>
+ #include <glib/gi18n.h>
+ #include <libnotify/notification.h>
++#include <libnotify/notify.h>
++
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ 
+ #include <telepathy-glib/telepathy-glib.h>
+ 
+@@ -1300,7 +1305,12 @@
+ 		   to an existing notification with the same title.
+ 		   In this way the previous message will not be lost: the new
+ 		   message will appear below it, in the same notification */
+-		notification = notify_notification_new (header, escaped, NULL, NULL);
++		notification = notify_notification_new (header, escaped, NULL
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++		);
++#else
++		, NULL);
++#endif
+ 
+ 		if (priv->notification == NULL) {
+ 			priv->notification = notification;
+--- src/empathy-status-icon.c
++++ src/empathy-status-icon.c
+@@ -32,6 +32,10 @@
+ #include <libnotify/notification.h>
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include <telepathy-glib/account-manager.h>
+ #include <telepathy-glib/util.h>
+ 
+@@ -206,8 +210,12 @@
+ 			   to an existing notification with the same title.
+ 			   In this way the previous message will not be lost: the new
+ 			   message will appear below it, in the same notification */
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++			/* notify_notification_new_with_status_icon was removed */
++#else
+ 			notification = notify_notification_new_with_status_icon
+ 				(priv->event->header, message_esc, NULL, priv->icon);
++#endif
+ 
+ 			if (priv->notification == NULL) {
+ 				priv->notification = notification;

Added: staging-x86_64/empathy-2.32.2-libnotify-0.7.patch
===================================================================
--- staging-x86_64/empathy-2.32.2-libnotify-0.7.patch	                        (rev 0)
+++ staging-x86_64/empathy-2.32.2-libnotify-0.7.patch	2011-03-06 18:25:11 UTC (rev 112780)
@@ -0,0 +1,54 @@
+--- src/empathy-chat-window.c
++++ src/empathy-chat-window.c
+@@ -35,6 +35,11 @@
+ #include <gdk/gdkx.h>
+ #include <glib/gi18n.h>
+ #include <libnotify/notification.h>
++#include <libnotify/notify.h>
++
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ 
+ #include <telepathy-glib/telepathy-glib.h>
+ 
+@@ -1300,7 +1305,12 @@
+ 		   to an existing notification with the same title.
+ 		   In this way the previous message will not be lost: the new
+ 		   message will appear below it, in the same notification */
+-		notification = notify_notification_new (header, escaped, NULL, NULL);
++		notification = notify_notification_new (header, escaped, NULL
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++		);
++#else
++		, NULL);
++#endif
+ 
+ 		if (priv->notification == NULL) {
+ 			priv->notification = notification;
+--- src/empathy-status-icon.c
++++ src/empathy-status-icon.c
+@@ -32,6 +32,10 @@
+ #include <libnotify/notification.h>
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include <telepathy-glib/account-manager.h>
+ #include <telepathy-glib/util.h>
+ 
+@@ -206,8 +210,12 @@
+ 			   to an existing notification with the same title.
+ 			   In this way the previous message will not be lost: the new
+ 			   message will appear below it, in the same notification */
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++			/* notify_notification_new_with_status_icon was removed */
++#else
+ 			notification = notify_notification_new_with_status_icon
+ 				(priv->event->header, message_esc, NULL, priv->icon);
++#endif
+ 
+ 			if (priv->notification == NULL) {
+ 				priv->notification = notification;