diff src/toc.c @ 746:5a908dd5cfc4

[gaim-migrate @ 756] i finally got pissed off enough at gnome_applet_mgr.c that i redid it committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Wed, 23 Aug 2000 04:14:47 +0000
parents efd72a117875
children 9389216aae29
line wrap: on
line diff
--- a/src/toc.c	Wed Aug 23 02:43:34 2000 +0000
+++ b/src/toc.c	Wed Aug 23 04:14:47 2000 +0000
@@ -69,7 +69,7 @@
 	if (!sin) {
 	        
 #ifdef USE_APPLET
-		setUserState(offline);
+		set_user_state(offline);
 #endif /* USE_APPLET */
                 set_state(STATE_OFFLINE);
 		g_snprintf(buf, sizeof(buf), "Unable to lookup %s", aim_host);
@@ -88,7 +88,7 @@
 
         if (toc_fd < 0) {
 #ifdef USE_APPLET
-		setUserState(offline);
+		set_user_state(offline);
 #endif /* USE_APPLET */
                 set_state(STATE_OFFLINE);
 		g_snprintf(buf, sizeof(buf), "Connect to %s failed",
@@ -105,7 +105,7 @@
 	
 	if (toc_signon(username, password) < 0) {
 #ifdef USE_APPLET
-		setUserState(offline);
+		set_user_state(offline);
 #endif /* USE_APPLET */
                 set_state(STATE_OFFLINE);
 		hide_login_progress("Disconnected.");
@@ -116,7 +116,7 @@
 	set_login_progress(4, buf);
 	if (toc_wait_signon() < 0) {
 #ifdef USE_APPLET
-		setUserState(offline);
+		set_user_state(offline);
 #endif /* USE_APPLET */
                 set_state(STATE_OFFLINE);
 		hide_login_progress("Authentication Failed");
@@ -143,37 +143,27 @@
 	config = toc_wait_config();
 	state = STATE_ONLINE;
 
+        gtk_widget_hide(mainwindow);
+	show_buddy_list();
 #ifdef USE_APPLET
-	make_buddy();
 	if (general_options & OPT_GEN_APP_BUDDY_SHOW) {
-                gnome_buddy_show();
-		if (config != NULL)
-			parse_toc_buddy_list(config, 0);
-		else
-			do_import(0, 0);
+		refresh_buddy_window();
 		createOnlinePopup();
-                set_applet_draw_open();
+                applet_buddy_show = TRUE;
         } else {
-                gnome_buddy_hide();
-		if (config != NULL)
-			parse_toc_buddy_list(config, 0);
-		else
-			do_import(0, 0);
-                set_applet_draw_closed();
+                gtk_widget_hide(blist);
+                applet_buddy_show = FALSE;
         }
 
-       
-	setUserState(online);
-	gtk_widget_hide(mainwindow);
+	set_user_state(online);
 #else
-        gtk_widget_hide(mainwindow);
-	show_buddy_list();
+	refresh_buddy_window();
+#endif
 	if (config != NULL)
 		parse_toc_buddy_list(config, 0);
 	else
 		do_import(0, 0);
         refresh_buddy_window();
-#endif
         
         
 	g_snprintf(buf2, sizeof(buf2), "toc_init_done");
@@ -191,7 +181,7 @@
 void toc_close()
 {
 #ifdef USE_APPLET
-	setUserState(offline);
+	set_user_state(offline);
 #endif /* USE_APPLET */
         seqno = 0;
         state = STATE_OFFLINE;