Mercurial > pidgin
comparison libpurple/core.c @ 22311:02eda4bd2b22
Apply the custom smiley patches from #1187, from Jorge Villaseo (Masca) and
Mauro Srgio Ferreira Brasil.
I have not applied the bits on MSN yet. I will have to look at it later, but
I would rather someone else more familiar with the MSN code look at it first.
I changed some bits of the applied patch (whitespacing, camelcasing etc.), and
the bit that required a major version bump (in gtkthemes.h). There are a few
more things that need to be done for this to be merged back to i.p.p.
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Tue, 19 Feb 2008 19:41:56 +0000 |
parents | 38cc722159ff |
children | 48e33e3673e2 |
comparison
equal
deleted
inserted
replaced
22310:f463d54e606b | 22311:02eda4bd2b22 |
---|---|
41 #include "prefs.h" | 41 #include "prefs.h" |
42 #include "privacy.h" | 42 #include "privacy.h" |
43 #include "proxy.h" | 43 #include "proxy.h" |
44 #include "savedstatuses.h" | 44 #include "savedstatuses.h" |
45 #include "signals.h" | 45 #include "signals.h" |
46 #include "smiley.h" | |
46 #include "sound.h" | 47 #include "sound.h" |
47 #include "sslconn.h" | 48 #include "sslconn.h" |
48 #include "status.h" | 49 #include "status.h" |
49 #include "stun.h" | 50 #include "stun.h" |
50 #include "util.h" | 51 #include "util.h" |
160 purple_sound_init(); | 161 purple_sound_init(); |
161 purple_ssl_init(); | 162 purple_ssl_init(); |
162 purple_stun_init(); | 163 purple_stun_init(); |
163 purple_xfers_init(); | 164 purple_xfers_init(); |
164 purple_idle_init(); | 165 purple_idle_init(); |
166 purple_smileys_init(); | |
165 | 167 |
166 /* | 168 /* |
167 * Call this early on to try to auto-detect our IP address and | 169 * Call this early on to try to auto-detect our IP address and |
168 * hopefully save some time later. | 170 * hopefully save some time later. |
169 */ | 171 */ |
188 | 190 |
189 /* Transmission ends */ | 191 /* Transmission ends */ |
190 purple_connections_disconnect_all(); | 192 purple_connections_disconnect_all(); |
191 | 193 |
192 /* Save .xml files, remove signals, etc. */ | 194 /* Save .xml files, remove signals, etc. */ |
195 purple_smileys_uninit(); | |
193 purple_idle_uninit(); | 196 purple_idle_uninit(); |
194 purple_ssl_uninit(); | 197 purple_ssl_uninit(); |
195 purple_pounces_uninit(); | 198 purple_pounces_uninit(); |
196 purple_blist_uninit(); | 199 purple_blist_uninit(); |
197 purple_ciphers_uninit(); | 200 purple_ciphers_uninit(); |