Pidgin

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

Modified Files:
	status.c account.c 
Log Message:
Changing your away message by just typing new text into the GtkStatusBox
works again.  I broke that earlier today when I fix a small bit of the
which-status-is-the-active-status-in-this-presence thing.

I also removed the log in or out in account.c depending on the status that
was set.  This was already handled by most of the PRPLs, and I feel that's
the best way to do it.

There was some talk of removing the login and close PRPL callbacks, and
I'm not entirely against that, but things are starting to get pretty good.
I don't see a need to change that right now.

Also, I'm going to add a link to my (Mark Doliner) blog, for google,
I guess: http://www.livejournal.com/users/thekingant/


Index: status.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/status.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -p -r1.55 -r1.56
--- status.c	27 Mar 2005 19:12:52 -0000	1.55
+++ status.c	28 Mar 2005 04:26:33 -0000	1.56
@@ -722,7 +722,7 @@ status_has_changed(GaimStatus *status)
 	if (gaim_status_is_exclusive(status))
 	{
 		old_status = gaim_presence_get_active_status(presence);
-		if (old_status != NULL)
+		if (old_status != NULL && (old_status != status))
 			old_status->active = FALSE;
 		presence->active_status = status;
 	}

Index: account.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -p -r1.135 -r1.136
--- account.c	27 Mar 2005 22:48:03 -0000	1.135
+++ account.c	28 Mar 2005 04:26:33 -0000	1.136
@@ -278,7 +278,7 @@ accounts_to_xmlnode(void)
 	xmlnode *node, *child;
 	GList *cur;
 
-	node = xmlnode_new("accounts");
+	node = xmlnode_new("account");
 	xmlnode_set_attrib(node, "version", "1.0");
 
 	for (cur = gaim_accounts_get_all(); cur != NULL; cur = cur->next)
@@ -298,7 +298,7 @@ sync_accounts(void)
 
 	if (!accounts_loaded)
 	{
-		gaim_debug_error("accounts", "Attempted to save accounts before "
+		gaim_debug_error("account", "Attempted to save accounts before "
 						 "they were read!\n");
 		return;
 	}
@@ -1140,51 +1140,28 @@ gaim_account_set_status_vargs(GaimAccoun
 							  gboolean active, va_list args)
 {
 	GaimStatus *status;
-	GaimStatusType *status_type;
 
 	g_return_if_fail(account   != NULL);
 	g_return_if_fail(status_id != NULL);
 
+	gaim_debug_info("account", "Changing status for %s, setting %s to %d\n",
+					gaim_account_get_username(account), status_id, active);
+
 	status = gaim_account_get_status(account, status_id);
 	if (status == NULL)
 	{
-		gaim_debug_error("accounts",
+		gaim_debug_error("account",
 				   "Invalid status ID %s for account %s (%s)\n",
 				   status_id, gaim_account_get_username(account),
 				   gaim_account_get_protocol_id(account));
 		return;
 	}
-	status_type = gaim_status_get_type(status);
-
-	/*
-	 * If this account should be disconnected, but is online, then disconnect.
-	 */
-	if (active &&
-		(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 */
-		return;
-	}
 
 	/* Our current statuses are saved to accounts.xml */
 	schedule_accounts_save();
 
 	if (active || gaim_status_is_independent(status))
 		gaim_status_set_active_with_attrs(status, active, args);
-
-	/*
-	 * If this account should be connected, but is not, then connect.
-	 */
-	if (active &&
-		(gaim_status_type_get_primitive(status_type) != GAIM_STATUS_OFFLINE) &&
-		!gaim_account_is_connected(account))
-	{
-		gaim_account_connect(account);
-	}
 }
 
 void
@@ -1759,7 +1736,7 @@ gaim_accounts_reorder(GaimAccount *accou
 	index = g_list_index(accounts, account);
 
 	if (index == -1) {
-		gaim_debug_error("accounts",
+		gaim_debug_error("account",
 				   "Unregistered account (%s) discovered during reorder!\n",
 				   gaim_account_get_username(account));
 		return;

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

Modified Files:
	gtkplugin.h gtkprefs.c plugin.h 
Log Message:
Plugin preference frames are now removed when the plugin is unloaded.
I also cleaned some stuff up.
   3 files changed, 105 insertions(+), 157 deletions(-)

"A designer knows he has achieved perfection not when there is
 nothing left to add, but when there is nothing left to take away."


Index: gtkplugin.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkplugin.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- gtkplugin.h	20 Aug 2004 05:11:30 -0000	1.6
+++ gtkplugin.h	28 Mar 2005 03:55:26 -0000	1.7
@@ -37,7 +37,7 @@ struct _GaimGtkPluginUiInfo
 {
 	GtkWidget *(*get_config_frame)(GaimPlugin *plugin);
 
-	void *iter;                                           /**< Reserved */
+	int page_num;                                         /**< Reserved */
 };
 
 #define GAIM_GTK_PLUGIN_TYPE "gtk"

Index: gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -p -r1.253 -r1.254
--- gtkprefs.c	20 Mar 2005 01:14:57 -0000	1.253
+++ gtkprefs.c	28 Mar 2005 03:55:27 -0000	1.254
@@ -64,14 +64,14 @@ static GtkWidget *prefs_proxy_frame = NU
 static GtkWidget *prefs = NULL;
 static GtkWidget *debugbutton = NULL;
 static int notebook_page = 0;
-static GtkTreeIter proto_iter, plugin_iter;
+static GtkTreeIter plugin_iter;
 
 /*
  * PROTOTYPES
  */
-static GtkTreeIter *prefs_notebook_add_page(const char*, GdkPixbuf*,
-											GtkWidget*, GtkTreeIter*,
-											GtkTreeIter*, int);
+static int prefs_notebook_add_page(const char*, GdkPixbuf*,
+									GtkWidget*, GtkTreeIter*,
+									GtkTreeIter*, int);
 static void delete_prefs(GtkWidget *, void *);
 static void update_plugin_list(void *data);
 
@@ -127,7 +127,7 @@ gaim_gtk_prefs_labeled_spin_button(GtkWi
 	}
 
 	gaim_set_accessible_label (spin, label);
-	
+
 	return hbox;
 }
 
@@ -337,10 +337,98 @@ gaim_gtk_prefs_dropdown(GtkWidget *box, 
 }
 
 static void
+add_plugin_prefs(GaimPlugin *plugin)
+{
+	/*
+	 * NOTE: This is basically the same check as before
+	 *       (plug->type == plugin), but now there aren't plugin types.
+	 *       Not yet, anyway. I want to do a V2 of the plugin API.
+	 *       The thing is, we should have a flag specifying the UI type,
+	 *       or just whether it's a general plugin or a UI-specific
+	 *       plugin. We should only load this if it's UI-specific.
+	 *
+	 *         -- ChipX86
+	 */
+	if (GAIM_IS_GTK_PLUGIN(plugin))
+	{
+		GtkWidget *config_frame;
+		GaimGtkPluginUiInfo *ui_info;
+
+		ui_info = GAIM_GTK_PLUGIN_UI_INFO(plugin);
+		config_frame = gaim_gtk_plugin_get_config_frame(plugin);
+
+		if (config_frame != NULL)
+		{
+			ui_info->page_num =
+				prefs_notebook_add_page(_(plugin->info->name), NULL,
+										config_frame, NULL,
+										&plugin_iter, notebook_page++);
+		}
+	}
+
+	if (GAIM_PLUGIN_HAS_PREF_FRAME(plugin))
+	{
+		GtkWidget *gtk_frame;
+		GaimPluginUiInfo *prefs_info;
+
+		prefs_info = GAIM_PLUGIN_UI_INFO(plugin);
+		prefs_info->frame = prefs_info->get_plugin_pref_frame(plugin);
+		gtk_frame = gaim_gtk_plugin_pref_create_frame(prefs_info->frame);
+
+		if (GTK_IS_WIDGET(gtk_frame))
+		{
+			prefs_info->page_num =
+				prefs_notebook_add_page(_(plugin->info->name), NULL,
+										gtk_frame, NULL,
+										(plugin->info->type == GAIM_PLUGIN_PROTOCOL) ?  NULL : &plugin_iter,
+										notebook_page++);
+		} else if(prefs_info->frame) {
+			/* in the event that there is a pref frame and we can
+			 * not make a widget out of it, we free the
+			 * pluginpref frame --Gary
+			 */
+			gaim_plugin_pref_frame_destroy(prefs_info->frame);
+		}
+	}
+}
+
+static void
+delete_plugin_prefs(GaimPlugin *plugin)
+{
+	if (GAIM_IS_GTK_PLUGIN(plugin))
+	{
+		GaimGtkPluginUiInfo *ui_info;
+
+		ui_info = GAIM_GTK_PLUGIN_UI_INFO(plugin);
+
+		if (ui_info != NULL && ui_info->page_num > 0) {
+			gtk_notebook_remove_page(GTK_NOTEBOOK(prefsnotebook),
+									 ui_info->page_num);
+		}
+	}
+
+	if (GAIM_PLUGIN_HAS_PREF_FRAME(plugin))
+	{
+		GaimPluginUiInfo *prefs_info;
+
+		prefs_info = GAIM_PLUGIN_UI_INFO(plugin);
+
+		if (prefs_info->frame != NULL) {
+			gaim_plugin_pref_frame_destroy(prefs_info->frame);
+			prefs_info->frame = NULL;
+		}
+
+		if (prefs_info->page_num > 0) {
+			gtk_notebook_remove_page(GTK_NOTEBOOK(prefsnotebook),
+									 prefs_info->page_num);
+		}
+	}
+}
+
+static void
 delete_prefs(GtkWidget *asdf, void *gdsa)
 {
 	GList *l;
-	GaimPlugin *plug;
 
 	/* Close any "select sound" request dialogs */
 	gaim_request_close_with_handle(prefs);
@@ -356,35 +444,9 @@ delete_prefs(GtkWidget *asdf, void *gdsa
 	notebook_page = 0;
 	smiley_theme_store = NULL;
 
-	for (l = gaim_plugins_get_loaded(); l != NULL; l = l->next) {
-		plug = l->data;
-
-		if (GAIM_IS_GTK_PLUGIN(plug)) {
-			GaimGtkPluginUiInfo *ui_info;
-
-			ui_info = GAIM_GTK_PLUGIN_UI_INFO(plug);
-
-			if (ui_info->iter != NULL) {
-				g_free(ui_info->iter);
-				ui_info->iter = NULL;
-			}
-		}
-
-		if(GAIM_PLUGIN_HAS_PREF_FRAME(plug)) {
-			GaimPluginUiInfo *prefs_info;
-
-			prefs_info = GAIM_PLUGIN_UI_INFO(plug);
-
-			if(prefs_info->frame != NULL) {
-				gaim_plugin_pref_frame_destroy(prefs_info->frame);
-				prefs_info->frame = NULL;
-			}
-
-			if(prefs_info->iter != NULL) {
-				g_free(prefs_info->iter);
-				prefs_info->iter = NULL;
-			}
-		}
+	for (l = gaim_plugins_get_loaded(); l != NULL; l = l->next)
+	{
+		delete_plugin_prefs(l->data);
 	}
 }
 
@@ -1829,85 +1891,10 @@ static void plugin_load (GtkCellRenderer
 
 	if (!gaim_plugin_is_loaded(plug)) {
 		gaim_plugin_load(plug);
-
-		/*
-		 * NOTE: This is basically the same check as before
-		 *       (plug->type == plugin), but now there aren't plugin types.
-		 *       Not yet, anyway. I want to do a V2 of the plugin API.
-		 *       The thing is, we should have a flag specifying the UI type,
-		 *       or just whether it's a general plugin or a UI-specific
-		 *       plugin. We should only load this if it's UI-specific.
-		 *
-		 *         -- ChipX86
-		 */
-		if (GAIM_IS_GTK_PLUGIN(plug))
-		{
-			GtkWidget *config_frame;
-			GaimGtkPluginUiInfo *ui_info;
-
-			ui_info = GAIM_GTK_PLUGIN_UI_INFO(plug);
-			config_frame = gaim_gtk_plugin_get_config_frame(plug);
-
-			if (config_frame != NULL) {
-				ui_info->iter = g_new0(GtkTreeIter, 1);
-				prefs_notebook_add_page(_(plug->info->name), NULL,
-							config_frame, ui_info->iter,
-							&plugin_iter, notebook_page++);
-			}
-		}
-
-		if(GAIM_PLUGIN_HAS_PREF_FRAME(plug)) {
-			GtkTreeIter iter;
-			GtkWidget *pref_frame;
-			GaimPluginUiInfo *prefs_info;
-
-			if(plug->info->type == GAIM_PLUGIN_PROTOCOL)
-				iter = proto_iter;
-			else
-				iter = plugin_iter;
-
-			prefs_info = GAIM_PLUGIN_UI_INFO(plug);
-			prefs_info->frame = prefs_info->get_plugin_pref_frame(plug);
-			pref_frame = gaim_gtk_plugin_pref_create_frame(prefs_info->frame);
-
-			if(pref_frame != NULL) {
-				prefs_info->iter = g_new0(GtkTreeIter, 1);
-				prefs_notebook_add_page(_(plug->info->name), NULL,
-										pref_frame, prefs_info->iter,
-										&iter, notebook_page++);
-			}
-		}
+		add_plugin_prefs(plug);
 	}
 	else {
-		if (GAIM_IS_GTK_PLUGIN(plug)) {
-			GaimGtkPluginUiInfo *ui_info;
-
-			ui_info = GAIM_GTK_PLUGIN_UI_INFO(plug);
-
-			if (ui_info != NULL && ui_info->iter != NULL) {
-				g_free(ui_info->iter);
-				ui_info->iter = NULL;
-			}
-		}
-
-		if (GAIM_PLUGIN_HAS_PREF_FRAME(plug)) {
-			GaimPluginUiInfo *prefs_info;
-
-			prefs_info = GAIM_PLUGIN_UI_INFO(plug);
-
-			if(prefs_info != NULL) {
-				if(prefs_info->frame != NULL) {
-					gaim_plugin_pref_frame_destroy(prefs_info->frame);
-					prefs_info->frame = NULL;
-				}
-
-				if(prefs_info->iter != NULL) {
-					g_free(prefs_info->iter);
-					prefs_info->iter = NULL;
-				}
-			}
-		}
-
+		delete_plugin_prefs(plug);
 		gaim_plugin_unload(plug);
 	}
 
@@ -2085,7 +2072,7 @@ static GtkWidget *plugin_page ()
 	return ret;
 }
 
-GtkTreeIter *prefs_notebook_add_page(const char *text,
+int prefs_notebook_add_page(const char *text,
 				     GdkPixbuf *pixbuf,
 				     GtkWidget *page,
 				     GtkTreeIter *iter,
@@ -2100,14 +2087,13 @@ GtkTreeIter *prefs_notebook_add_page(con
 		g_object_unref(pixbuf);
 	if (icon)
 		g_object_unref(icon);
-	gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
-	return iter;
+
+	return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
 }
 
 void prefs_notebook_init() {
 	GtkTreeIter p, c, c2;
 	GList *l;
-	GaimPlugin *plug;
 	prefs_notebook_add_page(_("Buddy List"), NULL, list_page(), &c, &p, notebook_page++);
 	prefs_notebook_add_page(_("Conversations"), NULL, conv_page(), &c, &p, notebook_page++);
 	prefs_notebook_add_page(_("Message Text"), NULL, messages_page(), &c2, &c, notebook_page++);
@@ -2128,45 +2114,7 @@ void prefs_notebook_init() {
 		prefs_notebook_add_page(_("Plugins"), NULL, plugin_page(), &plugin_iter, NULL, notebook_page++);
 
 		for (l = gaim_plugins_get_loaded(); l != NULL; l = l->next) {
-			plug = (GaimPlugin *)l->data;
-
-			if (GAIM_IS_GTK_PLUGIN(plug)) {
-				GtkWidget *config_frame;
-				GaimGtkPluginUiInfo *ui_info;
-
-				ui_info = GAIM_GTK_PLUGIN_UI_INFO(plug);
-				config_frame = gaim_gtk_plugin_get_config_frame(plug);
-
-				if (config_frame != NULL) {
-					ui_info->iter = g_new0(GtkTreeIter, 1);
-					prefs_notebook_add_page(_(plug->info->name), NULL,
-											config_frame, ui_info->iter,
-											&plugin_iter, notebook_page++);
-				}
-			}
-
-			if(GAIM_PLUGIN_HAS_PREF_FRAME(plug)) {
-				GtkWidget *gtk_frame;
-				GaimPluginUiInfo *prefs_info;
-
-				prefs_info = GAIM_PLUGIN_UI_INFO(plug);
-				prefs_info->frame = prefs_info->get_plugin_pref_frame(plug);
-				gtk_frame = gaim_gtk_plugin_pref_create_frame(prefs_info->frame);
-
-				if(GTK_IS_WIDGET(gtk_frame)) {
-					prefs_info->iter = g_new0(GtkTreeIter, 1);
-					prefs_notebook_add_page(_(plug->info->name), NULL,
-										gtk_frame, prefs_info->iter,
-										(plug->info->type == GAIM_PLUGIN_PROTOCOL) ?  NULL : &plugin_iter,
-										notebook_page++);
-				} else if(prefs_info->frame) {
-					/* in the event that there is a pref frame and we can
-					 * not make a widget out of it, we free the
-					 * pluginpref frame --Gary
-					 */
-					gaim_plugin_pref_frame_destroy(prefs_info->frame);
-				}
-			}
+			add_plugin_prefs(l->data);
 		}
 	}
 }

Index: plugin.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/plugin.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -p -r1.37 -r1.38
--- plugin.h	21 Mar 2005 02:12:51 -0000	1.37
+++ plugin.h	28 Mar 2005 03:55:29 -0000	1.38
@@ -146,7 +146,7 @@ struct _GaimPlugin
 struct _GaimPluginUiInfo {
 	GaimPluginPrefFrame *(*get_plugin_pref_frame)(GaimPlugin *plugin);
 
-	void *iter;                                           /**< Reserved */
+	int page_num;                                         /**< Reserved */
 	GaimPluginPrefFrame *frame;                           /**< Reserved */
 };

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++;

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

Modified Files:
	autorecon.c timestamp.c 
Log Message:
Plugins don't need to explicitly remove signals they have connected.
It's done automatically by plugin.c when the plugin is unloaded.


Index: autorecon.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/autorecon.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -p -r1.57 -r1.58
--- autorecon.c	27 Mar 2005 05:02:25 -0000	1.57
+++ autorecon.c	27 Mar 2005 22:44:59 -0000	1.58
@@ -265,12 +265,6 @@ plugin_load(GaimPlugin *plugin)
 static gboolean
 plugin_unload(GaimPlugin *plugin)
 {
-	gaim_signal_disconnect(gaim_connections_get_handle(), "signed-off",
-			plugin, GAIM_CALLBACK(reconnect));
-
-	gaim_signal_disconnect(gaim_connections_get_handle(), "signed-on",
-			plugin, GAIM_CALLBACK(reconnected));
-
 	g_hash_table_destroy(hash);
 	hash = NULL;
 

Index: timestamp.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/timestamp.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -p -r1.39 -r1.40
--- timestamp.c	24 Dec 2004 00:05:17 -0000	1.39
+++ timestamp.c	27 Mar 2005 22:44:59 -0000	1.40
@@ -255,14 +255,6 @@ static gboolean
 plugin_unload(GaimPlugin *plugin)
 {
 	GList *cnvs;
-	void *conv_handle = gaim_conversations_get_handle();
-
-	gaim_signal_disconnect(conv_handle, "conversation-created",
-					plugin, GAIM_CALLBACK(timestamp_new_convo));
-	gaim_signal_disconnect(conv_handle, "receiving-im-msg",
-					plugin, GAIM_CALLBACK(timestamp_receiving_msg));
-	gaim_signal_disconnect(conv_handle, "displaying-im-msg",
-					plugin, GAIM_CALLBACK(timestamp_displaying_conv_msg));
 
 	destroy_timer_list();

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

Removed Files:
	gaim2blt.pl licq2gaim.pl 
Log Message:
These were written for the old buddy list style.


--- gaim2blt.pl DELETED ---

--- licq2gaim.pl DELETED ---

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

Modified Files:
	yahoo.c 
Log Message:
Some TLC for Jabber and Yahoo!.  Jabber no longer crashes at signoff.

Is Left Eye Lopez the one that burned down that guy's house?


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -p -r1.311 -r1.312
--- yahoo.c	27 Mar 2005 17:50:35 -0000	1.311
+++ yahoo.c	27 Mar 2005 19:29:18 -0000	1.312
@@ -2760,6 +2760,7 @@ int yahoo_send_typing(GaimConnection *gc
 static void yahoo_set_status(GaimAccount *account, GaimStatus *status)
 {
 	GaimConnection *gc = gaim_account_get_connection(account);
+	gboolean connected = gaim_account_is_connected(account);
 	struct yahoo_data *yd;
 	struct yahoo_packet *pkt;
 	int old_status;
@@ -2770,14 +2771,17 @@ static void yahoo_set_status(GaimAccount
 	id = gaim_status_get_id(status);
 	if (!gaim_status_is_active(status))
 		return;
-	if (strcmp(id, YAHOO_STATUS_TYPE_OFFLINE) && !gc) {
+	if (strcmp(id, YAHOO_STATUS_TYPE_OFFLINE) && !connected) {
 		gaim_account_connect(account);
 		return;
-	} else if (!strcmp(id, YAHOO_STATUS_TYPE_OFFLINE) && gc) {
+	} else if (!strcmp(id, YAHOO_STATUS_TYPE_OFFLINE) && connected) {
 		gaim_account_disconnect(account);
 		return;
 	}
 
+	if (!connected)
+		return;
+
 	yd = (struct yahoo_data *)gc->proto_data;
 	old_status = yd->current_status;

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

Modified Files:
	connection.c 
Log Message:
Some TLC for Jabber and Yahoo!.  Jabber no longer crashes at signoff.

Is Left Eye Lopez the one that burned down that guy's house?


Index: connection.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -p -r1.80 -r1.81
--- connection.c	27 Mar 2005 19:12:52 -0000	1.80
+++ connection.c	27 Mar 2005 19:29:17 -0000	1.81
@@ -82,6 +82,9 @@ gaim_connection_new(GaimAccount *account
 
 	g_return_if_fail(account != NULL);
 
+	if (gaim_account_is_connected(account))
+		return;
+
 	prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
 
 	if (prpl != NULL)

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

Modified Files:
	presence.c 
Log Message:
Some TLC for Jabber and Yahoo!.  Jabber no longer crashes at signoff.

Is Left Eye Lopez the one that burned down that guy's house?


Index: presence.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/presence.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -p -r1.72 -r1.73
--- presence.c	26 Mar 2005 20:08:40 -0000	1.72
+++ presence.c	27 Mar 2005 19:29:17 -0000	1.73
@@ -91,6 +91,8 @@ void jabber_presence_send(GaimAccount *a
 {
 	GaimConnection *gc = NULL;
 	JabberStream *js = NULL;
+	gboolean connected;
+	int primitive;
 	xmlnode *presence, *x, *photo;
 	char *stripped = NULL;
 	const char *msg;
@@ -100,15 +102,21 @@ void jabber_presence_send(GaimAccount *a
 	if(!gaim_status_is_active(status))
 		return;
 
-	if(!account) return ;
-	gc = account->gc;
-	
-	if (!gc && strcmp(gaim_status_get_id(status), "offline"))
+	connected = gaim_account_is_connected(account);
+	primitive = gaim_status_type_get_primitive(gaim_status_get_type(status));
+
+	if(primitive != GAIM_STATUS_OFFLINE && !connected) {
 		gaim_account_connect(account);
-	
-	if(!gc) return;
-	js= gc->proto_data;
-	
+	} else if(primitive == GAIM_STATUS_OFFLINE && connected) {
+		gaim_account_disconnect(account);
+	}
+
+	if(!connected)
+		return;
+
+	gc = gaim_account_get_connection(account);
+	js = gc->proto_data;
+
 	gaim_status_to_jabber(status, &state, &msg, &priority);
 
 	if(msg)

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

Modified Files:
	account.c connection.c status.c status.h 
Log Message:
Some fairly clutch changes to how accounts set their statuses.  This
gets rid of a lot of those g_assertion warnings.

My Girlfriend: Dad, why do we have so many forks?
      Her Dad: Well, it's like the lord said, "Go fork and multiply."


Index: account.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -p -r1.133 -r1.134
--- account.c	27 Mar 2005 05:17:18 -0000	1.133
+++ account.c	27 Mar 2005 19:12:45 -0000	1.134
@@ -1163,10 +1163,11 @@ gaim_account_set_status_vargs(GaimAccoun
 		return;
 	}
 
-	/* TODO: Record the status in accounts.xml? */
+	/* Our current statuses are saved to accounts.xml */
+	schedule_accounts_save();
 
-	gaim_status_set_active_with_attrs(status, active, args);
-	gaim_presence_set_status_active(gaim_account_get_presence(account), status_id, active);
+	if (active || gaim_status_is_independent(status))
+		gaim_status_set_active_with_attrs(status, active, args);
 
 	/*
 	 * If this account should be connected, but is not, then connect.

Index: connection.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -p -r1.79 -r1.80
--- connection.c	27 Mar 2005 17:50:27 -0000	1.79
+++ connection.c	27 Mar 2005 19:12:52 -0000	1.80
@@ -147,74 +147,68 @@ void
 gaim_connection_destroy(GaimConnection *gc)
 {
 	GaimAccount *account;
+	GList *wins;
+	GaimPresence *presence = NULL;
+	GaimPluginProtocolInfo *prpl_info = NULL;
 
 	g_return_if_fail(gc != NULL);
 
 	account = gaim_connection_get_account(gc);
 
-	if (gaim_connection_get_state(gc) != GAIM_DISCONNECTED)
-	{
-		GList *wins;
-		GaimPresence *presence = NULL;
-		GaimPluginProtocolInfo *prpl_info = NULL;
-
-		gaim_debug_info("connection", "Disconnecting connection %p\n", gc);
-
-		if (gaim_connection_get_state(gc) != GAIM_CONNECTING)
-			gaim_blist_remove_account(account);
-
-		gaim_signal_emit(gaim_connections_get_handle(), "signing-off", gc);
+	gaim_debug_info("connection", "Disconnecting connection %p\n", gc);
 
-		while (gc->buddy_chats)
-		{
-			GaimConversation *b = gc->buddy_chats->data;
+	if (gaim_connection_get_state(gc) != GAIM_CONNECTING)
+		gaim_blist_remove_account(account);
 
-			gc->buddy_chats = g_slist_remove(gc->buddy_chats, b);
-			gaim_conv_chat_left(GAIM_CONV_CHAT(b));
-		}
+	gaim_signal_emit(gaim_connections_get_handle(), "signing-off", gc);
 
-		if (gc->idle_timer > 0)
-			gaim_timeout_remove(gc->idle_timer);
-		gc->idle_timer = 0;
+	while (gc->buddy_chats)
+	{
+		GaimConversation *b = gc->buddy_chats->data;
 
-		update_keepalive(gc, FALSE);
+		gc->buddy_chats = g_slist_remove(gc->buddy_chats, b);
+		gaim_conv_chat_left(GAIM_CONV_CHAT(b));
+	}
 
-		if (gc->prpl != NULL)
-		{
-			prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+	if (gc->idle_timer > 0)
+		gaim_timeout_remove(gc->idle_timer);
+	gc->idle_timer = 0;
 
-			if (prpl_info->close)
-				(prpl_info->close)(gc);
-		}
+	update_keepalive(gc, FALSE);
 
-		connections = g_list_remove(connections, gc);
+	if (gc->prpl != NULL)
+	{
+		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
 
-		gaim_connection_set_state(gc, GAIM_DISCONNECTED);
+		if (prpl_info->close)
+			(prpl_info->close)(gc);
+	}
 
-		/* LOG	system_log(log_signoff, gc, NULL,
-		   OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON); */
-		gaim_signal_emit(gaim_connections_get_handle(), "signed-off", gc);
+	connections = g_list_remove(connections, gc);
 
-		presence = gaim_account_get_presence(account);
-		if (gaim_presence_is_online(presence) == TRUE)
-			gaim_presence_set_status_active(presence, "offline", TRUE);
+	gaim_connection_set_state(gc, GAIM_DISCONNECTED);
 
-		/*
-		 * XXX This is a hack! Remove this and replace it with a better event
-		 *     notification system.
-		 */
-		for (wins = gaim_get_windows(); wins != NULL; wins = wins->next) {
-			GaimConvWindow *win = (GaimConvWindow *)wins->data;
-			gaim_conversation_update(gaim_conv_window_get_conversation_at(win, 0),
-									 GAIM_CONV_ACCOUNT_OFFLINE);
-		}
+	/* LOG	system_log(log_signoff, gc, NULL,
+	   OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON); */
+	gaim_signal_emit(gaim_connections_get_handle(), "signed-off", gc);
 
-		gaim_request_close_with_handle(gc);
-		gaim_notify_close_with_handle(gc);
+	presence = gaim_account_get_presence(account);
+	if (gaim_presence_is_online(presence) == TRUE)
+		gaim_presence_set_status_active(presence, "offline", TRUE);
 
-		return;
+	/*
+	 * XXX This is a hack! Remove this and replace it with a better event
+	 *     notification system.
+	 */
+	for (wins = gaim_get_windows(); wins != NULL; wins = wins->next) {
+		GaimConvWindow *win = (GaimConvWindow *)wins->data;
+		gaim_conversation_update(gaim_conv_window_get_conversation_at(win, 0),
+								 GAIM_CONV_ACCOUNT_OFFLINE);
 	}
 
+	gaim_request_close_with_handle(gc);
+	gaim_notify_close_with_handle(gc);
+
 	gaim_debug_info("connection", "Destroying connection %p\n", gc);
 
 	gaim_account_set_connection(account, NULL);

Index: status.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/status.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -p -r1.54 -r1.55
--- status.c	26 Mar 2005 20:08:38 -0000	1.54
+++ status.c	27 Mar 2005 19:12:52 -0000	1.55
@@ -583,11 +583,16 @@ gaim_status_new(GaimStatusType *status_t
 	return status;
 }
 
+/*
+ * TODO: If the GaimStatus is in a GaimPresence, then
+ *       remove it from the GaimPresence?
+ */
 void
 gaim_status_destroy(GaimStatus *status)
 {
 	g_return_if_fail(status != NULL);
 
+	/* TODO: Don't do this is if the status is exclusive */
 	gaim_status_set_active(status, FALSE);
 
 	g_hash_table_destroy(status->attr_values);
@@ -708,7 +713,6 @@ status_has_changed(GaimStatus *status)
 	GaimStatus *old_status;
 
 	presence   = gaim_status_get_presence(status);
-	old_status = gaim_presence_get_active_status(presence);
 
 	/*
 	 * If this status is exclusive, then we must be setting it to "active."
@@ -717,33 +721,13 @@ status_has_changed(GaimStatus *status)
 	 */
 	if (gaim_status_is_exclusive(status))
 	{
-		const GList *l;
-
-		for (l = gaim_presence_get_statuses(presence); l != NULL; l = l->next)
-		{
-			GaimStatus *temp_status = l->data;
-
-			if (temp_status == status)
-				continue;
-
-			if (gaim_status_is_independent(temp_status))
-				continue;
-
-			if (gaim_status_is_active(temp_status))
-			{
-				/*
-				 * Since we don't want infinite recursion, we have to set
-				 * the active variable ourself instead of calling
-				 * gaim_status_set_active().
-				 */
-				temp_status->active = FALSE;
-
-				notify_status_update(presence, old_status, temp_status);
-
-				break;
-			}
-		}
+		old_status = gaim_presence_get_active_status(presence);
+		if (old_status != NULL)
+			old_status->active = FALSE;
+		presence->active_status = status;
 	}
+	else
+		old_status = NULL;
 
 	notify_status_update(presence, old_status, status);
 }
@@ -751,22 +735,7 @@ status_has_changed(GaimStatus *status)
 void
 gaim_status_set_active(GaimStatus *status, gboolean active)
 {
-	if (!active && gaim_status_is_exclusive(status))
-	{
-		gaim_debug_error("status",
-				   "Cannot deactivate an exclusive status (%s).\n",
-				   gaim_status_get_id(status));
-		return;
-	}
-
-	g_return_if_fail(status != NULL);
-
-	if (status->active == active)
-		return;
-
-	status->active = active;
-
-	status_has_changed(status);
+	gaim_status_set_active_with_attrs(status, active, NULL);
 }
 
 void
@@ -793,6 +762,7 @@ gaim_status_set_active_with_attrs(GaimSt
 	status->active = active;
 
 	/* Set any attributes */
+	if (args != NULL)
 	while ((id = va_arg(args, const char *)) != NULL)
 	{
 		GaimValue *value;
@@ -1276,10 +1246,6 @@ gaim_presence_set_status_active(GaimPres
 					status_id);
 			return;
 		}
-
-		if (presence->active_status != NULL)
-			gaim_status_set_active(presence->active_status, FALSE);
-		presence->active_status = status;
 	}
 
 	gaim_status_set_active(status, active);
@@ -1288,22 +1254,7 @@ gaim_presence_set_status_active(GaimPres
 void
 gaim_presence_switch_status(GaimPresence *presence, const char *status_id)
 {
-	GaimStatus *status;
-
-	g_return_if_fail(presence  != NULL);
-	g_return_if_fail(status_id != NULL);
-
-	status = gaim_presence_get_status(presence, status_id);
-
-	g_return_if_fail(status != NULL);
-
-	if (gaim_status_is_independent(status))
-		return;
-
-	if (presence->active_status != NULL)
-		gaim_status_set_active(presence->active_status, FALSE);
-
-	gaim_status_set_active(status, TRUE);
+	gaim_presence_set_status_active(presence, status_id, TRUE);
 }
 
 static void

Index: status.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/status.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -p -r1.20 -r1.21
--- status.h	26 Mar 2005 23:25:13 -0000	1.20
+++ status.h	27 Mar 2005 19:12:52 -0000	1.21
@@ -35,7 +35,7 @@
  * available statuses of the protocol.  AIM, for example, supports
  * and available state with an optional available message, an away
  * state with a mandatory message, and an invisible state (which is
- * technically "independant" of the other two, but we'll get into
+ * technically "independent" of the other two, but we'll get into
  * that later).  GaimStatusTypes are very permanent.  They are
  * hardcoded in each PRPL and will not change often.  And because
  * they are hardcoded, they do not need to be saved to any XML file.
@@ -55,6 +55,14 @@
  * is also a list of saved statuses that are written to the
  * status.xml file.  Also, each GaimStatus has a "savable" boolean.
  * If "savable" is set to FALSE then the status is NEVER saved.
+ * All GaimStatuses should be inside a GaimPresence.
+ *
+ *
+ * A GaimStatus is either "indepedent" or "exclusive."
+ * Independent statuses can be active or inactive and it doesn't
+ * affect anything else.  However, you can only have one exclusive
+ * status per GaimPresence.  If you active one exlusive status,
+ * then the previous exclusive status is automatically deactivated.
  *
  * A GaimPresence is like a collection of GaimStatuses (plus some
  * other random info).  For any buddy, or for any one of your accounts,
@@ -65,8 +73,6 @@
  * and it contains their current idle time.  GaimPresences are
  * never saved to disk.  The information they contain is only relevent
  * for the current GaimSession.
- *
- * TODO: Talk about independant statuses.
  */
 
 typedef struct _GaimStatusType      GaimStatusType;

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

Modified Files:
	oscar.c 
Log Message:
The Stu pointed out that this is wrong


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.742
retrieving revision 1.743
diff -u -d -p -r1.742 -r1.743
--- oscar.c	27 Mar 2005 17:50:30 -0000	1.742
+++ oscar.c	27 Mar 2005 18:05:52 -0000	1.743
@@ -5849,7 +5849,7 @@ oscar_set_status(GaimAccount *account, G
 	if (!gaim_status_is_active(status))
 		return;
 
-	if (primitive == !GAIM_STATUS_OFFLINE && !connected) {
+	if (primitive != GAIM_STATUS_OFFLINE && !connected) {
 		gaim_account_connect(account);
 	} else if (primitive == GAIM_STATUS_OFFLINE && connected) {
 		gaim_account_disconnect(account);

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

Modified Files:
	ChangeLog.API 
Log Message:
I'm glad I'm not a plugin author ;-)



Index: ChangeLog.API
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/ChangeLog.API,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -p -r1.45 -r1.46
--- ChangeLog.API	26 Mar 2005 02:43:43 -0000	1.45
+++ ChangeLog.API	27 Mar 2005 18:01:22 -0000	1.46
@@ -22,6 +22,21 @@ version 2.0.0cvs:
 	           of GaimBlistNodeActions to be created as a submenu of the item.
 	* Removed: gaim_escape_html(const char *html) (use
 	           g_markup_escape_text(html, -1) instead)
+	* Removed: gaim_accounts_sync, account changes are now scheduled to be saved
+	           automatically
+	* Removed: gaim_connection_connect
+	* Removed: gaim_connection_disconnect
+	* Removed: gaim_connection_register
+	* Removed: gaim_accounts_auto_login
+	* Changed: gaim_connection_new, gaim_account_connect and gaim_account_register
+	           no longer return a GaimConnection
+	* Added:   a password field to GaimConnection, which only persists for the
+	           session (when "remember password" is false, account->password is NEVER set)
+			   Use gaim_connection_get_password(GaimConnection *gc)
+	* Removed: serv_login
+	* Removed: serv_close
+	* Removed: serv_finish_login
+	* Changed: keep_alive in GaimConnection is renamed to keepalive
 
 	Signals:
 	* Changed: "received-im-msg and "received-chat-msg" to match, both

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

Modified Files:
	oscar.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.741
retrieving revision 1.742
diff -u -d -p -r1.741 -r1.742
--- oscar.c	27 Mar 2005 04:52:55 -0000	1.741
+++ oscar.c	27 Mar 2005 17:50:30 -0000	1.742
@@ -5066,7 +5066,6 @@ static int gaim_bosrights(aim_session_t 
 	od->rights.maxdenies = (guint)maxdenies;
 
 	gaim_connection_set_state(gc, GAIM_CONNECTED);
-	serv_finish_login(gc);
 
 	gaim_debug_info("oscar", "buddy list loaded\n");

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

Modified Files:
	jabber.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -p -r1.287 -r1.288
--- jabber.c	26 Mar 2005 23:25:15 -0000	1.287
+++ jabber.c	27 Mar 2005 17:50:28 -0000	1.288
@@ -832,7 +832,6 @@ void jabber_stream_set_state(JabberStrea
 			status = gaim_presence_get_active_status(gpresence);
 			jabber_presence_send(js->gc->account, status);
 			jabber_disco_items_server(js);
-			serv_finish_login(js->gc);
 			break;
 	}
 }

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

Modified Files:
	msgs.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: msgs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/msgs.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -p -r1.53 -r1.54
--- msgs.c	26 Mar 2005 02:43:45 -0000	1.53
+++ msgs.c	27 Mar 2005 17:50:28 -0000	1.54
@@ -437,7 +437,6 @@ void irc_msg_endmotd(struct irc_conn *ir
 		return;
 
 	gaim_connection_set_state(gc, GAIM_CONNECTED);
-	serv_finish_login (gc);
 
 	irc_blist_timeout(irc);
 	if (!irc->timer)

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

Modified Files:
	gg.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: gg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -p -r1.131 -r1.132
--- gg.c	26 Mar 2005 23:25:13 -0000	1.131
+++ gg.c	27 Mar 2005 17:50:27 -0000	1.132
@@ -178,12 +178,19 @@ static char *handle_errcode(GaimConnecti
 
 static void agg_set_status(GaimAccount *account, GaimStatus *status)
 {
-	GaimConnection *gc = gaim_account_get_connection(account);
-	struct agg_data *gd = (struct agg_data *)gc->proto_data;
-	int status_num = gd->own_status;
+	GaimConnection *gc;
+	struct agg_data *gd;
+	int status_num;
 	const char *status_id;
 	char *msg = NULL;
 
+	gc = gaim_account_get_connection(account);
+
+	if (gc == NULL)
+		return;
+
+	gd = (struct agg_data *)gc->proto_data;
+	status_num = gd->own_status;
 	status_id = gaim_status_get_id(status);
 
 	if (!strcmp(status_id, "available"))
@@ -830,7 +837,6 @@ void login_callback(gpointer data, gint 
 
 		/* Our signon is complete */
 		gaim_connection_set_state(gc, GAIM_CONNECTED);
-		serv_finish_login(gc);
 
 		break;
 	case GG_EVENT_CONN_FAILED:
@@ -888,7 +894,7 @@ static void agg_login(GaimAccount *accou
 	 */
 
 	gd->sess->uin = (uin_t) strtol(account->username, (char **)NULL, 10);
-	gd->sess->password = g_strdup(account->password);
+	gd->sess->password = g_strdup(gaim_connection_get_password(gc));
 	gd->sess->state = GG_STATE_CONNECTING;
 	gd->sess->check = GG_CHECK_WRITE;
 	gd->sess->async = 1;

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

Modified Files:
	toc.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -p -r1.171 -r1.172
--- toc.c	27 Mar 2005 01:14:40 -0000	1.171
+++ toc.c	27 Mar 2005 17:50:33 -0000	1.172
@@ -733,7 +733,6 @@ static void toc_callback(gpointer data, 
 		tdt->state = STATE_ONLINE;
 
 		gaim_connection_set_state(gc, GAIM_CONNECTED);
-		serv_finish_login(gc);
 
 		/*
 		 * Add me to my buddy list so that we know the time when

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

Modified Files:
	ops.c silc.c util.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: ops.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/silc/ops.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -p -r1.26 -r1.27
--- ops.c	26 Mar 2005 23:25:17 -0000	1.26
+++ ops.c	27 Mar 2005 17:50:32 -0000	1.27
@@ -1466,7 +1466,6 @@ silc_connected(SilcClient client, SilcCl
 	case SILC_CLIENT_CONN_SUCCESS:
 	case SILC_CLIENT_CONN_SUCCESS_RESUME:
 		gaim_connection_set_state(gc, GAIM_CONNECTED);
-		serv_finish_login(gc);
 		g_unlink(silcgaim_session_file(gaim_account_get_username(sg->account)));
 
 		/* Send any UMODEs configured for account */
@@ -1593,6 +1592,7 @@ silc_get_auth_method(SilcClient client, 
 	GaimConnection *gc = client->application;
 	SilcGaim sg = gc->proto_data;
 	SilcGaimGetAuthMethod internal;
+	const char *password;
 
 	/* Progress */
 	if (sg->resuming)
@@ -1606,9 +1606,9 @@ silc_get_auth_method(SilcClient client, 
 		completion(TRUE, SILC_AUTH_PUBLIC_KEY, NULL, 0, context);
 		return;
 	}
-	if (gc->account->password && *gc->account->password) {
-		completion(TRUE, SILC_AUTH_PASSWORD, gc->account->password,
-			   strlen(gc->account->password), context);
+	password = gaim_connection_get_password(gc);
+	if (password && *password) {
+		completion(TRUE, SILC_AUTH_PASSWORD, password, strlen(password), context);
 		return;
 	}
 

Index: silc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/silc/silc.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -p -r1.35 -r1.36
--- silc.c	26 Mar 2005 02:43:48 -0000	1.35
+++ silc.c	27 Mar 2005 17:50:33 -0000	1.36
@@ -303,7 +303,7 @@ silcgaim_login(GaimAccount *account, Gai
 	/* Load SILC key pair */
 	if (!silc_load_key_pair(gaim_prefs_get_string("/plugins/prpl/silc/pubkey"),
 				gaim_prefs_get_string("/plugins/prpl/silc/privkey"),
-				(account->password == NULL) ? "" : account->password, &client->pkcs,
+				(gc->password == NULL) ? "" : gc->password, &client->pkcs,
 				&client->public_key, &client->private_key)) {
 		gaim_connection_error(gc, ("Could not load SILC key pair"));
 		return;

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/silc/util.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -p -r1.9 -r1.10
--- util.c	11 Feb 2005 05:10:38 -0000	1.9
+++ util.c	27 Mar 2005 17:50:33 -0000	1.10
@@ -203,7 +203,7 @@ gboolean silcgaim_check_silc_dir(GaimCon
 			silc_create_key_pair(SILCGAIM_DEF_PKCS,
 					     SILCGAIM_DEF_PKCS_LEN,
 					     file_public_key, file_private_key, NULL,
-					     (gc->account->password == NULL) ? "" : gc->account->password,
+					     (gc->password == NULL) ? "" : gc->password,
 						 NULL, NULL, NULL, FALSE);
 			g_stat(file_public_key, &st);
 		} else {
@@ -228,7 +228,7 @@ gboolean silcgaim_check_silc_dir(GaimCon
 			silc_create_key_pair(SILCGAIM_DEF_PKCS,
 					     SILCGAIM_DEF_PKCS_LEN,
 					     file_public_key, file_private_key, NULL,
-					     (gc->account->password == NULL) ? "" : gc->account->password,
+					     (gc->password == NULL) ? "" : gc->password,
 						 NULL, NULL, NULL, FALSE);
 			g_stat(file_private_key, &st);
 		} else {

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

Modified Files:
	napster.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: napster.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/napster/napster.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -p -r1.107 -r1.108
--- napster.c	26 Mar 2005 23:25:15 -0000	1.107
+++ napster.c	27 Mar 2005 17:50:29 -0000	1.108
@@ -277,7 +277,6 @@ static void nap_callback(gpointer data, 
 
 		/* Our signon is complete */
 		gaim_connection_set_state(gc, GAIM_CONNECTED);
-		serv_finish_login(gc);
 
 		break;

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

Modified Files:
	server.h server.c connection.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: server.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -p -r1.26 -r1.27
--- server.h	27 Mar 2005 01:59:39 -0000	1.26
+++ server.h	27 Mar 2005 17:50:26 -0000	1.27
@@ -74,7 +74,6 @@ void serv_set_buddyicon(GaimConnection *
 void serv_got_typing_stopped(GaimConnection *gc, const char *name);
 void serv_got_im(GaimConnection *gc, const char *who, const char *msg,
 				 GaimConvImFlags imflags, time_t mtime);
-void serv_finish_login(GaimConnection *gc);
 void serv_got_chat_invite(GaimConnection *gc, const char *name,
 						  const char *who, const char *message,
 						  GHashTable *data);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -d -p -r1.455 -r1.456
--- server.c	27 Mar 2005 01:59:39 -0000	1.455
+++ server.c	27 Mar 2005 17:50:26 -0000	1.456
@@ -56,26 +56,6 @@ void serv_touch_idle(GaimConnection *gc)
 		check_idle(gc);
 }
 
-void serv_finish_login(GaimConnection *gc)
-{
-	GaimPluginProtocolInfo *prpl_info = NULL;
-	GaimAccount *account;
-
-	if (gc != NULL && gc->prpl != NULL)
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
-
-	account = gaim_connection_get_account(gc);
-
-	if (gaim_account_get_user_info(account) != NULL)
-		serv_set_info(gc, gaim_account_get_user_info(account));
-
-	if (gc->idle_timer > 0)
-		gaim_timeout_remove(gc->idle_timer);
-
-	gc->idle_timer = gaim_timeout_add(20000, check_idle, gc);
-	serv_touch_idle(gc);
-}
-
 /* This should return the elapsed time in seconds in which Gaim will not send
  * typing notifications.
  * if it returns zero, it will not send any more typing notifications
@@ -1237,7 +1217,7 @@ void serv_got_chat_in(GaimConnection *g,
 void serv_send_file(GaimConnection *gc, const char *who, const char *file)
 {
 	GaimPluginProtocolInfo *prpl_info = NULL;
-	
+
 	if (gc != NULL && gc->prpl != NULL)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
 

Index: connection.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -p -r1.78 -r1.79
--- connection.c	27 Mar 2005 01:59:39 -0000	1.78
+++ connection.c	27 Mar 2005 17:50:27 -0000	1.79
@@ -27,6 +27,7 @@
 #include "blist.h"
 #include "connection.h"
 #include "debug.h"
+#include "gaim.h"
 #include "log.h"
 #include "notify.h"
 #include "prefs.h"
@@ -103,7 +104,7 @@ gaim_connection_new(GaimAccount *account
 	}
 	else
 	{
-		if ((password == NULL) &&
+		if (((password == NULL) || (*password == '\0')) &&
 			!(prpl_info->options & OPT_PROTO_NO_PASSWORD) &&
 			!(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL))
 		{
@@ -115,7 +116,8 @@ gaim_connection_new(GaimAccount *account
 
 	gc = g_new0(GaimConnection, 1);
 	gc->prpl = prpl;
-	gc->password = g_strdup(password);
+	if ((password != NULL) && (*password != '\0'))
+		gc->password = g_strdup(password);
 	gaim_connection_set_account(gc, account);
 	gaim_connection_set_state(gc, GAIM_CONNECTING);
 	connections = g_list_append(connections, gc);
@@ -331,6 +333,15 @@ gaim_connection_set_state(GaimConnection
 		serv_set_permit_deny(gc);
 
 		update_keepalive(gc, TRUE);
+
+		if (gaim_account_get_user_info(account) != NULL)
+			serv_set_info(gc, gaim_account_get_user_info(account));
+
+		if (gc->idle_timer > 0)
+			gaim_timeout_remove(gc->idle_timer);
+
+		gc->idle_timer = gaim_timeout_add(20000, check_idle, gc);
+		serv_touch_idle(gc);
 	}
 	else if (gc->state == GAIM_DISCONNECTED) {
 		GaimAccount *account = gaim_connection_get_account(gc);

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

Modified Files:
	session.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: session.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/session.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -p -r1.42 -r1.43
--- session.c	22 Feb 2005 15:16:37 -0000	1.42
+++ session.c	27 Mar 2005 17:50:29 -0000	1.43
@@ -416,6 +416,4 @@ msn_session_finish_login(MsnSession *ses
 
 	/* Sync users */
 	msn_session_sync_users(session);
-
-	serv_finish_login(gc);
 }

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

Modified Files:
	novell.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: novell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/novell/novell.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -p -r1.44 -r1.45
--- novell.c	26 Mar 2005 23:25:16 -0000	1.44
+++ novell.c	27 Mar 2005 17:50:29 -0000	1.45
@@ -104,7 +104,6 @@ _login_resp_cb(NMUser * user, NMERR_T re
 
 		/* Tell Gaim that we are connected */
 		gaim_connection_set_state(gc, GAIM_CONNECTED);
-		serv_finish_login(gc);
 
 		_sync_contact_list(user);

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

Modified Files:
	zephyr.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: zephyr.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/zephyr.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -p -r1.137 -r1.138
--- zephyr.c	26 Mar 2005 02:43:49 -0000	1.137
+++ zephyr.c	27 Mar 2005 17:50:35 -0000	1.138
@@ -1751,8 +1751,6 @@ static void zephyr_login(GaimAccount * a
 	if (read_zsubs)
 		process_zsubs(zephyr);
 
-	serv_finish_login(gc);
-
 	if (use_zeph02(zephyr)) {
 		zephyr->nottimer = gaim_timeout_add(100, check_notify_zeph02, gc);
 	} else if (use_tzc(zephyr)) {

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

Modified Files:
	yahoo.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -p -r1.310 -r1.311
--- yahoo.c	27 Mar 2005 03:58:44 -0000	1.310
+++ yahoo.c	27 Mar 2005 17:50:35 -0000	1.311
@@ -151,7 +151,6 @@ static void yahoo_process_status(GaimCon
 			if (!yd->logged_in) {
 				gaim_connection_set_display_name(gc, pair->value);
 				gaim_connection_set_state(gc, GAIM_CONNECTED);
-				serv_finish_login(gc);
 				yd->logged_in = TRUE;
 				if (yd->picture_upload_todo) {
 					yahoo_buddy_icon_upload(gc, yd->picture_upload_todo);

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

Modified Files:
	trepia.c 
Log Message:
Get rid of serv_finish_login because it's dumb.

Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.


Index: trepia.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/trepia/trepia.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -p -r1.74 -r1.75
--- trepia.c	27 Mar 2005 01:14:41 -0000	1.74
+++ trepia.c	27 Mar 2005 17:50:34 -0000	1.75
@@ -637,7 +637,6 @@ _parse_data(TrepiaSession *session, char
 						_("Retrieving buddy list"), 2, TREPIA_CONNECT_STEPS);
 
 				gaim_connection_set_state(session->gc, GAIM_CONNECTED);
-				serv_finish_login(session->gc);
 				break;
 
 			case TREPIA_MSG_INCOMING: /* Incoming Message */

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

Modified Files:
	gtknotify.c 
Log Message:
The notify ui_handle is going to be NULL for all uri type notifications.  It seems that we maybe shouldn't be storing the uri notification sin the notify handles list at all, but I suppose it could be useful for some other UI

Index: gtknotify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtknotify.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -p -r1.77 -r1.78
--- gtknotify.c	26 Mar 2005 02:43:44 -0000	1.77
+++ gtknotify.c	27 Mar 2005 17:39:22 -0000	1.78
@@ -581,7 +581,7 @@ gaim_gtk_close_notify(GaimNotifyType typ
 
 		g_free(data);
 	}
-	else
+	else if (ui_handle != NULL)
 		gtk_widget_destroy(GTK_WIDGET(ui_handle));
 }