[Gaim-commits] CVS: gaim/src account.c,1.132,1.133 gtkstatusbox.c,1.5,1.6

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8170/src

Modified Files:
	account.c gtkstatusbox.c 
Log Message:
This fixes the auto-reconnect plugin bug.  The whole "wants_to_die"
thing feels a little dirty.  Eh, it's fine for now.

Also, the gtkstatusbox starts off in the "available" state instead
of using the GaimStatus of whatever account is online.  This negates
the effect of saving the GaimStatuses for an account.

More tomorrow...


Index: account.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -p -r1.132 -r1.133
--- account.c	27 Mar 2005 00:33:58 -0000	1.132
+++ account.c	27 Mar 2005 05:17:18 -0000	1.133
@@ -1156,6 +1156,7 @@ gaim_account_set_status_vargs(GaimAccoun
 		(gaim_status_type_get_primitive(status_type) == GAIM_STATUS_OFFLINE) &&
 		gaim_account_is_connected(account))
 	{
+		account->gc->wants_to_die = TRUE;
 		gaim_account_disconnect(account);
 
 		/* No need to actually set the status, so we just exit */

Index: gtkstatusbox.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkstatusbox.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- gtkstatusbox.c	20 Mar 2005 01:16:43 -0000	1.5
+++ gtkstatusbox.c	27 Mar 2005 05:17:18 -0000	1.6
@@ -419,6 +419,10 @@ static void remove_typing_cb(GtkGaimStat
 	gtk_gaim_status_box_refresh(box);
 }
 
+/*
+ * TODO: This callback is triggered immediately, without the user actually
+ *       changing anything.  That's bad.
+ */
 static void gtk_gaim_status_box_changed(GtkComboBox *box)
 {
 	GtkGaimStatusBox *status_box = GTK_GAIM_STATUS_BOX(box);