[Galago-commits] r2441 - in trunk/libnotify: libnotify tests

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-01-19 22:11:53 -0800 (Thu, 19 Jan 2006)
New Revision: 2441

Modified:
   trunk/libnotify/libnotify/notification.c
   trunk/libnotify/libnotify/notification.h
   trunk/libnotify/tests/test-image.c
Log:
Rename notify_notification_set_icon_data_from_pixbuf to notify_notification_set_icon_from_pixbuf.


Modified: trunk/libnotify/libnotify/notification.c
===================================================================
--- trunk/libnotify/libnotify/notification.c	2006-01-20 06:08:58 UTC (rev 2440)
+++ trunk/libnotify/libnotify/notification.c	2006-01-20 06:11:53 UTC (rev 2441)
@@ -626,8 +626,8 @@
 }
 
 gboolean
-notify_notification_set_icon_data_from_pixbuf(
-	NotifyNotification *notification, GdkPixbuf *icon)
+notify_notification_set_icon_from_pixbuf(NotifyNotification *notification,
+										 GdkPixbuf *icon)
 {
 	gint width;
 	gint height;

Modified: trunk/libnotify/libnotify/notification.h
===================================================================
--- trunk/libnotify/libnotify/notification.h	2006-01-20 06:08:58 UTC (rev 2440)
+++ trunk/libnotify/libnotify/notification.h	2006-01-20 06:11:53 UTC (rev 2441)
@@ -114,7 +114,7 @@
 gboolean notify_notification_set_urgency(NotifyNotification *notification,
 										 NotifyUrgency l);
 
-gboolean notify_notification_set_icon_data_from_pixbuf(
+gboolean notify_notification_set_icon_from_pixbuf(
 	NotifyNotification *notification, GdkPixbuf *icon);
 
 gboolean notify_notification_set_hint_int32(NotifyNotification *notification,

Modified: trunk/libnotify/tests/test-image.c
===================================================================
--- trunk/libnotify/tests/test-image.c	2006-01-20 06:08:58 UTC (rev 2440)
+++ trunk/libnotify/tests/test-image.c	2006-01-20 06:11:53 UTC (rev 2441)
@@ -62,7 +62,14 @@
 	notify_notification_set_hint_int32(n, "x", 300);
 	notify_notification_set_hint_int32(n, "y", 24);
 	notify_notification_set_timeout(n, NOTIFY_TIMEOUT_NEVER);
+	helper = gtk_button_new();
+	icon = gtk_widget_render_icon(helper,
+	                              GTK_STOCK_DIALOG_QUESTION,
+	                              GTK_ICON_SIZE_DIALOG,
+	                              NULL);
 
+	notify_notification_set_icon_from_pixbuf(n, icon);
+
 	if (!notify_notification_show(n, NULL))
 	{
 		fprintf(stderr, "failed to send notification\n");
@@ -99,9 +106,9 @@
 	icon = gtk_widget_render_icon(helper,
 	                              GTK_STOCK_DIALOG_QUESTION,
 	                              GTK_ICON_SIZE_DIALOG,
-	                              "");
+	                              NULL);
 
-	notify_notification_set_icon_data_from_pixbuf(n, icon);
+	notify_notification_set_icon_from_pixbuf(n, icon);
 
 	if (!notify_notification_show(n, NULL))
 	{