changeset 5746:2c04c55222b7

[gaim-migrate @ 6171] Wow.. Which way is up? committer: Tailor Script <[e-mail]>

--- a/src/Makefile.mingw	Wed Jun 04 08:59:33 2003 +0000
+++ b/src/Makefile.mingw	Wed Jun 04 16:18:16 2003 +0000
@@ -26,7 +26,7 @@
 
 # Compiler and Linker Options
 
-CFLAGS =
+CFLAGS = -g
 
 DEFINES =
 
@@ -71,10 +71,13 @@
 ##
 
 DLL_C_SRC =		about.c \
+			account.c \
+			accountopt.c \
 			away.c \
 			blist.c \
 			browser.c \
 			buddy_chat.c \
+			connection.c \
 			conversation.c \
 			core.c \
 			debug.c \
@@ -84,7 +87,9 @@
 			ft.c \
 			gaim-disclosure.c \
 			gaimrc.c \
+			gtkaccount.c \
 			gtkblist.c \
+			gtkconn.c \
 			gtkconv.c \
 			gtkcellrendererprogress.c \
 			gtkdebug.c \
@@ -95,13 +100,13 @@
 			gtkpounce.c \
 			gtkprefs.c \
 			gtkrequest.c \
+			gtksound.c \
 			gtkutils.c \
 			html.c \
 			idle.c \
 			log.c \
 			main.c \
 			md5.c \
-			multi.c \
 			notify.c \
 			plugin.c \
 			pounce.c \

--- a/src/gtkconn.c	Wed Jun 04 08:59:33 2003 +0000
+++ b/src/gtkconn.c	Wed Jun 04 16:18:16 2003 +0000
@@ -249,7 +249,7 @@
 }
 
 
-static void away_on_login(char *mesg)
+void away_on_login(char *mesg)
 {
 	GSList *awy = away_messages;
 	struct away_message *a, *message = NULL;

--- a/src/gtkutils.c	Wed Jun 04 08:59:33 2003 +0000
+++ b/src/gtkutils.c	Wed Jun 04 16:18:16 2003 +0000
@@ -52,6 +52,7 @@
 
 #ifdef _WIN32
 #include "wspell.h"
+#include "win32dep.h"
 #endif
 
 void

--- a/src/protocols/msn/Makefile.mingw	Wed Jun 04 08:59:33 2003 +0000
+++ b/src/protocols/msn/Makefile.mingw	Wed Jun 04 16:18:16 2003 +0000
@@ -71,6 +71,7 @@
 C_SRC =			buddyicon.c \
 			dispatch.c \
 			error.c \
+			group.c \
 			msg.c \
 			msn.c \
 			notification.c \

--- a/src/win32/systray.c	Wed Jun 04 08:59:33 2003 +0000
+++ b/src/win32/systray.c	Wed Jun 04 16:18:16 2003 +0000
@@ -256,15 +256,15 @@
 			break;
 		case SYSTRAY_CMND_SIGNOFF:
 			debug_printf("signoff\n");
-			signoff_all();
+			gaim_connections_disconnect_all();
 			break;
 		case SYSTRAY_CMND_AUTOLOGIN:
 			debug_printf("autologin\n");
-			auto_login();
+			/*auto_login();*/
 			break;
 		case SYSTRAY_CMND_PREFS:
 			debug_printf("Prefs\n");
-			show_prefs();
+			gaim_gtk_prefs_show();
 			break;
 		case SYSTRAY_CMND_BACK:
 			debug_printf("I'm back\n");
@@ -420,24 +420,26 @@
 static void systray_update_status() {
 	SYSTRAY_STATE old_state = st_state;
 
-	if(connections) {
+	if(gaim_connections_get_all()) {
 		if(awaymessage) {
 			st_state = SYSTRAY_STATE_AWAY;
-		} else if(connecting_count) {
+#if 0
+		} else if(gaim_connections_get_connecting()) {
 			st_state = SYSTRAY_STATE_ONLINE_CONNECTING;
+#endif
 		} else {
 			st_state = SYSTRAY_STATE_ONLINE;
 		}
 	} else {
-		if(connecting_count) {
-			/* Don't rely on this state.. signoff in multi.c sends
-			   event_signoff before decrementing connecting_count
-			   for a reason unknown to me..
-			*/
+#if 0
+		if(gaim_connections_get_connecting()) {
 			st_state = SYSTRAY_STATE_OFFLINE_CONNECTING;
 		} else {
+#endif
 			st_state = SYSTRAY_STATE_OFFLINE;
+#if 0
 		}
+#endif
 	}
 	if(st_state != old_state) {
 		systray_update_icon();
@@ -448,19 +450,19 @@
  * GAIM EVENT CALLBACKS
  ***********************/
 
-static void st_signon(struct gaim_connection *gc, void *data) {
+static void st_signon(GaimConnection *gc, void *data) {
 	systray_update_status();
 }
 
-static void st_signoff(struct gaim_connection *gc, void *data) {
+static void st_signoff(GaimConnection *gc, void *data) {
 	systray_update_status();
 }
 
-static void st_away(struct gaim_connection *gc, void *data) {
+static void st_away(GaimConnection *gc, void *data) {
 	systray_update_status();
 }
 
-static void st_back(struct gaim_connection *gc, void *data) {
+static void st_back(GaimConnection *gc, void *data) {
 	systray_update_status();
 }