comparison src/gtkconn.c @ 6109:0922bb7a7bbc

[gaim-migrate @ 6571] Make attempting to sign on to an account twice not crash Gaim, and make the prompt for password request window only open once at max. I might change this in a few minutes, but this works, and I wanted to commit it before I break something. Move the gaim_request_input() call for "Please enter your password" to connection.c instead of gtkconn.c. There is no need for this to be in gtkconn.c, and doing it in core means less work for UIs. Make closing a notify window call the cancel action. Set the titles for request windows, when given. Remove a bit of odd, un-needed code from main.c (hitting "enter" in the password field was calling doenter which called dologin. Now it just calls dologin). committer: Tailor Script <[e-mail]>

6108:edbd278822a0

#include "account.h"
#include "debug.h"
#include "util.h"

#include "gtkblist.h"
#include "gtkrequest.h"
#include "gtkutils.h"

#include "ui.h"

struct signon_meter {

	if(meter)
		kill_meter(meter, _("Done."));
}

static void request_pass_ok_cb(GaimConnection *gc, const char *entry)
{
	GaimAccount *account = gaim_connection_get_account(gc);

	gaim_account_set_password(account, (*entry != '\0') ? entry : NULL);

	gaim_connection_connect(gc);
}

static void request_pass_cancel_cb(GaimConnection *gc, const char *entry)
{
	gaim_connection_destroy(gc);
}

static void gaim_gtk_connection_request_pass(GaimConnection *gc)
{
	gaim_request_input(gc, NULL, _("Enter your password."), NULL, 
		NULL, FALSE, TRUE,
		_("OK"), G_CALLBACK(request_pass_ok_cb),
		_("Cancel"), G_CALLBACK(request_pass_cancel_cb), gc);
}

static void gaim_gtk_connection_disconnected(GaimConnection *gc,
		const char *reason)
{
	struct signon_meter *meter = find_signon_meter(gc);

static GaimConnectionUiOps conn_ui_ops =
{
	gaim_gtk_connection_connect_progress,
	gaim_gtk_connection_connected,
	gaim_gtk_connection_request_pass,
	gaim_gtk_connection_disconnected,
	gaim_gtk_connection_notice
};

GaimConnectionUiOps *gaim_get_gtk_connection_ui_ops(void)

6109:0922bb7a7bbc

#include "account.h"
#include "debug.h"
#include "util.h"

#include "gtkblist.h"
#include "gtkutils.h"

#include "ui.h"

struct signon_meter {

	if(meter)
		kill_meter(meter, _("Done."));
}

static void gaim_gtk_connection_disconnected(GaimConnection *gc,
		const char *reason)
{
	struct signon_meter *meter = find_signon_meter(gc);

static GaimConnectionUiOps conn_ui_ops =
{
	gaim_gtk_connection_connect_progress,
	gaim_gtk_connection_connected,
	gaim_gtk_connection_disconnected,
	gaim_gtk_connection_notice
};

GaimConnectionUiOps *gaim_get_gtk_connection_ui_ops(void)