comparison src/gtkaccount.c @ 10932:3ad0e7351826

[gaim-migrate @ 12711] This is a bit better, but needs work. Don't sign on accounts just because you modified them. This should be adapted to use the currently active status sometime. committer: Tailor Script <[e-mail]>

10931:ceb88f2a2f17

	GList *l, *l2;
	const char *value;
	char *username;
	char *tmp;
	size_t index;
	GtkTreeIter iter;
	GaimAccount *ret;

	if (dialog->account == NULL)
	{

		screenname = gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry));

		dialog->account = gaim_account_new(screenname, dialog->protocol_id);
		gaim_account_set_enabled(dialog->account, GAIM_GTK_UI, TRUE);
	}
	else
	{
		/* Protocol */
		gaim_account_set_protocol_id(dialog->account, dialog->protocol_id);

			add_account(accounts_window, dialog->account);
			gaim_accounts_add(dialog->account);
		}
	}

	gaim_presence_set_status_active(dialog->account->presence, "online", TRUE);
	ret = dialog->account;

	account_win_destroy_cb(NULL, NULL, dialog);

	gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", ret);

	return ret;
}

static void

10932:3ad0e7351826

	GList *l, *l2;
	const char *value;
	char *username;
	char *tmp;
	size_t index;
	gboolean new = FALSE;
	GtkTreeIter iter;
	GaimAccount *ret;

	if (dialog->account == NULL)
	{

		screenname = gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry));

		dialog->account = gaim_account_new(screenname, dialog->protocol_id);
		gaim_account_set_enabled(dialog->account, GAIM_GTK_UI, TRUE);
		new = TRUE;
	}
	else
	{
		/* Protocol */
		gaim_account_set_protocol_id(dialog->account, dialog->protocol_id);

			add_account(accounts_window, dialog->account);
			gaim_accounts_add(dialog->account);
		}
	}

	ret = dialog->account;

	account_win_destroy_cb(NULL, NULL, dialog);

	gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", ret);

	/* XXX: make the new account sign on with the currently active global status
	 * instead of hardcoding "online" */
	if (new)
		gaim_presence_set_status_active(dialog->account->presence, "online", TRUE);

	return ret;
}

static void