changeset 8896:136b4e159d04

[gaim-migrate @ 9665] Fix a gadu-gadu warning about the number of steps when signing on. And make debugging info go to the debug window rather than spewing all over my pretty terminal. I have to get it dry cleaned now. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 06 May 2004 22:38:01 +0000
parents a4c2a6ab4322
children 8ffd1679df93
files src/protocols/gg/common.c src/protocols/gg/gg.c
diffstat 2 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/gg/common.c	Thu May 06 20:16:14 2004 +0000
+++ b/src/protocols/gg/common.c	Thu May 06 22:38:01 2004 +0000
@@ -1,4 +1,4 @@
-/* $Id: common.c 3850 2002-10-16 19:57:03Z hermanator $ */
+/* $Id: common.c 9665 2004-05-06 22:38:01Z thekingant $ */
 
 /*
  *  (C) Copyright 2001 Wojtek Kaniewski <wojtekka@irc.pl>,
@@ -18,6 +18,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "debug.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #ifndef _WIN32
@@ -64,7 +66,8 @@
 	
 	if ((gg_debug_level & level)) {
 		va_start(ap, format);
-		vprintf(format, ap);
+		/* vprintf(format, ap); */
+		gaim_debug_vargs(GAIM_DEBUG_INFO, "gg", format, ap);
 		va_end(ap);
 	}
 }
--- a/src/protocols/gg/gg.c	Thu May 06 20:16:14 2004 +0000
+++ b/src/protocols/gg/gg.c	Thu May 06 22:38:01 2004 +0000
@@ -1,6 +1,6 @@
 /*
  * gaim - Gadu-Gadu Protocol Plugin
- * $Id: gg.c 9558 2004-04-24 12:19:43Z thekingant $
+ * $Id: gg.c 9665 2004-05-06 22:38:01Z thekingant $
  *
  * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
  *
@@ -606,16 +606,16 @@
 	gaim_debug(GAIM_DEBUG_INFO, "gg", "Checking State.\n");
 	switch (gd->sess->state) {
 	case GG_STATE_READING_DATA:
-		gaim_connection_update_progress(gc, _("Reading data"), 2, GG_CONNECT_STEPS);
+		gaim_connection_update_progress(gc, _("Reading data"), 1, GG_CONNECT_STEPS);
 		break;
 	case GG_STATE_CONNECTING_GG:
-		gaim_connection_update_progress(gc, _("Balancer handshake"), 3, GG_CONNECT_STEPS);
+		gaim_connection_update_progress(gc, _("Balancer handshake"), 2, GG_CONNECT_STEPS);
 		break;
 	case GG_STATE_READING_KEY:
-		gaim_connection_update_progress(gc, _("Reading server key"), 4, GG_CONNECT_STEPS);
+		gaim_connection_update_progress(gc, _("Reading server key"), 3, GG_CONNECT_STEPS);
 		break;
 	case GG_STATE_READING_REPLY:
-		gaim_connection_update_progress(gc, _("Exchanging key hash"), 5, GG_CONNECT_STEPS);
+		gaim_connection_update_progress(gc, _("Exchanging key hash"), 4, GG_CONNECT_STEPS);
 		break;
 	default:
 		gaim_debug(GAIM_DEBUG_INFO, "gg", "No State found\n");
@@ -708,7 +708,7 @@
 
 	gd->sess = g_new0(struct gg_session, 1);
 
-	gaim_connection_update_progress(gc, _("Looking up GG server"), 1, GG_CONNECT_STEPS);
+	gaim_connection_update_progress(gc, _("Looking up GG server"), 0, GG_CONNECT_STEPS);
 
 	if (invalid_uin(account->username)) {
 		gaim_connection_error(gc, _("Invalid Gadu-Gadu UIN specified"));