Mercurial > pidgin.yaz

comparison src/gtkmain.c @ 12246:b7a51e68d0b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 14548] Make some things static and namespace session_init and session_end committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 28 Nov 2005 06:20:06 +0000
parents 17be9401e167
children 3ef381cdc47e
comparison
equal deleted inserted replaced
12245:465ddcb3e9e8 12246:b7a51e68d0b8
56 #include "gtkprefs.h" 56 #include "gtkprefs.h"
57 #include "gtkprivacy.h" 57 #include "gtkprivacy.h"
58 #include "gtkrequest.h" 58 #include "gtkrequest.h"
59 #include "gtkroomlist.h" 59 #include "gtkroomlist.h"
60 #include "gtksavedstatuses.h" 60 #include "gtksavedstatuses.h"
61 #include "gtksession.h"
61 #include "gtksound.h" 62 #include "gtksound.h"
62 #include "gtkthemes.h" 63 #include "gtkthemes.h"
63 #include "gtkutils.h" 64 #include "gtkutils.h"
64 #include "gtkstock.h" 65 #include "gtkstock.h"
65 #include "gtkwhiteboard.h" 66 #include "gtkwhiteboard.h"
278 static void 279 static void
279 gaim_gtk_quit(void) 280 gaim_gtk_quit(void)
280 { 281 {
281 #ifdef USE_SM 282 #ifdef USE_SM
282 /* unplug */ 283 /* unplug */
283 session_end(); 284 gaim_gtk_session_end();
284 #endif 285 #endif
285 286
286 /* Save the plugins we have loaded for next time. */ 287 /* Save the plugins we have loaded for next time. */
287 gaim_gtk_plugins_save(); 288 gaim_gtk_plugins_save();
288 289
645 gaim_pounces_load(); 646 gaim_pounces_load();
646 647
647 ui_main(); 648 ui_main();
648 649
649 #ifdef USE_SM 650 #ifdef USE_SM
650 session_init(argv[0], opt_session_arg, opt_config_dir_arg); 651 gaim_gtk_session_init(argv[0], opt_session_arg, opt_config_dir_arg);
651 #endif 652 #endif
652 if (opt_session_arg != NULL) { 653 if (opt_session_arg != NULL) {
653 g_free(opt_session_arg); 654 g_free(opt_session_arg);
654 opt_session_arg = NULL; 655 opt_session_arg = NULL;
655 } 656 }