summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormonsta <[email protected]>2015-11-24 10:48:58 +0300
committermonsta <[email protected]>2015-11-24 10:51:49 +0300
commitb297c7d223e50f214f753f9a91194fc3ccd5b68f (patch)
tree37bef272a2ad4288f27a126489fa8b541b747d6c /src
parentfed38d6cf6f8141a8639723c6c5ccd5267fc5cc6 (diff)
downloadmate-notification-daemon-b297c7d223e50f214f753f9a91194fc3ccd5b68f.tar.bz2
mate-notification-daemon-b297c7d223e50f214f753f9a91194fc3ccd5b68f.tar.xz
Revert "daemon: fix "GValueArray is deprecated" warnings"
This reverts commit 7d162d83a2008c25b3134fcdda8265f23d461585. fixes https://github.com/mate-desktop/mate-notification-daemon/issues/91
Diffstat (limited to 'src')
-rw-r--r--src/daemon/daemon.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 47c118e..8d941f2 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -933,7 +933,7 @@ static GdkPixbuf* _notify_daemon_pixbuf_from_data_hint(GValue* icon_data)
int n_channels;
gsize expected_len;
GdkPixbuf* pixbuf;
- GArray* image_struct;
+ GValueArray* image_struct;
GValue* value;
GArray* tmp_array;
GType struct_type;
@@ -946,8 +946,8 @@ static GdkPixbuf* _notify_daemon_pixbuf_from_data_hint(GValue* icon_data)
return NULL;
}
- image_struct = (GArray *) g_value_get_boxed (icon_data);
- value = g_array_index(image_struct, GValue *, 0);
+ image_struct = (GValueArray *) g_value_get_boxed (icon_data);
+ value = g_value_array_get_nth (image_struct, 0);
if (value == NULL)
{
@@ -962,7 +962,7 @@ static GdkPixbuf* _notify_daemon_pixbuf_from_data_hint(GValue* icon_data)
}
width = g_value_get_int (value);
- value = g_array_index (image_struct, GValue *, 1);
+ value = g_value_array_get_nth (image_struct, 1);
if (value == NULL)
{
@@ -977,7 +977,7 @@ static GdkPixbuf* _notify_daemon_pixbuf_from_data_hint(GValue* icon_data)
}
height = g_value_get_int (value);
- value = g_array_index (image_struct, GValue *, 2);
+ value = g_value_array_get_nth (image_struct, 2);
if (value == NULL)
{
@@ -992,7 +992,7 @@ static GdkPixbuf* _notify_daemon_pixbuf_from_data_hint(GValue* icon_data)
}
rowstride = g_value_get_int (value);
- value = g_array_index (image_struct, GValue *, 3);
+ value = g_value_array_get_nth (image_struct, 3);
if (value == NULL)
{
@@ -1007,7 +1007,7 @@ static GdkPixbuf* _notify_daemon_pixbuf_from_data_hint(GValue* icon_data)
}
has_alpha = g_value_get_boolean (value);
- value = g_array_index (image_struct, GValue *, 4);
+ value = g_value_array_get_nth (image_struct, 4);
if (value == NULL) {
g_warning ("_notify_daemon_pixbuf_from_data_hint expected position 4 of the GValueArray to exist");
@@ -1021,7 +1021,7 @@ static GdkPixbuf* _notify_daemon_pixbuf_from_data_hint(GValue* icon_data)
}
bits_per_sample = g_value_get_int (value);
- value = g_array_index (image_struct, GValue *, 5);
+ value = g_value_array_get_nth (image_struct, 5);
if (value == NULL)
{
@@ -1036,7 +1036,7 @@ static GdkPixbuf* _notify_daemon_pixbuf_from_data_hint(GValue* icon_data)
}
n_channels = g_value_get_int (value);
- value = g_array_index (image_struct, GValue *, 6);
+ value = g_value_array_get_nth (image_struct, 6);
if (value == NULL)
{