diff options
| author | Christian Hammond <chipx86@chipx86.com> | 2006-06-15 09:15:02 +0000 |
|---|---|---|
| committer | Christian Hammond <chipx86@chipx86.com> | 2006-06-15 09:15:02 +0000 |
| commit | 02442e7e8cf78169231650ccce19c15d41ce2cfc (patch) | |
| tree | 957ccece04e4ffbbbc314c99ad5712d5d1dfcf29 | |
| parent | 7b7b44e64e9986e97d26d2712d3772ecf5c2e774 (diff) | |
| download | libnotify-02442e7e8cf78169231650ccce19c15d41ce2cfc.tar.gz | |
Fix a build error on gtk 2.9.2+. This fixes bug #65.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libnotify/notification.c | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Jun 15 02:14:14 PDT 2006 Christian Hammond <chipx86@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@chipx86.com> * docs/reference/tmpl/notification.sgml: diff --git a/libnotify/notification.c b/libnotify/notification.c index 5a7958c..ef47a88 100644 --- a/libnotify/notification.c +++ b/libnotify/notification.c @@ -354,7 +354,7 @@ notify_notification_finalize(GObject *object) 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 @@ void 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) |