From 1b35f6aa52f764c40c1fb603d8ca9e6622d12f02 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Fri, 4 Jul 2008 09:41:34 +0000 Subject: Select the bugged account upon a failed connection. Fixes bug #536984 (Jonny Lamb). When a connection fails, a box in the main window appears with an "Edit Account" button. Clicking this button takes you to the account editor, but does nothing else. This patch moves the selection to the bugged account, for convenience. Signed-off-by: Jonny Lamb svn path=/trunk/; revision=1192 --- src/empathy-accounts.c | 2 +- src/empathy-main-window.c | 8 ++++---- src/empathy-status-icon.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 65ede78ac..98af6fc53 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -53,7 +53,7 @@ main (int argc, char *argv[]) gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), PKGDATADIR G_DIR_SEPARATOR_S "icons"); - dialog = empathy_accounts_dialog_show (NULL); + dialog = empathy_accounts_dialog_show (NULL, NULL); g_signal_connect (dialog, "destroy", G_CALLBACK (destroy_cb), diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 8a8117f6e..ea67634b2 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -645,7 +645,7 @@ static void main_window_edit_accounts_cb (GtkWidget *widget, EmpathyMainWindow *window) { - empathy_accounts_dialog_show (GTK_WINDOW (window->window)); + empathy_accounts_dialog_show (GTK_WINDOW (window->window), NULL); } static void @@ -710,7 +710,7 @@ main_window_throbber_button_press_event_cb (GtkWidget *throbber_ebox, return FALSE; } - empathy_accounts_dialog_show (GTK_WINDOW (window->window)); + empathy_accounts_dialog_show (GTK_WINDOW (window->window), NULL); return FALSE; } @@ -722,9 +722,9 @@ main_window_error_edit_clicked_cb (GtkButton *button, McAccount *account; GtkWidget *error_widget; - empathy_accounts_dialog_show (GTK_WINDOW (window->window)); - account = g_object_get_data (G_OBJECT (button), "account"); + empathy_accounts_dialog_show (GTK_WINDOW (window->window), account); + error_widget = g_hash_table_lookup (window->errors, account); gtk_widget_destroy (error_widget); g_hash_table_remove (window->errors, account); diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index 3c2e7a679..b0f31c9da 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -283,7 +283,7 @@ status_icon_set_visibility (EmpathyStatusIcon *icon, mc_accounts_list_free (accounts); } else { DEBUG ("No enabled account, Showing account dialog"); - empathy_accounts_dialog_show (GTK_WINDOW (priv->window)); + empathy_accounts_dialog_show (GTK_WINDOW (priv->window), NULL); } } } -- cgit v1.2.3