diff options
| author | Christian Hammond <chipx86@chipx86.com> | 2004-11-04 07:50:16 +0000 |
|---|---|---|
| committer | Christian Hammond <chipx86@chipx86.com> | 2004-11-04 07:50:16 +0000 |
| commit | 43c819deaa94435092d430c61ea6777ee513e13b (patch) | |
| tree | eb05df2d40287037c4117d46232dd1521e224603 | |
| parent | 41d4a3e49882860c6ec8c43e54f2360dd4e75dc0 (diff) | |
| download | libnotify-43c819deaa94435092d430c61ea6777ee513e13b.tar.gz | |
Use glib's memory allocation stuff instead of libc's.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libnotify/notify.c | 19 |
2 files changed, 16 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Wed Nov 03 23:39:23 PST 2004 Christian Hammond <chipx86@gnupdate.org> + + * libnotify/notify.c: + - Use glib's memory allocation stuff instead of libc's. + Wed Nov 03 23:34:10 PST 2004 Christian Hammond <chipx86@gnupdate.org> * libnotify/notify.c: diff --git a/libnotify/notify.c b/libnotify/notify.c index 1f4d86b..2555d1d 100644 --- a/libnotify/notify.c +++ b/libnotify/notify.c @@ -531,7 +531,7 @@ notify_icon_new_from_uri(const char *icon_uri) icon = g_new0(NotifyIcon, 1); icon->frames = 1; - icon->uri = malloc(sizeof(char *)); + icon->uri = g_malloc(sizeof(char *)); icon->uri[0] = g_strdup(icon_uri); return icon; @@ -548,9 +548,9 @@ notify_icon_new_from_data(size_t icon_len, const guchar *icon_data) icon = g_new0(NotifyIcon, 1); icon->frames = 1; - icon->raw_len = malloc(sizeof(icon->raw_len)); + icon->raw_len = g_malloc(sizeof(icon->raw_len)); icon->raw_len[0] = icon_len; - icon->raw_data = malloc(sizeof(guchar *)); + icon->raw_data = g_malloc(sizeof(guchar *)); icon->raw_data[0] = g_memdup(icon_data, icon_len); return icon; @@ -566,9 +566,9 @@ notify_icon_add_frame_from_data(NotifyIcon *icon, size_t icon_len, const guchar if (icon->frames) g_return_val_if_fail(icon->raw_len != NULL, FALSE); icon->frames++; - icon->raw_len = realloc(icon->raw_len, sizeof(size_t) * icon->frames); + icon->raw_len = g_realloc(icon->raw_len, sizeof(size_t) * icon->frames); icon->raw_len[icon->frames - 1] = icon_len; - icon->raw_data = realloc(icon->raw_data, sizeof(guchar *) * icon->frames); + icon->raw_data = g_realloc(icon->raw_data, sizeof(guchar *) * icon->frames); icon->raw_data[icon->frames - 1] = g_memdup(icon_data, icon_len); return TRUE; @@ -578,12 +578,15 @@ gboolean notify_icon_add_frame_from_uri(NotifyIcon *icon, const char *uri) { g_return_val_if_fail(icon != NULL, FALSE); - g_return_val_if_fail(uri != NULL, FALSE); + g_return_val_if_fail(uri != NULL, FALSE); - if (icon->frames) g_return_val_if_fail(icon->uri != NULL, FALSE); + if (icon->frames) + { + g_return_val_if_fail(icon->uri != NULL, FALSE); + } icon->frames++; - icon->uri = realloc(icon->uri, sizeof(char *) * icon->frames); + icon->uri = g_realloc(icon->uri, sizeof(char *) * icon->frames); icon->uri[icon->frames - 1] = g_strdup(uri); return TRUE; |