[empathy] fixed libnotify crashing if icon doesn't exist

[Guillaume Desmottes <gdesmott src gnome org>]

commit 6a1b1c8baf4c30fabd76395e6ff81fd3b7cd621d
Author: Abderaouf Bencherait <kenshin collabora co uk>
Date:   Fri Jun 26 19:38:37 2009 -0400

    fixed libnotify crashing if icon doesn't exist

 src/empathy-chat-window.c |    8 ++++++--
 src/empathy-status-icon.c |    4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 424d148..8e317f6 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -974,11 +974,15 @@ chat_window_show_or_update_notification (EmpathyChatWindow *window,
 	if (priv->notification != NULL) {
 		notify_notification_update (priv->notification,
 					    header, escaped, NULL);
-		notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
+		/* if icon doesn't exist libnotify will crash */
+		if (pixbuf != NULL)
+			notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
 	} else {
 		priv->notification = notify_notification_new (header, escaped, NULL, NULL);
 		notify_notification_set_timeout (priv->notification, NOTIFY_EXPIRES_DEFAULT);
-		notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
+		/* if icon doesn't exist libnotify will crash */
+		if (pixbuf != NULL)
+			notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
 
 		g_signal_connect (priv->notification, "closed",
 				  G_CALLBACK (chat_window_notification_closed_cb), cb_data);
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index d6520ff..a4b01b7 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -153,7 +153,9 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
 					  G_CALLBACK (status_icon_notification_closed_cb), icon);
 
  		}
-		notify_notification_set_icon_from_pixbuf (priv->notification,
+		/* if icon doesn't exist libnotify will crash */
+		if (pixbuf != NULL)
+			notify_notification_set_icon_from_pixbuf (priv->notification,
 							  pixbuf);
 		notify_notification_show (priv->notification, NULL);