Mercurial > pidgin

comparison pidgin/gtkicon-theme.c @ 32672:3828a61c44da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A boring and large patch so I can merge heads.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 23 Dec 2011 08:21:58 +0000
parents 0c7b74fc558e
children
comparison
equal deleted inserted replaced
32671:0e69949b3e61 32672:3828a61c44da
24 #include "pidginstock.h" 24 #include "pidginstock.h"
25 25
26 #include <gtk/gtk.h> 26 #include <gtk/gtk.h>
27 27
28 #define PIDGIN_ICON_THEME_GET_PRIVATE(Gobject) \ 28 #define PIDGIN_ICON_THEME_GET_PRIVATE(Gobject) \
29 ((PidginIconThemePrivate *) ((PIDGIN_ICON_THEME(Gobject))->priv)) 29 (G_TYPE_INSTANCE_GET_PRIVATE((Gobject), PIDGIN_TYPE_ICON_THEME, PidginIconThemePrivate))
30 30
31 /****************************************************************************** 31 /******************************************************************************
32 * Structs 32 * Structs
33 *****************************************************************************/ 33 *****************************************************************************/
34 34
51 pidgin_icon_theme_init(GTypeInstance *instance, 51 pidgin_icon_theme_init(GTypeInstance *instance,
52 gpointer klass) 52 gpointer klass)
53 { 53 {
54 PidginIconThemePrivate *priv; 54 PidginIconThemePrivate *priv;
55 55
56 (PIDGIN_ICON_THEME(instance))->priv = g_new0(PidginIconThemePrivate, 1);
57
58 priv = PIDGIN_ICON_THEME_GET_PRIVATE(instance); 56 priv = PIDGIN_ICON_THEME_GET_PRIVATE(instance);
59 57
60 priv->icon_files = g_hash_table_new_full(g_str_hash, 58 priv->icon_files = g_hash_table_new_full(g_str_hash,
61 g_str_equal, g_free, g_free); 59 g_str_equal, g_free, g_free);
62 } 60 }
67 PidginIconThemePrivate *priv; 65 PidginIconThemePrivate *priv;
68 66
69 priv = PIDGIN_ICON_THEME_GET_PRIVATE(obj); 67 priv = PIDGIN_ICON_THEME_GET_PRIVATE(obj);
70 68
71 g_hash_table_destroy(priv->icon_files); 69 g_hash_table_destroy(priv->icon_files);
72 g_free(priv);
73 70
74 parent_class->finalize(obj); 71 parent_class->finalize(obj);
75 } 72 }
76 73
77 static void 74 static void
80 GObjectClass *obj_class = G_OBJECT_CLASS(klass); 77 GObjectClass *obj_class = G_OBJECT_CLASS(klass);
81 78
82 parent_class = g_type_class_peek_parent(klass); 79 parent_class = g_type_class_peek_parent(klass);
83 80
84 obj_class->finalize = pidgin_icon_theme_finalize; 81 obj_class->finalize = pidgin_icon_theme_finalize;
82
83 g_type_class_add_private(klass, sizeof(PidginIconThemePrivate));
85 } 84 }
86 85
87 GType 86 GType
88 pidgin_icon_theme_get_type(void) 87 pidgin_icon_theme_get_type(void)
89 { 88 {