Mercurial > pidgin.yaz

comparison libpurple/imgstore.c @ 18061:226b9109179c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 4d9e228029b9b7850d000c2edadc108c40f9e59a) to branch 'im.pidgin.pidgin.2.1.0' (head 50475bfc4ddcde1db8533c1b41c7b4342d773e21)
author Richard Laager <rlaager@wiktel.com>
date Thu, 07 Jun 2007 04:31:02 +0000
parents 4bb617bd3d71
children 7df46d8bf114
comparison
equal deleted inserted replaced
17765:89adae2f1a6e 18061:226b9109179c
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 * 24 *
25 */ 25 */
26 26
27 #include <glib.h> 27 #include <glib.h>
28 #include "dbus-maybe.h"
28 #include "debug.h" 29 #include "debug.h"
29 #include "imgstore.h" 30 #include "imgstore.h"
30 #include "util.h" 31 #include "util.h"
31 32
32 static GHashTable *imgstore; 33 static GHashTable *imgstore;
54 55
55 g_return_val_if_fail(data != NULL, 0); 56 g_return_val_if_fail(data != NULL, 0);
56 g_return_val_if_fail(size > 0, 0); 57 g_return_val_if_fail(size > 0, 0);
57 58
58 img = g_new(PurpleStoredImage, 1); 59 img = g_new(PurpleStoredImage, 1);
60 PURPLE_DBUS_REGISTER_POINTER(img, PurpleStoredImage);
59 img->data = data; 61 img->data = data;
60 img->size = size; 62 img->size = size;
61 img->filename = g_strdup(filename); 63 img->filename = g_strdup(filename);
62 img->refcount = 1; 64 img->refcount = 1;
63 img->id = 0; 65 img->id = 0;
157 if (img->id) 159 if (img->id)
158 g_hash_table_remove(imgstore, &img->id); 160 g_hash_table_remove(imgstore, &img->id);
159 161
160 g_free(img->data); 162 g_free(img->data);
161 g_free(img->filename); 163 g_free(img->filename);
164 PURPLE_DBUS_UNREGISTER_POINTER(img);
162 g_free(img); 165 g_free(img);
163 img = NULL; 166 img = NULL;
164 } 167 }
165 168
166 return img; 169 return img;