comparison src/gtkconn.c @ 13730:2eea3265dbe6

[gaim-migrate @ 16141] Correctly remove the disconnected button when the account successfully connections. This might have only been a problem when the account wanted_to_die committer: Tailor Script <[e-mail]>

13729:74033e0831bc

 * Contains accounts that are auto-reconnecting.
 * The key is a pointer to the GaimAccount and the
 * value is a pointer to a GaimAutoRecon.
 */
static GHashTable *hash = NULL;
static GHashTable *errored_accounts = NULL;

static void
gaim_gtk_connection_connect_progress(GaimConnection *gc,
		const char *text, size_t step, size_t step_count)
{

		return;
	gtk_gaim_status_box_set_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox),
					   (gaim_connections_get_connecting() != NULL));
	gtk_gaim_status_box_pulse_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox));
}

static void
gaim_gtk_connection_connected(GaimConnection *gc)
{
	GaimAccount *account;
	GaimGtkBuddyList *gtkblist;

					   (gaim_connections_get_connecting() != NULL));

	if (hash != NULL)
		g_hash_table_remove(hash, account);

	if (g_hash_table_size(errored_accounts) > 0)
	{
		g_hash_table_remove(errored_accounts, account);
		gaim_gtk_blist_update_account_error_state(account, NULL);
	}
}

static void
gaim_gtk_connection_disconnected(GaimConnection *gc)
{

static void
gaim_gtk_connection_report_disconnect(GaimConnection *gc, const char *text)
{
	GaimAccount *account = NULL;
	GaimAutoRecon *info;
	GSList* errored_account;

	account = gaim_connection_get_account(gc);
	info = g_hash_table_lookup(hash, account);
	errored_account = g_hash_table_lookup(errored_accounts, account);

	gaim_gtk_blist_update_account_error_state(account, text);
	if (!gc->wants_to_die) {
		if (info == NULL) {
			info = g_new0(GaimAutoRecon, 1);

			info->delay = MIN(2 * info->delay, MAX_RECON_DELAY);
			if (info->timeout != 0)
				g_source_remove(info->timeout);
		}
		info->timeout = g_timeout_add(info->delay, do_signon, account);

		g_hash_table_insert(errored_accounts, account, NULL);
	} else {
		char *p, *s, *n=NULL ;
		if (info != NULL)
			g_hash_table_remove(hash, account);

		if (errored_account != NULL)
			g_hash_table_remove(errored_accounts, errored_account);

		if (gaim_account_get_alias(account))
		{
			n = g_strdup_printf("%s (%s) (%s)",
					gaim_account_get_username(account),

static void
account_removed_cb(GaimAccount *account, gpointer user_data)
{
	g_hash_table_remove(hash, account);

	if (g_hash_table_size(errored_accounts) > 0)
	{
		g_hash_table_remove(errored_accounts, account);
		gaim_gtk_blist_update_account_error_state(account, NULL);
	}
}


/**************************************************************************
* GTK+ connection glue

gaim_gtk_connection_init(void)
{
	hash = g_hash_table_new_full(
							g_direct_hash, g_direct_equal,
							NULL, free_auto_recon);
	errored_accounts = g_hash_table_new_full(
							g_direct_hash, g_direct_equal,
							NULL, NULL);

	gaim_signal_connect(gaim_accounts_get_handle(), "account-removed",
						gaim_gtk_connection_get_handle(),
						GAIM_CALLBACK(account_removed_cb), NULL);
}

gaim_gtk_connection_uninit(void)
{
	gaim_signals_disconnect_by_handle(gaim_gtk_connection_get_handle());

	g_hash_table_destroy(hash);
	g_hash_table_destroy(errored_accounts);
}

13730:2eea3265dbe6

 * Contains accounts that are auto-reconnecting.
 * The key is a pointer to the GaimAccount and the
 * value is a pointer to a GaimAutoRecon.
 */
static GHashTable *hash = NULL;

static void
gaim_gtk_connection_connect_progress(GaimConnection *gc,
		const char *text, size_t step, size_t step_count)
{

		return;
	gtk_gaim_status_box_set_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox),
					   (gaim_connections_get_connecting() != NULL));
	gtk_gaim_status_box_pulse_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox));
}
\
static void
gaim_gtk_connection_connected(GaimConnection *gc)
{
	GaimAccount *account;
	GaimGtkBuddyList *gtkblist;

					   (gaim_connections_get_connecting() != NULL));

	if (hash != NULL)
		g_hash_table_remove(hash, account);

	gaim_gtk_blist_update_account_error_state(account, NULL);
}

static void
gaim_gtk_connection_disconnected(GaimConnection *gc)
{

static void
gaim_gtk_connection_report_disconnect(GaimConnection *gc, const char *text)
{
	GaimAccount *account = NULL;
	GaimAutoRecon *info;

	account = gaim_connection_get_account(gc);
	info = g_hash_table_lookup(hash, account);

	gaim_gtk_blist_update_account_error_state(account, text);
	if (!gc->wants_to_die) {
		if (info == NULL) {
			info = g_new0(GaimAutoRecon, 1);

			info->delay = MIN(2 * info->delay, MAX_RECON_DELAY);
			if (info->timeout != 0)
				g_source_remove(info->timeout);
		}
		info->timeout = g_timeout_add(info->delay, do_signon, account);
	} else {
		char *p, *s, *n=NULL ;
		if (info != NULL)
			g_hash_table_remove(hash, account);

		if (gaim_account_get_alias(account))
		{
			n = g_strdup_printf("%s (%s) (%s)",
					gaim_account_get_username(account),

static void
account_removed_cb(GaimAccount *account, gpointer user_data)
{
	g_hash_table_remove(hash, account);

	gaim_gtk_blist_update_account_error_state(account, NULL);
}


/**************************************************************************
* GTK+ connection glue

gaim_gtk_connection_init(void)
{
	hash = g_hash_table_new_full(
							g_direct_hash, g_direct_equal,
							NULL, free_auto_recon);

	gaim_signal_connect(gaim_accounts_get_handle(), "account-removed",
						gaim_gtk_connection_get_handle(),
						GAIM_CALLBACK(account_removed_cb), NULL);
}

gaim_gtk_connection_uninit(void)
{
	gaim_signals_disconnect_by_handle(gaim_gtk_connection_get_handle());

	g_hash_table_destroy(hash);
}