From 0ed3ee1fa3b1f9f0735358fe66ba35f44e7c70ee Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 29 Sep 2009 20:10:35 +0200 Subject: Bug #596753 - Autocompletion addressbooks not remembered And select page in Edit->Preferences based on the active view. --- modules/addressbook/autocompletion-config.c | 3 +-- modules/addressbook/e-book-shell-backend.c | 1 + modules/calendar/e-cal-shell-backend.c | 1 + modules/calendar/e-memo-shell-backend.c | 1 + modules/calendar/e-task-shell-backend.c | 1 + modules/mail/e-mail-shell-backend.c | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c index 7afc18d382..6b51427be1 100644 --- a/modules/addressbook/autocompletion-config.c +++ b/modules/addressbook/autocompletion-config.c @@ -178,6 +178,7 @@ autocompletion_config_new (EShell *shell) gtk_widget_show (scrolled_window); source_selector = e_source_selector_new (source_list); + initialize_selection (E_SOURCE_SELECTOR (source_selector)); g_signal_connect ( source_selector, "selection_changed", G_CALLBACK (source_selection_changed_cb), NULL); @@ -186,7 +187,5 @@ autocompletion_config_new (EShell *shell) gtk_box_pack_start (GTK_BOX (itembox), scrolled_window, TRUE, TRUE, 0); - initialize_selection (E_SOURCE_SELECTOR (source_selector)); - return vbox; } diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index 06cd43aca4..11ff1e3553 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -584,6 +584,7 @@ book_shell_backend_class_init (EBookShellBackendClass *class) shell_backend_class->aliases = "contacts"; shell_backend_class->schemes = ""; shell_backend_class->sort_order = 300; + shell_backend_class->preferences_page = "contacts"; shell_backend_class->start = NULL; shell_backend_class->migrate = e_book_shell_backend_migrate; diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index f58548f80f..2c3d459085 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -747,6 +747,7 @@ cal_shell_backend_class_init (ECalShellBackendClass *class) shell_backend_class->aliases = ""; shell_backend_class->schemes = "calendar"; shell_backend_class->sort_order = 400; + shell_backend_class->preferences_page = "calendar-and-tasks"; shell_backend_class->start = NULL; shell_backend_class->migrate = e_cal_shell_backend_migrate; diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index 71d44603dc..84fb5458ae 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -571,6 +571,7 @@ memo_shell_backend_class_init (EMemoShellBackendClass *class) shell_backend_class->aliases = ""; shell_backend_class->schemes = "memo"; shell_backend_class->sort_order = 500; + shell_backend_class->preferences_page = "calendar-and-tasks"; shell_backend_class->start = NULL; shell_backend_class->migrate = e_memo_shell_backend_migrate; diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index 2564c18177..c17f73d044 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -581,6 +581,7 @@ task_shell_backend_class_init (ETaskShellBackendClass *class) shell_backend_class->aliases = ""; shell_backend_class->schemes = "task"; shell_backend_class->sort_order = 600; + shell_backend_class->preferences_page = "calendar-and-tasks"; shell_backend_class->start = NULL; shell_backend_class->migrate = e_task_shell_backend_migrate; diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 0d945c64d7..1e0655f7d4 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -907,6 +907,7 @@ mail_shell_backend_class_init (EMailShellBackendClass *class) shell_backend_class->aliases = ""; shell_backend_class->schemes = "mailto:email"; shell_backend_class->sort_order = 200; + shell_backend_class->preferences_page = "mail-accounts"; shell_backend_class->start = mail_shell_backend_start; shell_backend_class->migrate = e_mail_shell_migrate; } -- cgit v1.2.3