aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-main-window.c
diff options
context:
space:
mode:
authorTravis Reitter <treitter@gmail.com>2010-02-12 07:09:32 +0800
committerTravis Reitter <treitter@gmail.com>2010-02-12 07:19:54 +0800
commit2aa506e8a17ef67ddf43ee716b21afc780a9d0d2 (patch)
tree53d9c41aa9ab11296b5a0a3f739ced1b21b7b87d /src/empathy-main-window.c
parent1abde726f2920d166728b79cc6e2cdc5e72ea1df (diff)
downloadgsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar.gz
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar.bz2
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar.lz
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar.xz
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar.zst
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.zip
Separate the accounts dialog into its own program which works with the Gnome preferences and control center.
Where available, this also supports embedding the preferences dialog in the "extensible-shell" control center (currently in development, but likely to be mainlined soon).
Diffstat (limited to 'src/empathy-main-window.c')
-rw-r--r--src/empathy-main-window.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index e9b1983d3..8d6413aab 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -356,7 +356,10 @@ main_window_error_edit_clicked_cb (GtkButton *button,
TpAccount *account;
account = g_object_get_data (G_OBJECT (button), "account");
- empathy_accounts_dialog_show (GTK_WINDOW (window->window), account);
+
+ empathy_accounts_dialog_show_application (
+ gtk_widget_get_screen (GTK_WIDGET (button)), NULL, NULL,
+ account, FALSE, FALSE);
main_window_remove_error (window, account);
}
@@ -1059,7 +1062,8 @@ static void
main_window_edit_accounts_cb (GtkAction *action,
EmpathyMainWindow *window)
{
- empathy_accounts_dialog_show (GTK_WINDOW (window->window), NULL);
+ empathy_accounts_dialog_show_application (gdk_screen_get_default (),
+ NULL, NULL, NULL, FALSE, FALSE);
}
static void
@@ -1107,7 +1111,9 @@ main_window_throbber_button_press_event_cb (GtkWidget *throbber_ebox,
return FALSE;
}
- empathy_accounts_dialog_show (GTK_WINDOW (window->window), NULL);
+ empathy_accounts_dialog_show_application (
+ gtk_widget_get_screen (GTK_WIDGET (throbber_ebox)),
+ NULL, NULL, NULL, FALSE, FALSE);
return FALSE;
}