libpurple/buddyicon.c

Wed, 03 Jul 2013 21:49:28 +0530

author
Ankit Vani <a@nevitus.org>
date
Wed, 03 Jul 2013 21:49:28 +0530
branch
soc.2013.gobjectification
changeset 34696
6e0d13978666
parent 34645
a04c721bebf1
child 34699
09b2c9219b57
permissions
-rw-r--r--

Global replace to use GObject-style macros. See details.
* Changed 'PURPLE_BLIST_NODE_IS_' to 'PURPLE_IS_'
* Changed 'PURPLE_BUDDY_IS_ONLINE' to 'PURPLE_IS_BUDDY_ONLINE'

6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1 /**
22763
6e4bbebdf127 Better documentation.
Mark Doliner <markdoliner@pidgin.im>
parents: 22551
diff changeset
2 * @file buddyicon.c Buddy Icon API
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
3 * @ingroup core
20147
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
4 */
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
5
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
6 /* purple
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
7 *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
8 * Purple is the legal property of its developers, whose names are too numerous
8046
c581b20a47d6 [gaim-migrate @ 8730]
Sean Egan <seanegan@pidgin.im>
parents: 7721
diff changeset
9 * to list here. Please refer to the COPYRIGHT file distributed with this
c581b20a47d6 [gaim-migrate @ 8730]
Sean Egan <seanegan@pidgin.im>
parents: 7721
diff changeset
10 * source distribution.
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
11 *
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
12 * This program is free software; you can redistribute it and/or modify
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
13 * it under the terms of the GNU General Public License as published by
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
14 * the Free Software Foundation; either version 2 of the License, or
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
15 * (at your option) any later version.
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
16 *
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
17 * This program is distributed in the hope that it will be useful,
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
20 * GNU General Public License for more details.
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
21 *
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
22 * You should have received a copy of the GNU General Public License
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
23 * along with this program; if not, write to the Free Software
19859
71d37b57eff2 The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 18122
diff changeset
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
25 */
24569
5dbd0617a27d Build everything with the *_DISABLE_DEPRECATED flags set. This allows us
Richard Laager <rlaager@pidgin.im>
parents: 24273
diff changeset
26 #define _PURPLE_BUDDYICON_C_
5dbd0617a27d Build everything with the *_DISABLE_DEPRECATED flags set. This allows us
Richard Laager <rlaager@pidgin.im>
parents: 24273
diff changeset
27
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
28 #include "internal.h"
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
29 #include "buddyicon.h"
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
30 #include "conversation.h"
13555
b4d6a5e6853a [gaim-migrate @ 15932]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 12996
diff changeset
31 #include "dbus-maybe.h"
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
32 #include "debug.h"
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
33 #include "imgstore.h"
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
34 #include "util.h"
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
35
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
36 /* NOTE: Instances of this struct are allocated without zeroing the memory, so
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
37 * NOTE: be sure to update purple_buddy_icon_new() if you add members. */
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
38 struct _PurpleBuddyIcon
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
39 {
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
40 PurpleAccount *account; /**< The account the user is on. */
22769
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
41 PurpleStoredImage *img; /**< The stored image containing
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
42 the icon data. */
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
43 char *username; /**< The username the icon belongs to. */
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
44 char *checksum; /**< The protocol checksum. */
33666
ee2aad1340bf ref_count should never be negative
Mark Doliner <mark@kingant.net>
parents: 33665
diff changeset
45 unsigned int ref_count; /**< The buddy icon reference count. */
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
46 };
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
47
22769
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
48 /**
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
49 * This is the big grand daddy hash table that contains references to
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
50 * everybody's buddy icons.
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
51 *
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
52 * Key is a PurpleAccount.
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
53 * Value is another hash table, usually referred to as "icon_cache."
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
54 * For this inner hash table:
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
55 * Key is the username of the buddy whose icon is being stored.
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
56 * Value is the PurpleBuddyIcon for this buddy.
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
57 */
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
58 static GHashTable *account_cache = NULL;
22769
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
59
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
60 /**
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
61 * This hash table contains a bunch of PurpleStoredImages that are
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
62 * shared across all accounts.
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
63 *
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
64 * Key is the filename for this image as constructed by
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
65 * purple_util_get_image_filename(). So it is the base16 encoded
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
66 * sha-1 hash plus an appropriate file extension. For example:
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
67 * "0f4972d17d1e70e751c43c90c948e72efbff9796.gif"
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
68 *
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
69 * The value is a PurpleStoredImage containing the icon data. These
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
70 * images are reference counted, and when the count reaches 0
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
71 * imgstore.c emits the image-deleting signal and we remove the image
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
72 * from the hash table (but it might still be saved on disk, if the
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
73 * icon is being used by offline accounts or some such).
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
74 */
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
75 static GHashTable *icon_data_cache = NULL;
22769
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
76
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
77 /**
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
78 * This hash table contains reference counts for how many times each
22769
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
79 * icon in the ~/.purple/icons/ directory is being used. It's pretty
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
80 * crazy. It maintains the reference count across sessions, too, so
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
81 * if you exit Pidgin then this hash table is reconstructed the next
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
82 * time Pidgin starts.
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
83 *
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
84 * Key is the filename for this image as constructed by
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
85 * purple_util_get_image_filename(). So it is the base16 encoded
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
86 * sha-1 hash plus an appropriate file extension. For example:
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
87 * "0f4972d17d1e70e751c43c90c948e72efbff9796.gif"
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
88 *
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
89 * The value is a GINT_TO_POINTER count of the number of times this
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
90 * icon is used. So if four of your buddies are using an icon, and
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
91 * you have the icon set for two of your accounts, then this number
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
92 * will be six. When this reference count reaches 0 the icon will
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
93 * be deleted from disk.
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
94 */
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
95 static GHashTable *icon_file_cache = NULL;
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
96
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
97 /**
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
98 * This hash table is used for both custom buddy icons on PurpleBlistNodes and
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
99 * account icons.
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
100 */
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
101 static GHashTable *pointer_icon_cache = NULL;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
102
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
103 static char *cache_dir = NULL;
22769
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
104
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
105 /** "Should icons be cached to disk?" */
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
106 static gboolean icon_caching = TRUE;
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
107
22769
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
108 static void delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name);
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
109
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
110 /*
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
111 * Begin functions for dealing with the on-disk icon cache
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
112 */
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
113
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
114 static void
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
115 ref_filename(const char *filename)
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
116 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
117 int refs;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
118
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
119 g_return_if_fail(filename != NULL);
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
120
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
121 refs = GPOINTER_TO_INT(g_hash_table_lookup(icon_file_cache, filename));
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
122
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
123 g_hash_table_insert(icon_file_cache, g_strdup(filename),
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
124 GINT_TO_POINTER(refs + 1));
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
125 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
126
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
127 static void
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
128 unref_filename(const char *filename)
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
129 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
130 int refs;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
131
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
132 if (filename == NULL)
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
133 return;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
134
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
135 refs = GPOINTER_TO_INT(g_hash_table_lookup(icon_file_cache, filename));
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
136
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
137 if (refs == 1)
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
138 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
139 g_hash_table_remove(icon_file_cache, filename);
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
140 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
141 else
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
142 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
143 g_hash_table_insert(icon_file_cache, g_strdup(filename),
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
144 GINT_TO_POINTER(refs - 1));
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
145 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
146 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
147
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
148 static void
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
149 purple_buddy_icon_data_cache(PurpleStoredImage *img)
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
150 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
151 const char *dirname;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
152 char *path;
25888
d0fdd378a635 Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents: 25859
diff changeset
153
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
154 g_return_if_fail(img != NULL);
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
155
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
156 if (!purple_buddy_icons_is_caching())
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
157 return;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
158
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
159 dirname = purple_buddy_icons_get_cache_dir();
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
160 path = g_build_filename(dirname, purple_imgstore_get_filename(img), NULL);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
161
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
162 if (!g_file_test(dirname, G_FILE_TEST_IS_DIR))
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
163 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
164 purple_debug_info("buddyicon", "Creating icon cache directory.\n");
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
165
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
166 if (g_mkdir(dirname, S_IRUSR | S_IWUSR | S_IXUSR) < 0)
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
167 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
168 purple_debug_error("buddyicon",
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
169 "Unable to create directory %s: %s\n",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20242
diff changeset
170 dirname, g_strerror(errno));
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
171 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
172 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
173
22551
a860a56287cd Just write out the buddy icon file; there's no need to check to see if it exists. This is for the cache, and if the blist.xml gets out of sync with the cache on disk (for example, because the user moves the blist.xml file out of the way), the existing code will never update the cached icon again.
Evan Schoenberg <evands@pidgin.im>
parents: 22547
diff changeset
174 purple_util_write_data_to_file_absolute(path, purple_imgstore_get_data(img),
25888
d0fdd378a635 Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents: 25859
diff changeset
175 purple_imgstore_get_size(img));
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
176 g_free(path);
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
177 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
178
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
179 static void
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
180 purple_buddy_icon_data_uncache_file(const char *filename)
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
181 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
182 const char *dirname;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
183 char *path;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
184
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
185 g_return_if_fail(filename != NULL);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
186
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
187 /* It's possible that there are other references to this icon
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
188 * cache file that are not currently loaded into memory. */
16438
64e892ac6180 Bug fixes! From my preliminary testing, the standard buddy icon stuff is working.
Richard Laager <rlaager@pidgin.im>
parents: 16437
diff changeset
189 if (GPOINTER_TO_INT(g_hash_table_lookup(icon_file_cache, filename)))
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
190 return;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
191
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
192 dirname = purple_buddy_icons_get_cache_dir();
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
193 path = g_build_filename(dirname, filename, NULL);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
194
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
195 if (g_file_test(path, G_FILE_TEST_EXISTS))
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
196 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
197 if (g_unlink(path))
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
198 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
199 purple_debug_error("buddyicon", "Failed to delete %s: %s\n",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 20242
diff changeset
200 path, g_strerror(errno));
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
201 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
202 else
16438
64e892ac6180 Bug fixes! From my preliminary testing, the standard buddy icon stuff is working.
Richard Laager <rlaager@pidgin.im>
parents: 16437
diff changeset
203 {
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
204 purple_debug_info("buddyicon", "Deleted cache file: %s\n", path);
16438
64e892ac6180 Bug fixes! From my preliminary testing, the standard buddy icon stuff is working.
Richard Laager <rlaager@pidgin.im>
parents: 16437
diff changeset
205 }
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
206 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
207
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
208 g_free(path);
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
209 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
210
22769
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
211 /*
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
212 * End functions for dealing with the on-disk icon cache
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
213 */
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
214
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
215 /*
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
216 * Begin functions for dealing with the in-memory icon cache
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
217 */
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
218
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
219 static gboolean
16531
98363f6cdc6c Fix the memory leaking and improper calls to ref_filename(). Also, remove some debugging code.
Richard Laager <rlaager@pidgin.im>
parents: 16446
diff changeset
220 value_equals(gpointer key, gpointer value, gpointer user_data)
98363f6cdc6c Fix the memory leaking and improper calls to ref_filename(). Also, remove some debugging code.
Richard Laager <rlaager@pidgin.im>
parents: 16446
diff changeset
221 {
98363f6cdc6c Fix the memory leaking and improper calls to ref_filename(). Also, remove some debugging code.
Richard Laager <rlaager@pidgin.im>
parents: 16446
diff changeset
222 return (value == user_data);
98363f6cdc6c Fix the memory leaking and improper calls to ref_filename(). Also, remove some debugging code.
Richard Laager <rlaager@pidgin.im>
parents: 16446
diff changeset
223 }
98363f6cdc6c Fix the memory leaking and improper calls to ref_filename(). Also, remove some debugging code.
Richard Laager <rlaager@pidgin.im>
parents: 16446
diff changeset
224
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
225 static void
16740
c95b1a276ea1 Document the image-deleting signal.
Richard Laager <rlaager@pidgin.im>
parents: 16727
diff changeset
226 image_deleting_cb(const PurpleStoredImage *img, gpointer data)
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
227 {
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
228 const char *filename = purple_imgstore_get_filename(img);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
229
16679
59e879c13ee8 Fix a crash when removing a per-account icon. Here's my explanation:
Richard Laager <rlaager@pidgin.im>
parents: 16678
diff changeset
230 /* If there's no filename, it can't be one of our images. */
59e879c13ee8 Fix a crash when removing a per-account icon. Here's my explanation:
Richard Laager <rlaager@pidgin.im>
parents: 16678
diff changeset
231 if (filename == NULL)
59e879c13ee8 Fix a crash when removing a per-account icon. Here's my explanation:
Richard Laager <rlaager@pidgin.im>
parents: 16678
diff changeset
232 return;
59e879c13ee8 Fix a crash when removing a per-account icon. Here's my explanation:
Richard Laager <rlaager@pidgin.im>
parents: 16678
diff changeset
233
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
234 if (img == g_hash_table_lookup(icon_data_cache, filename))
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
235 {
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
236 purple_buddy_icon_data_uncache_file(filename);
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
237 g_hash_table_remove(icon_data_cache, filename);
16531
98363f6cdc6c Fix the memory leaking and improper calls to ref_filename(). Also, remove some debugging code.
Richard Laager <rlaager@pidgin.im>
parents: 16446
diff changeset
238
98363f6cdc6c Fix the memory leaking and improper calls to ref_filename(). Also, remove some debugging code.
Richard Laager <rlaager@pidgin.im>
parents: 16446
diff changeset
239 /* We could make this O(1) by using another hash table, but
98363f6cdc6c Fix the memory leaking and improper calls to ref_filename(). Also, remove some debugging code.
Richard Laager <rlaager@pidgin.im>
parents: 16446
diff changeset
240 * this is probably good enough. */
16775
8627d2560d40 Get rid of two harmless warnings:
Mark Doliner <markdoliner@pidgin.im>
parents: 16740
diff changeset
241 g_hash_table_foreach_remove(pointer_icon_cache, value_equals, (gpointer)img);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
242 }
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
243 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
244
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
245 static PurpleStoredImage *
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
246 purple_buddy_icon_data_new(guchar *icon_data, size_t icon_len)
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
247 {
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
248 char *file;
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
249 PurpleStoredImage *img;
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
250
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
251 g_return_val_if_fail(icon_data != NULL, NULL);
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
252 g_return_val_if_fail(icon_len > 0, NULL);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
253
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
254 file = purple_util_get_image_filename(icon_data, icon_len);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
255
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
256 img = g_hash_table_lookup(icon_data_cache, file);
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
257 if (img) {
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
258 g_free(file);
16539
75a20ae3a527 Change the imgstore and by extension, then the buddy icon code to take over
Richard Laager <rlaager@pidgin.im>
parents: 16538
diff changeset
259 g_free(icon_data);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
260 return purple_imgstore_ref(img);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
261 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
262
33661
2ebcb105e606 Rename two functions.
Mark Doliner <mark@kingant.net>
parents: 32305
diff changeset
263 img = purple_imgstore_new(icon_data, icon_len, file);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
264
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
265 /* This will take ownership of file and free it as needed */
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
266 g_hash_table_insert(icon_data_cache, file, img);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
267
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
268 purple_buddy_icon_data_cache(img);
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
269
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
270 return img;
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
271 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
272
22769
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
273 /*
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
274 * End functions for dealing with the in-memory icon cache
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
275 */
fa73d52f4f67 Documentation changes
Mark Doliner <markdoliner@pidgin.im>
parents: 22763
diff changeset
276
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
277 static PurpleBuddyIcon *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
278 purple_buddy_icon_create(PurpleAccount *account, const char *username)
9396
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
279 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
280 PurpleBuddyIcon *icon;
9396
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
281 GHashTable *icon_cache;
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
282
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
283 /* This does not zero. See purple_buddy_icon_new() for
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
284 * information on which function allocates which member. */
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
285 icon = g_slice_new(PurpleBuddyIcon);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
286 PURPLE_DBUS_REGISTER_POINTER(icon, PurpleBuddyIcon);
9396
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
287
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
288 icon->account = account;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
289 icon->username = g_strdup(username);
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
290 icon->checksum = NULL;
16924
a061b2ff4cf7 Fix a reference counting bug.
Richard Laager <rlaager@pidgin.im>
parents: 16903
diff changeset
291 icon->ref_count = 1;
9396
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
292
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
293 icon_cache = g_hash_table_lookup(account_cache, account);
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
294
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
295 if (icon_cache == NULL)
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
296 {
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
297 icon_cache = g_hash_table_new(g_str_hash, g_str_equal);
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
298
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
299 g_hash_table_insert(account_cache, account, icon_cache);
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
300 }
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
301
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
302 g_hash_table_insert(icon_cache,
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
303 (char *)purple_buddy_icon_get_username(icon), icon);
9396
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
304 return icon;
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
305 }
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
306
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
307 PurpleBuddyIcon *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
308 purple_buddy_icon_new(PurpleAccount *account, const char *username,
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
309 void *icon_data, size_t icon_len,
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
310 const char *checksum)
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
311 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
312 PurpleBuddyIcon *icon;
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
313
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
314 g_return_val_if_fail(account != NULL, NULL);
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
315 g_return_val_if_fail(username != NULL, NULL);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
316 g_return_val_if_fail(icon_data != NULL, NULL);
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
317 g_return_val_if_fail(icon_len > 0, NULL);
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
318
16438
64e892ac6180 Bug fixes! From my preliminary testing, the standard buddy icon stuff is working.
Richard Laager <rlaager@pidgin.im>
parents: 16437
diff changeset
319 /* purple_buddy_icons_find() does allocation, so be
64e892ac6180 Bug fixes! From my preliminary testing, the standard buddy icon stuff is working.
Richard Laager <rlaager@pidgin.im>
parents: 16437
diff changeset
320 * sure to update it as well when members are added. */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
321 icon = purple_buddy_icons_find(account, username);
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
322
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
323 /* purple_buddy_icon_create() sets account & username */
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
324 if (icon == NULL)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
325 icon = purple_buddy_icon_create(account, username);
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
326
16438
64e892ac6180 Bug fixes! From my preliminary testing, the standard buddy icon stuff is working.
Richard Laager <rlaager@pidgin.im>
parents: 16437
diff changeset
327 /* purple_buddy_icon_set_data() sets img, but it
64e892ac6180 Bug fixes! From my preliminary testing, the standard buddy icon stuff is working.
Richard Laager <rlaager@pidgin.im>
parents: 16437
diff changeset
328 * references img first, so we need to initialize it */
64e892ac6180 Bug fixes! From my preliminary testing, the standard buddy icon stuff is working.
Richard Laager <rlaager@pidgin.im>
parents: 16437
diff changeset
329 icon->img = NULL;
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
330 purple_buddy_icon_set_data(icon, icon_data, icon_len, checksum);
11423
45f4ca09d1d6 [gaim-migrate @ 13660]
Richard Laager <rlaager@pidgin.im>
parents: 11338
diff changeset
331
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
332 return icon;
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
333 }
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
334
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
335 PurpleBuddyIcon *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
336 purple_buddy_icon_ref(PurpleBuddyIcon *icon)
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
337 {
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
338 g_return_val_if_fail(icon != NULL, NULL);
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
339
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
340 icon->ref_count++;
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
341
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
342 return icon;
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
343 }
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
344
33665
55fcd8716546 Change purple_buddy_icon_unref to not return anything.
Mark Doliner <mark@kingant.net>
parents: 33664
diff changeset
345 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
346 purple_buddy_icon_unref(PurpleBuddyIcon *icon)
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
347 {
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
348 if (icon == NULL)
33665
55fcd8716546 Change purple_buddy_icon_unref to not return anything.
Mark Doliner <mark@kingant.net>
parents: 33664
diff changeset
349 return;
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
350
33665
55fcd8716546 Change purple_buddy_icon_unref to not return anything.
Mark Doliner <mark@kingant.net>
parents: 33664
diff changeset
351 g_return_if_fail(icon->ref_count > 0);
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
352
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
353 icon->ref_count--;
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
354
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
355 if (icon->ref_count == 0)
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
356 {
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
357 GHashTable *icon_cache = g_hash_table_lookup(account_cache, purple_buddy_icon_get_account(icon));
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
358
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
359 if (icon_cache != NULL)
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
360 g_hash_table_remove(icon_cache, purple_buddy_icon_get_username(icon));
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
361
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
362 g_free(icon->username);
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
363 g_free(icon->checksum);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
364 purple_imgstore_unref(icon->img);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
365
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
366 PURPLE_DBUS_UNREGISTER_POINTER(icon);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
367 g_slice_free(PurpleBuddyIcon, icon);
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
368 }
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
369 }
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
370
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
371 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
372 purple_buddy_icon_update(PurpleBuddyIcon *icon)
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
373 {
34645
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
374 PurpleIMConversation *im;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
375 PurpleAccount *account;
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
376 const char *username;
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
377 PurpleBuddyIcon *icon_to_set;
16863
b98303c15033 Change a few functions to free a linked list while iterating through
Mark Doliner <markdoliner@pidgin.im>
parents: 16775
diff changeset
378 GSList *buddies;
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
379
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
380 g_return_if_fail(icon != NULL);
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
381
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
382 account = purple_buddy_icon_get_account(icon);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
383 username = purple_buddy_icon_get_username(icon);
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
384
16875
e1c6d9541cb9 Protect icon with ref/unref guards since it may be freed over the course of the while() loop. I thought this would fix #398, but something else is wrong, too.
Evan Schoenberg <evands@pidgin.im>
parents: 16874
diff changeset
385 /* If no data exists (icon->img == NULL), then call the functions below
e1c6d9541cb9 Protect icon with ref/unref guards since it may be freed over the course of the while() loop. I thought this would fix #398, but something else is wrong, too.
Evan Schoenberg <evands@pidgin.im>
parents: 16874
diff changeset
386 * with NULL to unset the icon. They will then unref the icon and it should
e1c6d9541cb9 Protect icon with ref/unref guards since it may be freed over the course of the while() loop. I thought this would fix #398, but something else is wrong, too.
Evan Schoenberg <evands@pidgin.im>
parents: 16874
diff changeset
387 * be destroyed. The only way it wouldn't be destroyed is if someone
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
388 * else is holding a reference to it, in which case they can kill
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
389 * the icon when they realize it has no data. */
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
390 icon_to_set = icon->img ? icon : NULL;
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
391
16875
e1c6d9541cb9 Protect icon with ref/unref guards since it may be freed over the course of the while() loop. I thought this would fix #398, but something else is wrong, too.
Evan Schoenberg <evands@pidgin.im>
parents: 16874
diff changeset
392 /* Ensure that icon remains valid throughout */
33769
96f89e35d24d Fix various "Dereference before null check" issues
Daniel Atallah <datallah@pidgin.im>
parents: 29296
diff changeset
393 purple_buddy_icon_ref(icon);
16875
e1c6d9541cb9 Protect icon with ref/unref guards since it may be freed over the course of the while() loop. I thought this would fix #398, but something else is wrong, too.
Evan Schoenberg <evands@pidgin.im>
parents: 16874
diff changeset
394
16863
b98303c15033 Change a few functions to free a linked list while iterating through
Mark Doliner <markdoliner@pidgin.im>
parents: 16775
diff changeset
395 buddies = purple_find_buddies(account, username);
b98303c15033 Change a few functions to free a linked list while iterating through
Mark Doliner <markdoliner@pidgin.im>
parents: 16775
diff changeset
396 while (buddies != NULL)
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
397 {
16863
b98303c15033 Change a few functions to free a linked list while iterating through
Mark Doliner <markdoliner@pidgin.im>
parents: 16775
diff changeset
398 PurpleBuddy *buddy = (PurpleBuddy *)buddies->data;
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
399 char *old_icon;
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
400
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
401 purple_buddy_set_icon(buddy, icon_to_set);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
402 old_icon = g_strdup(purple_blist_node_get_string((PurpleBlistNode *)buddy,
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
403 "buddy_icon"));
16440
d4e3c52ce58b If we're not caching icons, then don't save the filename.
Richard Laager <rlaager@pidgin.im>
parents: 16439
diff changeset
404 if (icon->img && purple_buddy_icons_is_caching())
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
405 {
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
406 const char *filename = purple_imgstore_get_filename(icon->img);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
407 purple_blist_node_set_string((PurpleBlistNode *)buddy,
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
408 "buddy_icon",
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
409 filename);
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
410
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
411 if (icon->checksum && *icon->checksum)
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
412 {
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
413 purple_blist_node_set_string((PurpleBlistNode *)buddy,
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
414 "icon_checksum",
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
415 icon->checksum);
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
416 }
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
417 else
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
418 {
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
419 purple_blist_node_remove_setting((PurpleBlistNode *)buddy,
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
420 "icon_checksum");
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
421 }
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
422 ref_filename(filename);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
423 }
17033
27d9faa34ad1 Patch from ticket #819 from vampire
Richard Laager <rlaager@pidgin.im>
parents: 16924
diff changeset
424 else if (!icon->img)
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
425 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
426 purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon");
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
427 purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum");
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
428 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
429 unref_filename(old_icon);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
430 g_free(old_icon);
16863
b98303c15033 Change a few functions to free a linked list while iterating through
Mark Doliner <markdoliner@pidgin.im>
parents: 16775
diff changeset
431
b98303c15033 Change a few functions to free a linked list while iterating through
Mark Doliner <markdoliner@pidgin.im>
parents: 16775
diff changeset
432 buddies = g_slist_delete_link(buddies, buddies);
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
433 }
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
434
34645
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
435 im = purple_conversations_find_im_with_account(username, account);
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
436
34645
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
437 if (im != NULL)
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
438 purple_im_conversation_set_icon(im, icon_to_set);
25888
d0fdd378a635 Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents: 25859
diff changeset
439
16875
e1c6d9541cb9 Protect icon with ref/unref guards since it may be freed over the course of the while() loop. I thought this would fix #398, but something else is wrong, too.
Evan Schoenberg <evands@pidgin.im>
parents: 16874
diff changeset
440 /* icon's refcount was incremented above */
33788
83e5594ced88 Fix a few bogus NULL checks
Daniel Atallah <datallah@pidgin.im>
parents: 33769
diff changeset
441 purple_buddy_icon_unref(icon);
11040
37e247d18e78 [gaim-migrate @ 12940]
Richard Laager <rlaager@pidgin.im>
parents: 11033
diff changeset
442 }
37e247d18e78 [gaim-migrate @ 12940]
Richard Laager <rlaager@pidgin.im>
parents: 11033
diff changeset
443
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
444 void
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
445 purple_buddy_icon_set_data(PurpleBuddyIcon *icon, guchar *data,
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
446 size_t len, const char *checksum)
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
447 {
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
448 PurpleStoredImage *old_img;
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
449
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
450 g_return_if_fail(icon != NULL);
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
451
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
452 old_img = icon->img;
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
453 icon->img = NULL;
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
454
16539
75a20ae3a527 Change the imgstore and by extension, then the buddy icon code to take over
Richard Laager <rlaager@pidgin.im>
parents: 16538
diff changeset
455 if (data != NULL)
16544
945caa0d6436 Kill some compiler warnings and TODOs of mine.
Richard Laager <rlaager@pidgin.im>
parents: 16539
diff changeset
456 {
16539
75a20ae3a527 Change the imgstore and by extension, then the buddy icon code to take over
Richard Laager <rlaager@pidgin.im>
parents: 16538
diff changeset
457 if (len > 0)
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
458 icon->img = purple_buddy_icon_data_new(data, len);
16539
75a20ae3a527 Change the imgstore and by extension, then the buddy icon code to take over
Richard Laager <rlaager@pidgin.im>
parents: 16538
diff changeset
459 else
75a20ae3a527 Change the imgstore and by extension, then the buddy icon code to take over
Richard Laager <rlaager@pidgin.im>
parents: 16538
diff changeset
460 g_free(data);
16544
945caa0d6436 Kill some compiler warnings and TODOs of mine.
Richard Laager <rlaager@pidgin.im>
parents: 16539
diff changeset
461 }
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
462
16874
cd539323cabe Remove two warnings, one compile-time, one runtime. Plug two leaks, both runtime.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16863
diff changeset
463 g_free(icon->checksum);
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
464 icon->checksum = g_strdup(checksum);
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
465
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
466 purple_buddy_icon_update(icon);
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
467
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
468 purple_imgstore_unref(old_img);
15132
672c39839af1 [gaim-migrate @ 17854]
Mark Huetsch <markhuetsch@users.sourceforge.net>
parents: 15117
diff changeset
469 }
672c39839af1 [gaim-migrate @ 17854]
Mark Huetsch <markhuetsch@users.sourceforge.net>
parents: 15117
diff changeset
470
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
471 PurpleAccount *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
472 purple_buddy_icon_get_account(const PurpleBuddyIcon *icon)
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
473 {
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
474 g_return_val_if_fail(icon != NULL, NULL);
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
475
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
476 return icon->account;
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
477 }
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
478
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
479 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
480 purple_buddy_icon_get_username(const PurpleBuddyIcon *icon)
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
481 {
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
482 g_return_val_if_fail(icon != NULL, NULL);
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
483
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
484 return icon->username;
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
485 }
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
486
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
487 const char *
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
488 purple_buddy_icon_get_checksum(const PurpleBuddyIcon *icon)
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
489 {
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
490 g_return_val_if_fail(icon != NULL, NULL);
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
491
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
492 return icon->checksum;
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
493 }
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
494
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
495 gconstpointer
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
496 purple_buddy_icon_get_data(const PurpleBuddyIcon *icon, size_t *len)
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
497 {
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
498 g_return_val_if_fail(icon != NULL, NULL);
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
499
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
500 if (icon->img)
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
501 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
502 if (len != NULL)
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
503 *len = purple_imgstore_get_size(icon->img);
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
504
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
505 return purple_imgstore_get_data(icon->img);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
506 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
507
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
508 return NULL;
15132
672c39839af1 [gaim-migrate @ 17854]
Mark Huetsch <markhuetsch@users.sourceforge.net>
parents: 15117
diff changeset
509 }
672c39839af1 [gaim-migrate @ 17854]
Mark Huetsch <markhuetsch@users.sourceforge.net>
parents: 15117
diff changeset
510
672c39839af1 [gaim-migrate @ 17854]
Mark Huetsch <markhuetsch@users.sourceforge.net>
parents: 15117
diff changeset
511 const char *
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
512 purple_buddy_icon_get_extension(const PurpleBuddyIcon *icon)
10953
e5987ea70985 [gaim-migrate @ 12753]
Richard Laager <rlaager@pidgin.im>
parents: 10934
diff changeset
513 {
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
514 if (icon->img != NULL)
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
515 return purple_imgstore_get_extension(icon->img);
10953
e5987ea70985 [gaim-migrate @ 12753]
Richard Laager <rlaager@pidgin.im>
parents: 10934
diff changeset
516
e5987ea70985 [gaim-migrate @ 12753]
Richard Laager <rlaager@pidgin.im>
parents: 10934
diff changeset
517 return NULL;
e5987ea70985 [gaim-migrate @ 12753]
Richard Laager <rlaager@pidgin.im>
parents: 10934
diff changeset
518 }
e5987ea70985 [gaim-migrate @ 12753]
Richard Laager <rlaager@pidgin.im>
parents: 10934
diff changeset
519
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
520 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
521 purple_buddy_icons_set_for_user(PurpleAccount *account, const char *username,
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
522 void *icon_data, size_t icon_len,
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
523 const char *checksum)
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
524 {
16900
e9f12eb06c5b Rework purple_buddy_icons_find() to return a reference for the caller, which
Richard Laager <rlaager@pidgin.im>
parents: 16863
diff changeset
525 GHashTable *icon_cache;
e9f12eb06c5b Rework purple_buddy_icons_find() to return a reference for the caller, which
Richard Laager <rlaager@pidgin.im>
parents: 16863
diff changeset
526 PurpleBuddyIcon *icon = NULL;
16537
763d885ff7a2 I'm stupid. If an icon doesn't exist, it's a good idea to create it when we want to fill it with data, not when we don't.
Richard Laager <rlaager@pidgin.im>
parents: 16534
diff changeset
527
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
528 g_return_if_fail(account != NULL);
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
529 g_return_if_fail(username != NULL);
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
530
16900
e9f12eb06c5b Rework purple_buddy_icons_find() to return a reference for the caller, which
Richard Laager <rlaager@pidgin.im>
parents: 16863
diff changeset
531 icon_cache = g_hash_table_lookup(account_cache, account);
e9f12eb06c5b Rework purple_buddy_icons_find() to return a reference for the caller, which
Richard Laager <rlaager@pidgin.im>
parents: 16863
diff changeset
532
e9f12eb06c5b Rework purple_buddy_icons_find() to return a reference for the caller, which
Richard Laager <rlaager@pidgin.im>
parents: 16863
diff changeset
533 if (icon_cache != NULL)
e9f12eb06c5b Rework purple_buddy_icons_find() to return a reference for the caller, which
Richard Laager <rlaager@pidgin.im>
parents: 16863
diff changeset
534 icon = g_hash_table_lookup(icon_cache, username);
9305
63a1b462a208 [gaim-migrate @ 10113]
Christian Hammond <chipx86@chipx86.com>
parents: 9285
diff changeset
535
16537
763d885ff7a2 I'm stupid. If an icon doesn't exist, it's a good idea to create it when we want to fill it with data, not when we don't.
Richard Laager <rlaager@pidgin.im>
parents: 16534
diff changeset
536 if (icon != NULL)
763d885ff7a2 I'm stupid. If an icon doesn't exist, it's a good idea to create it when we want to fill it with data, not when we don't.
Richard Laager <rlaager@pidgin.im>
parents: 16534
diff changeset
537 purple_buddy_icon_set_data(icon, icon_data, icon_len, checksum);
16874
cd539323cabe Remove two warnings, one compile-time, one runtime. Plug two leaks, both runtime.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16863
diff changeset
538 else if (icon_data && icon_len > 0)
9305
63a1b462a208 [gaim-migrate @ 10113]
Christian Hammond <chipx86@chipx86.com>
parents: 9285
diff changeset
539 {
20242
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
540 PurpleBuddyIcon *icon = purple_buddy_icon_new(account, username, icon_data, icon_len, checksum);
16900
e9f12eb06c5b Rework purple_buddy_icons_find() to return a reference for the caller, which
Richard Laager <rlaager@pidgin.im>
parents: 16863
diff changeset
541
20242
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
542 /* purple_buddy_icon_new() calls
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
543 * purple_buddy_icon_set_data(), which calls
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
544 * purple_buddy_icon_update(), which has the buddy list
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
545 * and conversations take references as appropriate.
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
546 * This function doesn't return icon, so we can't
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
547 * leave a reference dangling. */
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
548 purple_buddy_icon_unref(icon);
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
549 }
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
550 else
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
551 {
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
552 /* If the buddy list or a conversation was holding a
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
553 * reference, we'd have found the icon in the cache.
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
554 * Since we know we're deleting the icon, we only
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
555 * need a subset of purple_buddy_icon_update(). */
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
556
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
557 GSList *buddies = purple_find_buddies(account, username);
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
558 while (buddies != NULL)
16900
e9f12eb06c5b Rework purple_buddy_icons_find() to return a reference for the caller, which
Richard Laager <rlaager@pidgin.im>
parents: 16863
diff changeset
559 {
20242
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
560 PurpleBuddy *buddy = (PurpleBuddy *)buddies->data;
16900
e9f12eb06c5b Rework purple_buddy_icons_find() to return a reference for the caller, which
Richard Laager <rlaager@pidgin.im>
parents: 16863
diff changeset
561
20242
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
562 unref_filename(purple_blist_node_get_string((PurpleBlistNode *)buddy, "buddy_icon"));
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
563 purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "buddy_icon");
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
564 purple_blist_node_remove_setting((PurpleBlistNode *)buddy, "icon_checksum");
16900
e9f12eb06c5b Rework purple_buddy_icons_find() to return a reference for the caller, which
Richard Laager <rlaager@pidgin.im>
parents: 16863
diff changeset
565
20242
a1310a256a1a applied changes from 3ae1e4b3dac8092886b4b8ab961d8d505433b4c4
Luke Schierer <lschiere@pidgin.im>
parents: 20147
diff changeset
566 buddies = g_slist_delete_link(buddies, buddies);
16900
e9f12eb06c5b Rework purple_buddy_icons_find() to return a reference for the caller, which
Richard Laager <rlaager@pidgin.im>
parents: 16863
diff changeset
567 }
9305
63a1b462a208 [gaim-migrate @ 10113]
Christian Hammond <chipx86@chipx86.com>
parents: 9285
diff changeset
568 }
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
569 }
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
570
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
571 char *purple_buddy_icon_get_full_path(PurpleBuddyIcon *icon)
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
572 {
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
573 char *path;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
574
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
575 g_return_val_if_fail(icon != NULL, NULL);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
576
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
577 if (icon->img == NULL)
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
578 return NULL;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
579
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
580 path = g_build_filename(purple_buddy_icons_get_cache_dir(),
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
581 purple_imgstore_get_filename(icon->img), NULL);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
582 if (!g_file_test(path, G_FILE_TEST_EXISTS))
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
583 {
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
584 g_free(path);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
585 return NULL;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
586 }
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
587 return path;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
588 }
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
589
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
590 const char *
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
591 purple_buddy_icons_get_checksum_for_user(PurpleBuddy *buddy)
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
592 {
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
593 return purple_blist_node_get_string((PurpleBlistNode*)buddy,
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
594 "icon_checksum");
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
595 }
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
596
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
597 static gboolean
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
598 read_icon_file(const char *path, guchar **data, size_t *len)
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
599 {
16532
070f046b1316 Switch to using g_file_get_contents() instead of our own code.
Richard Laager <rlaager@pidgin.im>
parents: 16531
diff changeset
600 GError *err = NULL;
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
601
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
602 if (!g_file_get_contents(path, (gchar **)data, len, &err))
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
603 {
16532
070f046b1316 Switch to using g_file_get_contents() instead of our own code.
Richard Laager <rlaager@pidgin.im>
parents: 16531
diff changeset
604 purple_debug_error("buddyicon", "Error reading %s: %s\n",
070f046b1316 Switch to using g_file_get_contents() instead of our own code.
Richard Laager <rlaager@pidgin.im>
parents: 16531
diff changeset
605 path, err->message);
070f046b1316 Switch to using g_file_get_contents() instead of our own code.
Richard Laager <rlaager@pidgin.im>
parents: 16531
diff changeset
606 g_error_free(err);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
607
16532
070f046b1316 Switch to using g_file_get_contents() instead of our own code.
Richard Laager <rlaager@pidgin.im>
parents: 16531
diff changeset
608 return FALSE;
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
609 }
16532
070f046b1316 Switch to using g_file_get_contents() instead of our own code.
Richard Laager <rlaager@pidgin.im>
parents: 16531
diff changeset
610
070f046b1316 Switch to using g_file_get_contents() instead of our own code.
Richard Laager <rlaager@pidgin.im>
parents: 16531
diff changeset
611 return TRUE;
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
612 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
613
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
614 PurpleBuddyIcon *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
615 purple_buddy_icons_find(PurpleAccount *account, const char *username)
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
616 {
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
617 GHashTable *icon_cache;
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
618 PurpleBuddyIcon *icon = NULL;
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
619
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
620 g_return_val_if_fail(account != NULL, NULL);
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
621 g_return_val_if_fail(username != NULL, NULL);
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
622
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
623 icon_cache = g_hash_table_lookup(account_cache, account);
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
624
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
625 if ((icon_cache == NULL) || ((icon = g_hash_table_lookup(icon_cache, username)) == NULL))
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
626 {
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
627 /* The icon is not currently cached in memory--try reading from disk */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
628 PurpleBuddy *b = purple_find_buddy(account, username);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
629 const char *protocol_icon_file;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
630 const char *dirname;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
631 gboolean caching;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
632 guchar *data;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
633 size_t len;
9396
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
634
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
635 if (!b)
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
636 return NULL;
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
637
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
638 protocol_icon_file = purple_blist_node_get_string((PurpleBlistNode*)b, "buddy_icon");
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
639
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
640 if (protocol_icon_file == NULL)
9396
b559fae057ee [gaim-migrate @ 10208]
Tim Ringenbach <marv@pidgin.im>
parents: 9327
diff changeset
641 return NULL;
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
642
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
643 dirname = purple_buddy_icons_get_cache_dir();
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
644
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
645 caching = purple_buddy_icons_is_caching();
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
646 /* By disabling caching temporarily, we avoid a loop
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
647 * and don't have to add special code through several
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
648 * functions. */
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
649 purple_buddy_icons_set_caching(FALSE);
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
650
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
651 if (protocol_icon_file != NULL)
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
652 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
653 char *path = g_build_filename(dirname, protocol_icon_file, NULL);
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
654 if (read_icon_file(path, &data, &len))
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
655 {
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
656 const char *checksum;
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
657
16874
cd539323cabe Remove two warnings, one compile-time, one runtime. Plug two leaks, both runtime.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16863
diff changeset
658 icon = purple_buddy_icon_create(account, username);
16438
64e892ac6180 Bug fixes! From my preliminary testing, the standard buddy icon stuff is working.
Richard Laager <rlaager@pidgin.im>
parents: 16437
diff changeset
659 icon->img = NULL;
16874
cd539323cabe Remove two warnings, one compile-time, one runtime. Plug two leaks, both runtime.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16863
diff changeset
660 checksum = purple_blist_node_get_string((PurpleBlistNode*)b, "icon_checksum");
16534
2ab9e23f99d9 Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@pidgin.im>
parents: 16533
diff changeset
661 purple_buddy_icon_set_data(icon, data, len, checksum);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
662 }
22148
66b0ed947da5 If the cached buddy icon can't be loaded, delete the preferences which point to it. Among other things, this fixes OSCAR buddy icon retrieval when the cache has been removed - since previously the icon hash was kept around and was used to determine that (so far as the prpl could tell) no icon retrieval was needed, libpurple would never have an icon for the contact.
Evan Schoenberg <evands@pidgin.im>
parents: 22120
diff changeset
663 else
66b0ed947da5 If the cached buddy icon can't be loaded, delete the preferences which point to it. Among other things, this fixes OSCAR buddy icon retrieval when the cache has been removed - since previously the icon hash was kept around and was used to determine that (so far as the prpl could tell) no icon retrieval was needed, libpurple would never have an icon for the contact.
Evan Schoenberg <evands@pidgin.im>
parents: 22120
diff changeset
664 delete_buddy_icon_settings((PurpleBlistNode*)b, "buddy_icon");
22154
b7ab5a12d97a Remove spurious braces
Evan Schoenberg <evands@pidgin.im>
parents: 22150
diff changeset
665
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
666 g_free(path);
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
667 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
668
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
669 purple_buddy_icons_set_caching(caching);
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
670 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
671
22161
be6ccc274119 Apparently "nil" is an Objective-C thing
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 22158
diff changeset
672 return (icon ? purple_buddy_icon_ref(icon) : NULL);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
673 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
674
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
675 PurpleStoredImage *
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
676 purple_buddy_icons_find_account_icon(PurpleAccount *account)
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
677 {
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
678 PurpleStoredImage *img;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
679 const char *account_icon_file;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
680 const char *dirname;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
681 char *path;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
682 guchar *data;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
683 size_t len;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
684
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
685 g_return_val_if_fail(account != NULL, NULL);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
686
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
687 if ((img = g_hash_table_lookup(pointer_icon_cache, account)))
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
688 {
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
689 return purple_imgstore_ref(img);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
690 }
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
691
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
692 account_icon_file = purple_account_get_string(account, "buddy_icon", NULL);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
693
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
694 if (account_icon_file == NULL)
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
695 return NULL;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
696
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
697 dirname = purple_buddy_icons_get_cache_dir();
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
698 path = g_build_filename(dirname, account_icon_file, NULL);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
699
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
700 if (read_icon_file(path, &data, &len))
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
701 {
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
702 g_free(path);
29234
1d444b1479d7 Fix a crash when setting a buddyicon.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27783
diff changeset
703 img = purple_buddy_icons_set_account_icon(account, data, len);
1d444b1479d7 Fix a crash when setting a buddyicon.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27783
diff changeset
704 return purple_imgstore_ref(img);
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
705 }
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
706 g_free(path);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
707
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
708 return NULL;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
709 }
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
710
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
711 PurpleStoredImage *
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
712 purple_buddy_icons_set_account_icon(PurpleAccount *account,
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
713 guchar *icon_data, size_t icon_len)
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
714 {
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
715 PurpleStoredImage *old_img;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
716 PurpleStoredImage *img = NULL;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
717 char *old_icon;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
718
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
719 if (icon_data != NULL && icon_len > 0) {
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
720 img = purple_buddy_icon_data_new(icon_data, icon_len);
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
721 }
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
722
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
723 old_icon = g_strdup(purple_account_get_string(account, "buddy_icon", NULL));
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
724 if (img && purple_buddy_icons_is_caching())
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
725 {
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
726 const char *filename = purple_imgstore_get_filename(img);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
727 purple_account_set_string(account, "buddy_icon", filename);
16677
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
728 purple_account_set_int(account, "buddy_icon_timestamp", time(NULL));
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
729 ref_filename(filename);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
730 }
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
731 else
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
732 {
16544
945caa0d6436 Kill some compiler warnings and TODOs of mine.
Richard Laager <rlaager@pidgin.im>
parents: 16539
diff changeset
733 purple_account_set_string(account, "buddy_icon", NULL);
16677
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
734 purple_account_set_int(account, "buddy_icon_timestamp", 0);
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
735 }
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
736 unref_filename(old_icon);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
737
25745
48b7ebd7fcc7 Fix the crash/leaks in statusbox
Paul Aurich <darkrain42@pidgin.im>
parents: 24569
diff changeset
738 old_img = g_hash_table_lookup(pointer_icon_cache, account);
48b7ebd7fcc7 Fix the crash/leaks in statusbox
Paul Aurich <darkrain42@pidgin.im>
parents: 24569
diff changeset
739
22547
342b81d25863 When purple_buddy_icons_set_account_icon() is called, it unrefs the old PurpleStoredImage and refs the new one. Previously, it notified the prpl of the change in the buddy icon before updating pointer_icon_cache, which meant that if the prpl then called purple_buddy_icons_find_account_icon() it would get the old PurpleStoredImage (which is at this point not only old but also a pointer to invalid memory if unref'ing it caused it to be destroyed). This happens in jabber_set_info() as of 2.4.0, causing a crash when setting no-buddy-icon for an account after it has previously had an icon. I think this also means that XMPP accounts in 2.4.0 will also always set serverside the *last* icon set, not the current one, when changing icons, but I didn't test that.
Evan Schoenberg <evands@pidgin.im>
parents: 22390
diff changeset
740 if (img)
342b81d25863 When purple_buddy_icons_set_account_icon() is called, it unrefs the old PurpleStoredImage and refs the new one. Previously, it notified the prpl of the change in the buddy icon before updating pointer_icon_cache, which meant that if the prpl then called purple_buddy_icons_find_account_icon() it would get the old PurpleStoredImage (which is at this point not only old but also a pointer to invalid memory if unref'ing it caused it to be destroyed). This happens in jabber_set_info() as of 2.4.0, causing a crash when setting no-buddy-icon for an account after it has previously had an icon. I think this also means that XMPP accounts in 2.4.0 will also always set serverside the *last* icon set, not the current one, when changing icons, but I didn't test that.
Evan Schoenberg <evands@pidgin.im>
parents: 22390
diff changeset
741 g_hash_table_insert(pointer_icon_cache, account, img);
342b81d25863 When purple_buddy_icons_set_account_icon() is called, it unrefs the old PurpleStoredImage and refs the new one. Previously, it notified the prpl of the change in the buddy icon before updating pointer_icon_cache, which meant that if the prpl then called purple_buddy_icons_find_account_icon() it would get the old PurpleStoredImage (which is at this point not only old but also a pointer to invalid memory if unref'ing it caused it to be destroyed). This happens in jabber_set_info() as of 2.4.0, causing a crash when setting no-buddy-icon for an account after it has previously had an icon. I think this also means that XMPP accounts in 2.4.0 will also always set serverside the *last* icon set, not the current one, when changing icons, but I didn't test that.
Evan Schoenberg <evands@pidgin.im>
parents: 22390
diff changeset
742 else
342b81d25863 When purple_buddy_icons_set_account_icon() is called, it unrefs the old PurpleStoredImage and refs the new one. Previously, it notified the prpl of the change in the buddy icon before updating pointer_icon_cache, which meant that if the prpl then called purple_buddy_icons_find_account_icon() it would get the old PurpleStoredImage (which is at this point not only old but also a pointer to invalid memory if unref'ing it caused it to be destroyed). This happens in jabber_set_info() as of 2.4.0, causing a crash when setting no-buddy-icon for an account after it has previously had an icon. I think this also means that XMPP accounts in 2.4.0 will also always set serverside the *last* icon set, not the current one, when changing icons, but I didn't test that.
Evan Schoenberg <evands@pidgin.im>
parents: 22390
diff changeset
743 g_hash_table_remove(pointer_icon_cache, account);
25888
d0fdd378a635 Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents: 25859
diff changeset
744
31690
64df30efd8be In purple_buddy_icons_set_account_icon, call the prpl's set_buddy_icon
Mark Doliner <markdoliner@pidgin.im>
parents: 31590
diff changeset
745 if (!purple_account_is_disconnected(account))
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
746 {
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
747 PurpleConnection *gc;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
748 PurplePluginProtocolInfo *prpl_info;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
749
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
750 gc = purple_account_get_connection(account);
22390
d22357d5c7ba Kill off gc->prpl in the core everywhere but connection.c (when the struct
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 22307
diff changeset
751 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
752
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
753 if (prpl_info && prpl_info->set_buddy_icon)
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
754 prpl_info->set_buddy_icon(gc, img);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
755 }
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
756
25745
48b7ebd7fcc7 Fix the crash/leaks in statusbox
Paul Aurich <darkrain42@pidgin.im>
parents: 24569
diff changeset
757 if (old_img)
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
758 purple_imgstore_unref(old_img);
16674
95bfc8f3775c Fix assertion when creating a new account.
Daniel Atallah <datallah@pidgin.im>
parents: 16657
diff changeset
759 else if (old_icon)
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
760 {
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
761 /* The old icon may not have been loaded into memory. In that
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
762 * case, we'll need to uncache the filename. The filenames
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
763 * are ref-counted, so this is safe. */
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
764 purple_buddy_icon_data_uncache_file(old_icon);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
765 }
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
766 g_free(old_icon);
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
767
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
768 return img;
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
769 }
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
770
16677
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
771 time_t
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
772 purple_buddy_icons_get_account_icon_timestamp(PurpleAccount *account)
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
773 {
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
774 time_t ret;
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
775
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
776 g_return_val_if_fail(account != NULL, 0);
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
777
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
778 ret = purple_account_get_int(account, "buddy_icon_timestamp", 0);
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
779
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
780 /* This deals with migration cases. */
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
781 if (ret == 0 && purple_account_get_string(account, "buddy_icon", NULL) != NULL)
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
782 {
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
783 ret = time(NULL);
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
784 purple_account_set_int(account, "buddy_icon_timestamp", ret);
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
785 }
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
786
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
787 return ret;
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
788 }
7cd57586cdbf The OSCAR timestamp stuff.
Richard Laager <rlaager@pidgin.im>
parents: 16669
diff changeset
789
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
790 gboolean
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
791 purple_buddy_icons_node_has_custom_icon(PurpleBlistNode *node)
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
792 {
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
793 g_return_val_if_fail(node != NULL, FALSE);
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
794
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
795 return (purple_blist_node_get_string(node, "custom_buddy_icon") != NULL);
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
796 }
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
797
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
798 PurpleStoredImage *
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
799 purple_buddy_icons_node_find_custom_icon(PurpleBlistNode *node)
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
800 {
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
801 char *path;
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
802 size_t len;
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
803 guchar *data;
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
804 PurpleStoredImage *img;
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
805 const char *custom_icon_file, *dirname;
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
806
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
807 g_return_val_if_fail(node != NULL, NULL);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
808
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
809 if ((img = g_hash_table_lookup(pointer_icon_cache, node)))
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
810 {
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
811 return purple_imgstore_ref(img);
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
812 }
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
813
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
814 custom_icon_file = purple_blist_node_get_string(node,
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
815 "custom_buddy_icon");
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
816
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
817 if (custom_icon_file == NULL)
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
818 return NULL;
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
819
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
820 dirname = purple_buddy_icons_get_cache_dir();
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
821 path = g_build_filename(dirname, custom_icon_file, NULL);
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
822
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
823 if (read_icon_file(path, &data, &len))
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
824 {
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
825 g_free(path);
29234
1d444b1479d7 Fix a crash when setting a buddyicon.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27783
diff changeset
826 img = purple_buddy_icons_node_set_custom_icon(node, data, len);
1d444b1479d7 Fix a crash when setting a buddyicon.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27783
diff changeset
827 return purple_imgstore_ref(img);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
828 }
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
829 g_free(path);
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
830
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
831 return NULL;
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
832 }
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
833
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
834 PurpleStoredImage *
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
835 purple_buddy_icons_node_set_custom_icon(PurpleBlistNode *node,
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
836 guchar *icon_data, size_t icon_len)
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
837 {
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
838 char *old_icon;
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
839 PurpleStoredImage *old_img;
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
840 PurpleStoredImage *img = NULL;
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
841
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
842 g_return_val_if_fail(node != NULL, NULL);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
843
34696
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
844 if (!PURPLE_IS_CONTACT(node) &&
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
845 !PURPLE_IS_CHAT(node) &&
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
846 !PURPLE_IS_GROUP(node)) {
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
847 return NULL;
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
848 }
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
849
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
850 old_img = g_hash_table_lookup(pointer_icon_cache, node);
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
851
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
852 if (icon_data != NULL && icon_len > 0) {
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
853 img = purple_buddy_icon_data_new(icon_data, icon_len);
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
854 }
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
855
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
856 old_icon = g_strdup(purple_blist_node_get_string(node,
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
857 "custom_buddy_icon"));
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
858 if (img && purple_buddy_icons_is_caching()) {
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
859 const char *filename = purple_imgstore_get_filename(img);
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
860 purple_blist_node_set_string(node, "custom_buddy_icon",
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
861 filename);
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
862 ref_filename(filename);
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
863 } else {
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
864 purple_blist_node_remove_setting(node, "custom_buddy_icon");
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
865 }
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
866 unref_filename(old_icon);
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
867
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
868 if (img)
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
869 g_hash_table_insert(pointer_icon_cache, node, img);
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
870 else
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
871 g_hash_table_remove(pointer_icon_cache, node);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
872
34696
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
873 if (PURPLE_IS_CONTACT(node)) {
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
874 PurpleBlistNode *child;
24955
77727fac30c6 Finish off the libpurple updates for the hidden blist structs
Gary Kramlich <grim@reaperworld.com>
parents: 24569
diff changeset
875 for (child = purple_blist_node_get_first_child(node);
77727fac30c6 Finish off the libpurple updates for the hidden blist structs
Gary Kramlich <grim@reaperworld.com>
parents: 24569
diff changeset
876 child;
77727fac30c6 Finish off the libpurple updates for the hidden blist structs
Gary Kramlich <grim@reaperworld.com>
parents: 24569
diff changeset
877 child = purple_blist_node_get_sibling_next(child))
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
878 {
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
879 PurpleBuddy *buddy;
34645
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
880 PurpleIMConversation *im;
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
881
34696
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
882 if (!PURPLE_IS_BUDDY(child))
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
883 continue;
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
884
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
885 buddy = (PurpleBuddy *)child;
16446
3a6ed6c3400e Fix the custom icon stuff, and various memory leaks. At this point, custom
Richard Laager <rlaager@pidgin.im>
parents: 16440
diff changeset
886
34645
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
887 im = purple_conversations_find_im_with_account(purple_buddy_get_name(buddy), purple_buddy_get_account(buddy));
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
888 if (im)
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
889 purple_conversation_update(PURPLE_CONVERSATION(im), PURPLE_CONVERSATION_UPDATE_ICON);
16446
3a6ed6c3400e Fix the custom icon stuff, and various memory leaks. At this point, custom
Richard Laager <rlaager@pidgin.im>
parents: 16440
diff changeset
890
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
891 /* Is this call necessary anymore? Can the buddies
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
892 * themselves need updating when the custom buddy
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
893 * icon changes? */
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
894 purple_blist_update_node_icon((PurpleBlistNode*)buddy);
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
895 }
34696
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
896 } else if (PURPLE_IS_CHAT(node)) {
34645
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
897 PurpleChatConversation *chat = NULL;
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
898
34645
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
899 chat = purple_conversations_find_chat_with_account(purple_chat_get_name((PurpleChat*)node), purple_chat_get_account((PurpleChat*)node));
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
900 if (chat) {
a04c721bebf1 Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents: 34625
diff changeset
901 purple_conversation_update(PURPLE_CONVERSATION(chat), PURPLE_CONVERSATION_UPDATE_ICON);
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
902 }
16446
3a6ed6c3400e Fix the custom icon stuff, and various memory leaks. At this point, custom
Richard Laager <rlaager@pidgin.im>
parents: 16440
diff changeset
903 }
3a6ed6c3400e Fix the custom icon stuff, and various memory leaks. At this point, custom
Richard Laager <rlaager@pidgin.im>
parents: 16440
diff changeset
904
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
905 purple_blist_update_node_icon(node);
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
906
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
907 if (old_img) {
16533
91e3e84b05f2 Fix a bug with removing custom buddy icons.
Richard Laager <rlaager@pidgin.im>
parents: 16532
diff changeset
908 purple_imgstore_unref(old_img);
23283
93261f547412 Add the purple_buddy_icons_node_has_custom_icon,
Etan Reisner <deryni@pidgin.im>
parents: 22769
diff changeset
909 } else if (old_icon) {
16533
91e3e84b05f2 Fix a bug with removing custom buddy icons.
Richard Laager <rlaager@pidgin.im>
parents: 16532
diff changeset
910 /* The old icon may not have been loaded into memory. In that
91e3e84b05f2 Fix a bug with removing custom buddy icons.
Richard Laager <rlaager@pidgin.im>
parents: 16532
diff changeset
911 * case, we'll need to uncache the filename. The filenames
91e3e84b05f2 Fix a bug with removing custom buddy icons.
Richard Laager <rlaager@pidgin.im>
parents: 16532
diff changeset
912 * are ref-counted, so this is safe. */
91e3e84b05f2 Fix a bug with removing custom buddy icons.
Richard Laager <rlaager@pidgin.im>
parents: 16532
diff changeset
913 purple_buddy_icon_data_uncache_file(old_icon);
91e3e84b05f2 Fix a bug with removing custom buddy icons.
Richard Laager <rlaager@pidgin.im>
parents: 16532
diff changeset
914 }
91e3e84b05f2 Fix a bug with removing custom buddy icons.
Richard Laager <rlaager@pidgin.im>
parents: 16532
diff changeset
915 g_free(old_icon);
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
916
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
917 return img;
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
918 }
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
919
23285
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
920 PurpleStoredImage *
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
921 purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
922 const gchar *filename)
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
923 {
24273
f5b589130c88 Don't try to read data from a NULL filename in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23285
diff changeset
924 size_t len = 0;
f5b589130c88 Don't try to read data from a NULL filename in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23285
diff changeset
925 guchar *data = NULL;
23285
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
926
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
927 g_return_val_if_fail(node != NULL, NULL);
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
928
34696
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
929 if (!PURPLE_IS_CONTACT(node) &&
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
930 !PURPLE_IS_CHAT(node) &&
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
931 !PURPLE_IS_GROUP(node)) {
23285
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
932 return NULL;
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
933 }
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
934
24273
f5b589130c88 Don't try to read data from a NULL filename in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23285
diff changeset
935 if (filename != NULL) {
f5b589130c88 Don't try to read data from a NULL filename in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23285
diff changeset
936 if (!read_icon_file(filename, &data, &len)) {
f5b589130c88 Don't try to read data from a NULL filename in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23285
diff changeset
937 return NULL;
f5b589130c88 Don't try to read data from a NULL filename in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23285
diff changeset
938 }
23285
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
939 }
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
940
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
941 return purple_buddy_icons_node_set_custom_icon(node, data, len);
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
942 }
da6c923a5305 Add a purple_buddy_icons_node_set_custom_icon_from_file convenience function.
Etan Reisner <deryni@pidgin.im>
parents: 23283
diff changeset
943
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
944 static void
16614
1cca48d1018b nosnilmot had a problem with empty icon files.
Richard Laager <rlaager@pidgin.im>
parents: 16597
diff changeset
945 delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name)
1cca48d1018b nosnilmot had a problem with empty icon files.
Richard Laager <rlaager@pidgin.im>
parents: 16597
diff changeset
946 {
1cca48d1018b nosnilmot had a problem with empty icon files.
Richard Laager <rlaager@pidgin.im>
parents: 16597
diff changeset
947 purple_blist_node_remove_setting(node, setting_name);
1cca48d1018b nosnilmot had a problem with empty icon files.
Richard Laager <rlaager@pidgin.im>
parents: 16597
diff changeset
948
25859
b42be7bb9dac Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents: 24955
diff changeset
949 if (purple_strequal(setting_name, "buddy_icon"))
16614
1cca48d1018b nosnilmot had a problem with empty icon files.
Richard Laager <rlaager@pidgin.im>
parents: 16597
diff changeset
950 {
1cca48d1018b nosnilmot had a problem with empty icon files.
Richard Laager <rlaager@pidgin.im>
parents: 16597
diff changeset
951 purple_blist_node_remove_setting(node, "avatar_hash");
1cca48d1018b nosnilmot had a problem with empty icon files.
Richard Laager <rlaager@pidgin.im>
parents: 16597
diff changeset
952 purple_blist_node_remove_setting(node, "icon_checksum");
1cca48d1018b nosnilmot had a problem with empty icon files.
Richard Laager <rlaager@pidgin.im>
parents: 16597
diff changeset
953 }
1cca48d1018b nosnilmot had a problem with empty icon files.
Richard Laager <rlaager@pidgin.im>
parents: 16597
diff changeset
954 }
1cca48d1018b nosnilmot had a problem with empty icon files.
Richard Laager <rlaager@pidgin.im>
parents: 16597
diff changeset
955
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
956 void
16696
450ba3bd5b63 The GNOME coding guidelines recommend prefixing internal symbols with an underscore.
Richard Laager <rlaager@pidgin.im>
parents: 16690
diff changeset
957 _purple_buddy_icons_account_loaded_cb()
16565
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
958 {
16567
4d79ee03965d This is probably needed to compile.
Richard Laager <rlaager@pidgin.im>
parents: 16566
diff changeset
959 const char *dirname = purple_buddy_icons_get_cache_dir();
18122
9bf9970c1b6a disapproval of revision '2d8ea56b90971e7851442d96b7d74ecb4f052126'
Richard Laager <rlaager@pidgin.im>
parents: 18121
diff changeset
960 GList *cur;
16565
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
961
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
962 for (cur = purple_accounts_get_all(); cur != NULL; cur = cur->next)
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
963 {
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
964 PurpleAccount *account = cur->data;
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
965 const char *account_icon_file = purple_account_get_string(account, "buddy_icon", NULL);
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
966
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
967 if (account_icon_file != NULL)
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
968 {
16568
b26c36d6cf2d I really shouldn't commit before compiling.
Richard Laager <rlaager@pidgin.im>
parents: 16567
diff changeset
969 char *path = g_build_filename(dirname, account_icon_file, NULL);
b26c36d6cf2d I really shouldn't commit before compiling.
Richard Laager <rlaager@pidgin.im>
parents: 16567
diff changeset
970 if (!g_file_test(path, G_FILE_TEST_EXISTS))
16565
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
971 {
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
972 purple_account_set_string(account, "buddy_icon", NULL);
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
973 } else {
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
974 ref_filename(account_icon_file);
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
975 }
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
976 g_free(path);
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
977 }
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
978 }
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
979 }
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
980
f5cd28cc7367 Ref the filenames for account buddy icons on load.
Richard Laager <rlaager@pidgin.im>
parents: 16544
diff changeset
981 void
16696
450ba3bd5b63 The GNOME coding guidelines recommend prefixing internal symbols with an underscore.
Richard Laager <rlaager@pidgin.im>
parents: 16690
diff changeset
982 _purple_buddy_icons_blist_loaded_cb()
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
983 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
984 PurpleBlistNode *node = purple_blist_get_root();
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
985 const char *dirname = purple_buddy_icons_get_cache_dir();
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
986
16657
63e53570702c Whitespace fix from patch in ticket #383
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16632
diff changeset
987 while (node != NULL)
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
988 {
34696
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
989 if (PURPLE_IS_BUDDY(node))
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
990 {
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
991 const char *filename;
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
992
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
993 filename = purple_blist_node_get_string(node, "buddy_icon");
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
994 if (filename != NULL)
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
995 {
31590
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
996 char *path = g_build_filename(dirname, filename, NULL);
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
997 if (!g_file_test(path, G_FILE_TEST_EXISTS))
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
998 {
31590
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
999 purple_blist_node_remove_setting(node,
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
1000 "buddy_icon");
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
1001 purple_blist_node_remove_setting(node,
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
1002 "icon_checksum");
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1003 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1004 else
31590
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
1005 ref_filename(filename);
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
1006 g_free(path);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1007 }
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
1008 }
34696
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
1009 else if (PURPLE_IS_CONTACT(node) ||
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
1010 PURPLE_IS_CHAT(node) ||
6e0d13978666 Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents: 34645
diff changeset
1011 PURPLE_IS_GROUP(node))
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
1012 {
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
1013 const char *filename;
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1014
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1015 filename = purple_blist_node_get_string(node, "custom_buddy_icon");
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1016 if (filename != NULL)
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1017 {
31590
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
1018 char *path = g_build_filename(dirname, filename, NULL);
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
1019 if (!g_file_test(path, G_FILE_TEST_EXISTS))
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1020 {
31590
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
1021 purple_blist_node_remove_setting(node,
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
1022 "custom_buddy_icon");
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1023 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1024 else
31590
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
1025 ref_filename(filename);
e96aac3d0c77 Drop the .gaim -> .purple migration code
Richard Laager <rlaager@pidgin.im>
parents: 29296
diff changeset
1026 g_free(path);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1027 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1028 }
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1029 node = purple_blist_node_next(node, TRUE);
16657
63e53570702c Whitespace fix from patch in ticket #383
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16632
diff changeset
1030 }
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1031 }
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1032
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1033 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1034 purple_buddy_icons_set_caching(gboolean caching)
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1035 {
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1036 icon_caching = caching;
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1037 }
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1038
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1039 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1040 purple_buddy_icons_is_caching(void)
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1041 {
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1042 return icon_caching;
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1043 }
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1044
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1045 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1046 purple_buddy_icons_set_cache_dir(const char *dir)
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1047 {
10811
6b7ac5a9dd35 [gaim-migrate @ 12464]
Richard Laager <rlaager@pidgin.im>
parents: 10589
diff changeset
1048 g_return_if_fail(dir != NULL);
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1049
13934
c554909e9ff6 [gaim-migrate @ 16342]
Mark Doliner <markdoliner@pidgin.im>
parents: 13555
diff changeset
1050 g_free(cache_dir);
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1051 cache_dir = g_strdup(dir);
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1052 }
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1053
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1054 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1055 purple_buddy_icons_get_cache_dir(void)
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1056 {
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1057 return cache_dir;
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1058 }
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1059
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1060 void *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1061 purple_buddy_icons_get_handle()
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1062 {
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1063 static int handle;
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1064
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1065 return &handle;
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1066 }
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1067
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1068 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1069 purple_buddy_icons_init()
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1070 {
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1071 account_cache = g_hash_table_new_full(
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1072 g_direct_hash, g_direct_equal,
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1073 NULL, (GFreeFunc)g_hash_table_destroy);
6886
97734a57c0f5 [gaim-migrate @ 7432]
Christian Hammond <chipx86@chipx86.com>
parents: 6846
diff changeset
1074
16669
69babfdf63e6 19:00:43 Ka-Hing Cheung (khc): rlaager: shouldn't we give g_free as the key free function for icon_data_cache?
Richard Laager <rlaager@pidgin.im>
parents: 16657
diff changeset
1075 icon_data_cache = g_hash_table_new_full(g_str_hash, g_str_equal,
69babfdf63e6 19:00:43 Ka-Hing Cheung (khc): rlaager: shouldn't we give g_free as the key free function for icon_data_cache?
Richard Laager <rlaager@pidgin.im>
parents: 16657
diff changeset
1076 g_free, NULL);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1077 icon_file_cache = g_hash_table_new_full(g_str_hash, g_str_equal,
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1078 g_free, NULL);
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
1079 pointer_icon_cache = g_hash_table_new(g_direct_hash, g_direct_equal);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1080
22159
9539d60302c9 If the UI sets a cache directory before purple_buddy_icons_init() is called
Evan Schoenberg <evands@pidgin.im>
parents: 22158
diff changeset
1081 if (!cache_dir)
33664
27ee16de77aa Minor cleanup.
Mark Doliner <mark@kingant.net>
parents: 33661
diff changeset
1082 cache_dir = g_build_filename(purple_user_dir(), "icons", NULL);
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
1083
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
1084 purple_signal_connect(purple_imgstore_get_handle(), "image-deleting",
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
1085 purple_buddy_icons_get_handle(),
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
1086 G_CALLBACK(image_deleting_cb), NULL);
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1087 }
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1088
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1089 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1090 purple_buddy_icons_uninit()
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1091 {
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
1092 purple_signals_disconnect_by_handle(purple_buddy_icons_get_handle());
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16421
diff changeset
1093
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1094 g_hash_table_destroy(account_cache);
16421
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1095 g_hash_table_destroy(icon_data_cache);
f9218e1c4703 The buddy icon code as it stands, with lots of bugs and design flaws.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
1096 g_hash_table_destroy(icon_file_cache);
16538
c7e61e2917c9 Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents: 16537
diff changeset
1097 g_hash_table_destroy(pointer_icon_cache);
26744
ac7a89587cad Various libpurple uninit memory cleanups.
Nick Hebner <hebnern@gmail.com>
parents: 25888
diff changeset
1098 g_free(cache_dir);
29296
c351bc2db920 Zero freed memory to avoid a crash on re-init.
Ludovico Cavedon <ludovico.cavedon@gmail.com>
parents: 29234
diff changeset
1099
c351bc2db920 Zero freed memory to avoid a crash on re-init.
Ludovico Cavedon <ludovico.cavedon@gmail.com>
parents: 29234
diff changeset
1100 cache_dir = NULL;
6846
f814f02dca87 [gaim-migrate @ 7391]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1101 }
10483
e7b09a8b1f52 [gaim-migrate @ 11773]
Nathan Walp <nwalp@pidgin.im>
parents: 10246
diff changeset
1102
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
1103 void purple_buddy_icon_get_scale_size(PurpleBuddyIconSpec *spec, int *width, int *height)
10483
e7b09a8b1f52 [gaim-migrate @ 11773]
Nathan Walp <nwalp@pidgin.im>
parents: 10246
diff changeset
1104 {
15284
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1105 int new_width, new_height;
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1106
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1107 new_width = *width;
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1108 new_height = *height;
10523
ef52a88a8512 [gaim-migrate @ 11840]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10483
diff changeset
1109
15284
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1110 if (*width < spec->min_width)
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1111 new_width = spec->min_width;
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1112 else if (*width > spec->max_width)
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1113 new_width = spec->max_width;
10483
e7b09a8b1f52 [gaim-migrate @ 11773]
Nathan Walp <nwalp@pidgin.im>
parents: 10246
diff changeset
1114
15284
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1115 if (*height < spec->min_height)
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1116 new_height = spec->min_height;
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1117 else if (*height > spec->max_height)
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1118 new_height = spec->max_height;
10523
ef52a88a8512 [gaim-migrate @ 11840]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10483
diff changeset
1119
15284
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1120 /* preserve aspect ratio */
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1121 if ((double)*height * (double)new_width >
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1122 (double)*width * (double)new_height) {
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1123 new_width = 0.5 + (double)*width * (double)new_height / (double)*height;
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1124 } else {
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1125 new_height = 0.5 + (double)*height * (double)new_width / (double)*width;
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1126 }
10523
ef52a88a8512 [gaim-migrate @ 11840]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10483
diff changeset
1127
15284
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1128 *width = new_width;
98e8f9912107 [gaim-migrate @ 18012]
Mark Doliner <markdoliner@pidgin.im>
parents: 15135
diff changeset
1129 *height = new_height;
10483
e7b09a8b1f52 [gaim-migrate @ 11773]
Nathan Walp <nwalp@pidgin.im>
parents: 10246
diff changeset
1130 }

mercurial