[Galago-commits] r2853 - in trunk/libnotify: . libnotify

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-06-15 02:15:02 -0700 (Thu, 15 Jun 2006)
New Revision: 2853

Modified:
   trunk/libnotify/ChangeLog
   trunk/libnotify/libnotify/notification.c
Log:
Fix a build error on gtk 2.9.2+. This fixes bug #65.


Modified: trunk/libnotify/ChangeLog
===================================================================
--- trunk/libnotify/ChangeLog	2006-06-14 09:04:10 UTC (rev 2852)
+++ trunk/libnotify/ChangeLog	2006-06-15 09:15:02 UTC (rev 2853)
@@ -1,3 +1,8 @@
+Thu Jun 15 02:14:14 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libnotify/notification.c:
+	  - Fix a build error on gtk 2.9.2+. This fixes bug #65.
+
 Tue Jun 06 12:44:48 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* docs/reference/tmpl/notification.sgml:

Modified: trunk/libnotify/libnotify/notification.c
===================================================================
--- trunk/libnotify/libnotify/notification.c	2006-06-14 09:04:10 UTC (rev 2852)
+++ trunk/libnotify/libnotify/notification.c	2006-06-15 09:15:02 UTC (rev 2853)
@@ -354,7 +354,7 @@
 	if (priv->attached_widget != NULL)
 		g_object_unref(G_OBJECT(priv->attached_widget));
 
-#if HAVE_STATUS_ICON
+#ifdef HAVE_STATUS_ICON
     if (priv->status_icon != NULL)
         g_object_remove_weak_pointer(G_OBJECT(priv->status_icon),
 								     (gpointer)&priv->status_icon);
@@ -607,10 +607,14 @@
 notify_notification_attach_to_status_icon(NotifyNotification *notification,
 										  GtkStatusIcon *status_icon)
 {
+	NotifyNotificationPrivate *priv;
+
 	g_return_if_fail(NOTIFY_IS_NOTIFICATION(notification));
 	g_return_if_fail(status_icon == NULL || GTK_IS_STATUS_ICON(status_icon));
 
-	if (notification->priv->status_icon == status_icon)
+	priv = notification->priv;
+
+	if (priv->status_icon == status_icon)
 		return;
 
 	if (priv->status_icon != NULL)