jcarr
/
libnotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a build error on gtk 2.9.2+. This fixes bug #65.

This commit is contained in:
Christian Hammond 2006-06-15 09:15:02 +00:00
parent 7b7b44e64e
commit 02442e7e8c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Tue Jun 06 12:44:48 PDT 2006 Christian Hammond <chipx86@chipx86.com>
* docs/reference/tmpl/notification.sgml: * docs/reference/tmpl/notification.sgml:

8
libnotify/notification.c
View File

@ -354,7 +354,7 @@ notify_notification_finalize(GObject *object)
if (priv->attached_widget != NULL) if (priv->attached_widget != NULL)
g_object_unref(G_OBJECT(priv->attached_widget)); g_object_unref(G_OBJECT(priv->attached_widget));
#if HAVE_STATUS_ICON #ifdef HAVE_STATUS_ICON
if (priv->status_icon != NULL) if (priv->status_icon != NULL)
g_object_remove_weak_pointer(G_OBJECT(priv->status_icon), g_object_remove_weak_pointer(G_OBJECT(priv->status_icon),
(gpointer)&priv->status_icon); (gpointer)&priv->status_icon);
@ -607,10 +607,14 @@ void
notify_notification_attach_to_status_icon(NotifyNotification *notification, notify_notification_attach_to_status_icon(NotifyNotification *notification,
GtkStatusIcon *status_icon) GtkStatusIcon *status_icon)
{ {
NotifyNotificationPrivate *priv;
g_return_if_fail(NOTIFY_IS_NOTIFICATION(notification)); g_return_if_fail(NOTIFY_IS_NOTIFICATION(notification));
g_return_if_fail(status_icon == NULL || GTK_IS_STATUS_ICON(status_icon)); 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; return;
if (priv->status_icon != NULL) if (priv->status_icon != NULL)