diff options
| author | Travis Reitter <treitter@gmail.com> | 2010-03-03 01:06:12 +0800 |
|---|---|---|
| committer | Travis Reitter <treitter@gmail.com> | 2010-03-03 01:16:52 +0800 |
| commit | 52d67df161e27a893bc24a13a50d86bf251f5ad9 (patch) | |
| tree | 07dc9ce77de2b4a4f8e6528d4c8bd32dd1b36e10 /src/cc-empathy-accounts-page.c | |
| parent | 0309966cb4998548e404c1d76bd6c94a5e0f4259 (diff) | |
| download | gsoc2013-empathy-52d67df161e27a893bc24a13a50d86bf251f5ad9.tar gsoc2013-empathy-52d67df161e27a893bc24a13a50d86bf251f5ad9.tar.gz gsoc2013-empathy-52d67df161e27a893bc24a13a50d86bf251f5ad9.tar.bz2 gsoc2013-empathy-52d67df161e27a893bc24a13a50d86bf251f5ad9.tar.lz gsoc2013-empathy-52d67df161e27a893bc24a13a50d86bf251f5ad9.tar.xz gsoc2013-empathy-52d67df161e27a893bc24a13a50d86bf251f5ad9.tar.zst gsoc2013-empathy-52d67df161e27a893bc24a13a50d86bf251f5ad9.zip | |
Remove EmpathyAccountsPlugin's requirement that it be a singleton, so we can reset the embedded control panel to a sane state every time we open it.
Diffstat (limited to 'src/cc-empathy-accounts-page.c')
| -rw-r--r-- | src/cc-empathy-accounts-page.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/cc-empathy-accounts-page.c b/src/cc-empathy-accounts-page.c index 15c7e5689..10c333ff3 100644 --- a/src/cc-empathy-accounts-page.c +++ b/src/cc-empathy-accounts-page.c @@ -54,20 +54,24 @@ page_pack_with_accounts_dialog (CcEmpathyAccountsPage *page) GtkWidget *content; GtkWidget *action_area; - if (!page->priv->accounts_window) + if (page->priv->accounts_window != NULL) { - page->priv->accounts_window = empathy_accounts_dialog_show (NULL, NULL); - gtk_widget_hide (page->priv->accounts_window); + gtk_widget_destroy (page->priv->accounts_window); + gtk_container_remove (GTK_CONTAINER (page), + gtk_bin_get_child (GTK_BIN (page))); + } - content = gtk_dialog_get_content_area ( - GTK_DIALOG (page->priv->accounts_window)); - action_area = gtk_dialog_get_action_area ( - GTK_DIALOG (page->priv->accounts_window)); - gtk_widget_set_no_show_all (action_area, TRUE); - gtk_widget_hide (action_area); + page->priv->accounts_window = empathy_accounts_dialog_show (NULL, NULL); + gtk_widget_hide (page->priv->accounts_window); - gtk_widget_reparent (content, GTK_WIDGET (page)); - } + content = gtk_dialog_get_content_area ( + GTK_DIALOG (page->priv->accounts_window)); + action_area = gtk_dialog_get_action_area ( + GTK_DIALOG (page->priv->accounts_window)); + gtk_widget_set_no_show_all (action_area, TRUE); + gtk_widget_hide (action_area); + + gtk_widget_reparent (content, GTK_WIDGET (page)); } static void |