comparison pidgin/gtkblist.c @ 22297:00c20312e289

Don't clear account errors during account-error-changed emission. I can't reproduce Stu's crash, but this fixes the error minidialog duplication I was seeing when trying to reproduce it, and I believe the cause is the same. References #4815

22296:6d3f8042f21f

/***********************************/
/* Connection error handling stuff */
/***********************************/

#define OBJECT_DATA_KEY_ACCOUNT "account"

static gboolean
find_account_widget(GObject *widget,
                    PurpleAccount *account)
{

remove_child_widget_by_account(GtkContainer *container,
                               PurpleAccount *account)
{
	GtkWidget *widget = find_child_widget_by_account(container, account);
	if(widget) {
		gtk_widget_destroy(widget);
	}
}

/* Generic error buttons */

static void
generic_error_destroy_cb(GtkObject *dialog,
                         PurpleAccount *account)
{
	g_hash_table_remove(gtkblist->connection_errors, account);
	purple_account_clear_current_error(account);
}

#define SSL_FAQ_URI "http://d.pidgin.im/wiki/FAQssl"

static void

22297:00c20312e289

/***********************************/
/* Connection error handling stuff */
/***********************************/

#define OBJECT_DATA_KEY_ACCOUNT "account"
#define DO_NOT_CLEAR_ERROR "do-not-clear-error"

static gboolean
find_account_widget(GObject *widget,
                    PurpleAccount *account)
{

remove_child_widget_by_account(GtkContainer *container,
                               PurpleAccount *account)
{
	GtkWidget *widget = find_child_widget_by_account(container, account);
	if(widget) {
		/* Since we are destroying the widget in response to a change in
		 * error, we should not clear the error.
		 */
		g_object_set_data(G_OBJECT(widget), DO_NOT_CLEAR_ERROR,
			GINT_TO_POINTER(TRUE));
		gtk_widget_destroy(widget);
	}
}

/* Generic error buttons */

static void
generic_error_destroy_cb(GtkObject *dialog,
                         PurpleAccount *account)
{
	g_hash_table_remove(gtkblist->connection_errors, account);
	/* If the error dialog is being destroyed in response to the
	 * account-error-changed signal, we don't want to clear the current
	 * error.
	 */
	if (g_object_get_data(G_OBJECT(dialog), DO_NOT_CLEAR_ERROR) == NULL)
		purple_account_clear_current_error(account);
}

#define SSL_FAQ_URI "http://d.pidgin.im/wiki/FAQssl"

static void