changeset 8430:87bd4d4ff499

[gaim-migrate @ 9160] Various uselessness committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Fri, 12 Mar 2004 01:55:54 +0000
parents 1b6c43246cf6
children deb36081aaf2
files src/blist.c src/connection.h src/protocols/oscar/oscar.c
diffstat 3 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/blist.c	Thu Mar 11 20:50:15 2004 +0000
+++ b/src/blist.c	Fri Mar 12 01:55:54 2004 +0000
@@ -1874,13 +1874,13 @@
 		fgets(first, 64, f);
 
 #if 0
-	if (!g_strncasecmp(first, "<xml", strlen("<xml"))) {
+	if (!g_ascii_strncasecmp(first, "<xml", strlen("<xml"))) {
 		/* new gaim XML buddy list */
 		gaim_blist_read(path);
 		
 		/* We really don't need to bother doing stuf like translating AIM 3 buddy lists anymore */
 		
-	} else if (!g_strncasecmp(first, "Config {", strlen("Config {"))) {
+	} else if (!g_ascii_strncasecmp(first, "Config {", strlen("Config {"))) {
 		/* AIM 4 buddy list */
 		gaim_debug(GAIM_DEBUG_MISC, "blist import", "aim 4\n");
 		rewind(f);
@@ -1890,7 +1890,7 @@
 		gaim_debug(GAIM_DEBUG_MISC, "blist import", "aim 3\n");
 		rewind(f);
 		buf = translate_lst(f);
-	} else if (!g_strncasecmp(first, "[User]", strlen("[User]"))) {
+	} else if (!g_ascii_strncasecmp(first, "[User]", strlen("[User]"))) {
 		/* GnomeICU (hopefully) */
 		gaim_debug(GAIM_DEBUG_MISC, "blist import", "gnomeicu\n");
 		rewind(f);
--- a/src/connection.h	Thu Mar 11 20:50:15 2004 +0000
+++ b/src/connection.h	Fri Mar 12 01:55:54 2004 +0000
@@ -94,7 +94,12 @@
 	int evil;                    /**< Warning level for AIM (why is
 	                                  this here?)                        */
 
-	gboolean wants_to_die;	     /**< Wants to Die state.                */
+	gboolean wants_to_die;	     /**< Wants to Die state.  This is set
+	                                  when the user chooses to sign off,
+	                                  or when the protocol is
+	                                  disconnected and should not be
+	                                  automatically reconnected
+	                                  (incorrect password, etc.)         */
 	guint disconnect_timeout;    /**< Timer used for nasty stack tricks  */
 };
 
--- a/src/protocols/oscar/oscar.c	Thu Mar 11 20:50:15 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Fri Mar 12 01:55:54 2004 +0000
@@ -4977,7 +4977,7 @@
 			   "ssi: syncing local list and server list\n");
 
 	if ((timestamp == 0) || (numitems == 0)) {
-		gaim_notify_error(gc, NULL, "Got AIM SSI with a 0 timestamp or 0 numitems, not syncing, tell KingAnt!  And tell him if your buddy list actually works or not.  Thanks!  Oh, IM him at markdoliner on AIM/ICQ.", NULL);
+		gaim_debug(GAIM_DEBUG_INFO, "oscar", "Got AIM SSI with a 0 timestamp or 0 numitems--not syncing.  This probably means your buddy list is empty.", NULL);
 		return 1;
 	}