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

Introduce notify_notification_set_image_from_pixbuf 

Same as notify_notification_set_icon_from_pixbuf, but with a more explicit name.
notify_notification_set_icon_from_pixbuf is marked as deprecated.
This commit is contained in:
Aurélien Gâteau 2010-01-29 05:58:38 -05:00 committed by William Jon McCann
parent 6c1231835d
commit 117a582b9b
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libnotify/notification.c
View File

@ -969,6 +969,7 @@ _gvalue_array_append_byte_array (GValueArray *array,
* @icon: The icon. * @icon: The icon.
* *
* Sets the icon in the notification from a #GdkPixbuf. * Sets the icon in the notification from a #GdkPixbuf.
* Deprecated: use notify_notification_set_image_from_pixbuf() instead.
* *
* This will only work when libnotify is compiled against D-BUS 0.60 or * This will only work when libnotify is compiled against D-BUS 0.60 or
* higher. * higher.
@ -976,6 +977,23 @@ _gvalue_array_append_byte_array (GValueArray *array,
void void
notify_notification_set_icon_from_pixbuf (NotifyNotification *notification, notify_notification_set_icon_from_pixbuf (NotifyNotification *notification,
GdkPixbuf *icon) GdkPixbuf *icon)
{
notify_notification_set_image_from_pixbuf (notification, icon);
}
/**
* notify_notification_set_image_from_pixbuf:
* @notification: The notification.
* @pixbuf: The image.
*
* Sets the image in the notification from a #GdkPixbuf.
*
* This will only work when libnotify is compiled against D-BUS 0.60 or
* higher.
*/
void
notify_notification_set_image_from_pixbuf (NotifyNotification *notification,
GdkPixbuf *pixbuf)
{ {
#if CHECK_DBUS_VERSION(0, 60) #if CHECK_DBUS_VERSION(0, 60)
gint width; gint width;
@ -994,15 +1012,15 @@ notify_notification_set_icon_from_pixbuf (NotifyNotification *notification,
g_return_if_fail (NOTIFY_IS_NOTIFICATION (notification)); g_return_if_fail (NOTIFY_IS_NOTIFICATION (notification));
#if CHECK_DBUS_VERSION(0, 60) #if CHECK_DBUS_VERSION(0, 60)
width = gdk_pixbuf_get_width (icon); width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (icon); height = gdk_pixbuf_get_height (pixbuf);
rowstride = gdk_pixbuf_get_rowstride (icon); rowstride = gdk_pixbuf_get_rowstride (pixbuf);
n_channels = gdk_pixbuf_get_n_channels (icon); n_channels = gdk_pixbuf_get_n_channels (pixbuf);
bits_per_sample = gdk_pixbuf_get_bits_per_sample (icon); bits_per_sample = gdk_pixbuf_get_bits_per_sample (pixbuf);
image_len = (height - 1) * rowstride + width * image_len = (height - 1) * rowstride + width *
((n_channels * bits_per_sample + 7) / 8); ((n_channels * bits_per_sample + 7) / 8);
image = gdk_pixbuf_get_pixels (icon); image = gdk_pixbuf_get_pixels (pixbuf);
image_struct = g_value_array_new (1); image_struct = g_value_array_new (1);
@ -1010,7 +1028,7 @@ notify_notification_set_icon_from_pixbuf (NotifyNotification *notification,
_gvalue_array_append_int (image_struct, height); _gvalue_array_append_int (image_struct, height);
_gvalue_array_append_int (image_struct, rowstride); _gvalue_array_append_int (image_struct, rowstride);
_gvalue_array_append_bool (image_struct, _gvalue_array_append_bool (image_struct,
gdk_pixbuf_get_has_alpha (icon)); gdk_pixbuf_get_has_alpha (pixbuf));
_gvalue_array_append_int (image_struct, bits_per_sample); _gvalue_array_append_int (image_struct, bits_per_sample);
_gvalue_array_append_int (image_struct, n_channels); _gvalue_array_append_int (image_struct, n_channels);
_gvalue_array_append_byte_array (image_struct, image, image_len); _gvalue_array_append_byte_array (image_struct, image, image_len);

2
libnotify/notification.h
View File

@ -119,6 +119,8 @@ void notify_notification_set_urgency (NotifyNotificatio
void notify_notification_set_icon_from_pixbuf (NotifyNotification *notification, void notify_notification_set_icon_from_pixbuf (NotifyNotification *notification,
GdkPixbuf *icon); GdkPixbuf *icon);
void notify_notification_set_image_from_pixbuf (NotifyNotification *notification,
GdkPixbuf *image);
void notify_notification_set_hint_int32 (NotifyNotification *notification, void notify_notification_set_hint_int32 (NotifyNotification *notification,
const char *key, const char *key,