Mercurial > pidgin.yaz
comparison pidgin/gtkmain.c @ 22874: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 | 542d35f101ff |
children | fdda2b8a4146 |
comparison
equal
deleted
inserted
replaced
22310:f463d54e606b | 22874:02eda4bd2b22 |
---|---|
59 #include "gtkprivacy.h" | 59 #include "gtkprivacy.h" |
60 #include "gtkrequest.h" | 60 #include "gtkrequest.h" |
61 #include "gtkroomlist.h" | 61 #include "gtkroomlist.h" |
62 #include "gtksavedstatuses.h" | 62 #include "gtksavedstatuses.h" |
63 #include "gtksession.h" | 63 #include "gtksession.h" |
64 #include "gtksmiley.h" | |
64 #include "gtksound.h" | 65 #include "gtksound.h" |
65 #include "gtkthemes.h" | 66 #include "gtkthemes.h" |
66 #include "gtkutils.h" | 67 #include "gtkutils.h" |
67 #include "pidginstock.h" | 68 #include "pidginstock.h" |
68 #include "gtkwhiteboard.h" | 69 #include "gtkwhiteboard.h" |
325 pidgin_privacy_init(); | 326 pidgin_privacy_init(); |
326 pidgin_xfers_init(); | 327 pidgin_xfers_init(); |
327 pidgin_roomlist_init(); | 328 pidgin_roomlist_init(); |
328 pidgin_log_init(); | 329 pidgin_log_init(); |
329 pidgin_docklet_init(); | 330 pidgin_docklet_init(); |
331 pidgin_smileys_init(); | |
330 } | 332 } |
331 | 333 |
332 static GHashTable *ui_info = NULL; | 334 static GHashTable *ui_info = NULL; |
333 | 335 |
334 static void | 336 static void |
341 | 343 |
342 /* Save the plugins we have loaded for next time. */ | 344 /* Save the plugins we have loaded for next time. */ |
343 pidgin_plugins_save(); | 345 pidgin_plugins_save(); |
344 | 346 |
345 /* Uninit */ | 347 /* Uninit */ |
348 pidgin_smileys_uninit(); | |
346 pidgin_conversations_uninit(); | 349 pidgin_conversations_uninit(); |
347 pidgin_status_uninit(); | 350 pidgin_status_uninit(); |
348 pidgin_docklet_uninit(); | 351 pidgin_docklet_uninit(); |
349 pidgin_blist_uninit(); | 352 pidgin_blist_uninit(); |
350 pidgin_connection_uninit(); | 353 pidgin_connection_uninit(); |