[Gaim-commits] CVS: gaim/src account.c,1.134,1.135 account.h,1.62,1.63 connection.h,1.43,1.44 signals.c,1.24,1.25

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

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

Modified Files:
	account.c account.h connection.h signals.c 
Log Message:
A few other minor changes.


Index: account.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -p -r1.134 -r1.135
--- account.c	27 Mar 2005 19:12:45 -0000	1.134
+++ account.c	27 Mar 2005 22:48:03 -0000	1.135
@@ -767,6 +767,10 @@ request_password_ok_cb(GaimAccount *acco
 	gaim_connection_new(account, FALSE, entry);
 }
 
+/*
+ * TODO: Make the entry box a required field, and add a
+ *       "save password" checkbox.
+ */
 static void
 request_password(GaimAccount *account)
 {
@@ -774,6 +778,9 @@ request_password(GaimAccount *account)
 	gchar *escaped;
 	const gchar *username;
 
+	/* Close any previous password request windows */
+	gaim_request_close_with_handle(account);
+
 	username = gaim_account_get_username(account);
 	escaped = g_markup_escape_text(username, strlen(username));
 	primary = g_strdup_printf(_("Enter password for %s (%s)"), escaped,
@@ -805,7 +812,7 @@ gaim_account_connect(GaimAccount *accoun
 
 		message = g_strdup_printf(_("Missing protocol plugin for %s"),
 			gaim_account_get_username(account));
-		gaim_notify_error(NULL, _("Connection Error"), message, NULL);
+		gaim_notify_error(account, _("Connection Error"), message, NULL);
 		g_free(message);
 		return;
 	}
@@ -866,7 +873,7 @@ change_password_cb(GaimAccount *account,
 
 	if (g_utf8_collate(new_pass_1, new_pass_2))
 	{
-		gaim_notify_error(NULL, NULL,
+		gaim_notify_error(account, NULL,
 						  _("New passwords do not match."), NULL);
 
 		return;
@@ -875,7 +882,7 @@ change_password_cb(GaimAccount *account,
 	if (orig_pass == NULL || new_pass_1 == NULL || new_pass_2 == NULL ||
 		*orig_pass == '\0' || *new_pass_1 == '\0' || *new_pass_2 == '\0')
 	{
-		gaim_notify_error(NULL, NULL,
+		gaim_notify_error(account, NULL,
 						  _("Fill out all fields completely."), NULL);
 		return;
 	}
@@ -1697,6 +1704,9 @@ gaim_accounts_delete(GaimAccount *accoun
 
 	g_return_if_fail(account != NULL);
 
+	gaim_notify_close_with_handle(account);
+	gaim_request_close_with_handle(account);
+
 	gaim_accounts_remove(account);
 
 	/* Remove this account's buddies */

Index: account.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -p -r1.62 -r1.63
--- account.h	26 Mar 2005 23:25:13 -0000	1.62
+++ account.h	27 Mar 2005 22:48:04 -0000	1.63
@@ -297,7 +297,7 @@ void gaim_account_set_status(GaimAccount
  * @param account   The account.
  * @param status_id The ID of the status.
  * @param active    The active state.
- * @param vargs     The va_list of attributes.
+ * @param args      The va_list of attributes.
  */
 void gaim_account_set_status_vargs(GaimAccount *account,
 								   const char *status_id,

Index: connection.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -p -r1.43 -r1.44
--- connection.h	27 Mar 2005 01:59:39 -0000	1.43
+++ connection.h	27 Mar 2005 22:48:04 -0000	1.44
@@ -125,9 +125,9 @@ extern "C" {
  * have called gaim_account_set_status(account, "away").
  * (And this will call gaim_account_connect() automatically).
  *
- * @param account The account the connection should be connecting to.
- * @param register Whether we are registering a new account or just
- *        trying to do a normal signon.
+ * @param account  The account the connection should be connecting to.
+ * @param regist   Whether we are registering a new account or just
+ *                 trying to do a normal signon.
  * @param password The password to use.
  */
 void gaim_connection_new(GaimAccount *account, gboolean regist,

Index: signals.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/signals.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -p -r1.24 -r1.25
--- signals.c	6 Mar 2005 01:27:39 -0000	1.24
+++ signals.c	27 Mar 2005 22:48:04 -0000	1.25
@@ -288,7 +288,7 @@ signal_connect_common(void *instance, co
 	handler_data->data      = data;
 	handler_data->use_vargs = use_vargs;
 	handler_data->priority = priority;
-	
+
 	signal_data->handlers = g_list_insert_sorted(signal_data->handlers, handler_data, (GCompareFunc)handler_priority);
 	signal_data->handler_count++;
 	signal_data->next_handler_id++;