Mercurial > pidgin3 / file diff

--- a/src/gtkmain.c	Mon Nov 28 05:28:01 2005 +0000
+++ b/src/gtkmain.c	Mon Nov 28 06:20:06 2005 +0000
@@ -58,6 +58,7 @@
 #include "gtkrequest.h"
 #include "gtkroomlist.h"
 #include "gtksavedstatuses.h"
+#include "gtksession.h"
 #include "gtksound.h"
 #include "gtkthemes.h"
 #include "gtkutils.h"
@@ -280,7 +281,7 @@
 {
 #ifdef USE_SM
 	/* unplug */
-	session_end();
+	gaim_gtk_session_end();
 #endif
 
 	/* Save the plugins we have loaded for next time. */
@@ -647,7 +648,7 @@
 	ui_main();
 
 #ifdef USE_SM
-	session_init(argv[0], opt_session_arg, opt_config_dir_arg);
+	gaim_gtk_session_init(argv[0], opt_session_arg, opt_config_dir_arg);
 #endif
 	if (opt_session_arg != NULL) {
 		g_free(opt_session_arg);