← Back to branch summary

~ubuntu-branches/ubuntu/lucid/libnotify/lucid

« back to all changes in this revision

Viewing changes to libnotify/notification.c

  • Committer: Bazaar Package Importer
  • Author(s): Sivan Greenberg
  • Date: 2006-11-22 22:58:44 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061122225844-ya65cla58dpdjpmg
Tags: 0.4.3-0ubuntu1
* Merged with debian, remaining changes:
  + debian/rules:
    o Bump shlibs for libnotify to (>= 0.4.2)
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libnotify/notification.c
502
502
                                         const gchar *icon,
503
503
                                         GtkStatusIcon *status_icon)
504
504
{
505
 
        g_return_val_if_fail(status_icon == NULL, NULL);
 
505
        g_return_val_if_fail(status_icon != NULL, NULL);
506
506
        g_return_val_if_fail(GTK_IS_STATUS_ICON(status_icon), NULL);
507
507
 
508
508
        return g_object_new(NOTIFY_TYPE_NOTIFICATION,
631
631
                                                                  (gpointer)&priv->status_icon);
632
632
        }
633
633
 
634
 
        g_object_notify(G_OBJECT(notification), "attach-icon");
 
634
        g_object_notify(G_OBJECT(notification), "status-icon");
635
635
}
636
636
#endif /* HAVE_STATUS_ICON */
637
637
 
675
675
{
676
676
        if (id == notification->priv->id)
677
677
                g_signal_emit(notification, signals[SIGNAL_CLOSED], 0);
 
678
 
 
679
        notification->priv->id = 0;
678
680
}
679
681
 
680
682
static void
901
903
                return FALSE;
902
904
        }
903
905
 
904
 
        g_value_init(value, dbus_g_type_get_collection("GArray", G_TYPE_CHAR));
 
906
        g_value_init(value, DBUS_TYPE_G_UCHAR_ARRAY);
905
907
        g_value_set_boxed_take_ownership(value, byte_array);
906
908
        g_value_array_append(array, value);
907
909
 
961
963
 
962
964
        value = g_new0(GValue, 1);
963
965
        g_value_init(value, G_TYPE_VALUE_ARRAY);
964
 
        g_value_set_boxed(value, image_struct);
 
966
        g_value_set_boxed_take_ownership(value, image_struct);
965
967
 
966
968
        g_hash_table_insert(notification->priv->hints,
967
969
                                                g_strdup("icon_data"), value);