diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/component-factory.c | 2 | ||||
| -rw-r--r-- | mail/mail-accounts.c | 1 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 5 |
4 files changed, 12 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index fc16406b1b..b54a704dfc 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2001-10-26 <NotZed@Ximian.com> + + * component-factory.c (owner_unset_cb): Use a timeout not an idle handler. + + * mail-callbacks.c (providers_config): Only set the parent window. + + * mail-accounts.c (mail_edit): Set the parent on the account editor. + 2001-10-25 <NotZed@Ximian.com> * openpgp-utils.c (openpgp_verify): s/iconv/e_iconv/. diff --git a/mail/component-factory.c b/mail/component-factory.c index e62a313912..1f9fec2a06 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -886,7 +886,7 @@ owner_unset_cb (EvolutionShellComponent *shell_component, gpointer user_data) gtk_object_unref (GTK_OBJECT (search_context)); search_context = NULL; - g_idle_add_full (G_PRIORITY_LOW, idle_quit, NULL, NULL); + g_timeout_add(100, idle_quit, NULL); } static BonoboObject * diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index fa3c0a750b..32368e4e95 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -250,6 +250,7 @@ mail_edit (GtkButton *button, gpointer data) account = gtk_clist_get_row_data (dialog->mail_accounts, dialog->accounts_row); editor = mail_account_editor_new (account); + gnome_dialog_set_parent((GnomeDialog *)editor, GTK_WINDOW (dialog)); gtk_signal_connect (GTK_OBJECT (editor), "destroy", GTK_SIGNAL_FUNC (mail_editor_destroyed), dialog); diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 40f197a8e2..c184714f86 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -2237,9 +2237,8 @@ providers_config (BonoboUIComponent *uih, void *user_data, const char *path) if (!accounts_dialog) { accounts_dialog = mail_accounts_dialog_new (fb->shell); - gtk_widget_set_parent (GTK_WIDGET (accounts_dialog), GTK_WIDGET (fb)); - gtk_widget_set_parent_window (GTK_WIDGET (accounts_dialog), - GTK_WIDGET (FB_WINDOW (fb))->window); + gtk_widget_set_parent_window (GTK_WIDGET (accounts_dialog), fb); + gtk_signal_connect (GTK_OBJECT (accounts_dialog), "destroy", accounts_dialog_close, NULL); gnome_dialog_set_close (GNOME_DIALOG (accounts_dialog), TRUE); |