From f63f886772af1d3b8f5251ce7ae60f686fb169b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 5 Oct 2011 15:42:49 +0200 Subject: Bug #660878 - Account configuration options are not auto-filled --- mail/em-account-editor.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'mail') diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 8ec881b1f0..b8510b8600 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -1650,6 +1650,11 @@ emae_service_provider_changed (EMAccountEditorService *service) gint enable; GtkWidget *dwidget = NULL; + /* Remember the current port. Any following changes in SSL would overwrite it + and we don't want that since user can be using a non-standard port and we + would lost the value this way. */ + old_port = e_port_entry_get_port (service->port); + emae_setup_settings (service); camel_url_set_protocol (url, service->provider->protocol); @@ -1666,9 +1671,6 @@ emae_service_provider_changed (EMAccountEditorService *service) enable = e_account_writable (account, emae_service_info[service->type].save_passwd_key); gtk_widget_set_sensitive ((GtkWidget *) service->remember, enable); - if (service->port && service->provider->port_entries) - e_port_entry_set_camel_entries (service->port, service->provider->port_entries); - for (i = 0; emae_service_info[service->type].host_info[i].flag; i++) { GtkWidget *w; gint hide; @@ -1689,7 +1691,7 @@ emae_service_provider_changed (EMAccountEditorService *service) if (GTK_IS_ENTRY (w)) info->setval (url, enable ? gtk_entry_get_text ((GtkEntry *) w) : NULL); else if (E_IS_PORT_ENTRY (w)) - info->setval (url, enable?g_strdup_printf("%i", + info->setval (url, enable ? g_strdup_printf ("%i", e_port_entry_get_port (E_PORT_ENTRY (w))) : NULL); } } @@ -1724,7 +1726,6 @@ emae_service_provider_changed (EMAccountEditorService *service) gtk_widget_hide ((GtkWidget *) service->needs_auth); } #ifdef HAVE_SSL - old_port = url->port; gtk_widget_hide (service->no_ssl); if (service->provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL) { camel_url_set_port (url, e_port_entry_get_port (service->port)); @@ -1739,9 +1740,7 @@ emae_service_provider_changed (EMAccountEditorService *service) gtk_widget_show (service->no_ssl); #endif - /* This must be done AFTER use_ssl is set; changing use_ssl overwrites - * the old port, which could be SSL port, but also could be some special - * port and we would otherwise lost it */ + /* When everything is set it is safe to put back user's original port. */ if (url->port && service->provider->port_entries) e_port_entry_set_port (service->port, old_port); @@ -2206,9 +2205,6 @@ emae_setup_service (EMAccountEditor *emae, service->auth_changed_id = 0; - /* Do this first. Otherwise subsequent changes get clobbered. */ - emae_service_provider_changed (service); - g_signal_connect (service->hostname, "changed", G_CALLBACK (emae_hostname_changed), service); g_signal_connect (service->port, "changed", G_CALLBACK (emae_port_changed), service); g_signal_connect (service->username, "changed", G_CALLBACK (emae_username_changed), service); @@ -2247,6 +2243,9 @@ emae_setup_service (EMAccountEditor *emae, emae_refresh_providers (emae, service); emae_refresh_authtype (emae, service); + if (service->port && service->provider->port_entries) + e_port_entry_set_camel_entries (service->port, service->provider->port_entries); + /* Set the port after SSL is set, because it would overwrite the * port value (through emae_ssl_changed signal) */ if (url->port && service->provider->port_entries) { @@ -2264,6 +2263,8 @@ emae_setup_service (EMAccountEditor *emae, else gtk_widget_set_sensitive (service->container, TRUE); + emae_service_provider_changed (service); + camel_url_free (url); } -- cgit v1.2.3 From 224f26b84d9c12b0dd1d337f51c14b6ebb901007 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 4 Sep 2011 09:48:24 -0400 Subject: GtkApplication has some new EShell-like features. I pushed a few EShell features up to GtkApplication for GTK+ 3.2, so we can now trim off the redundancies in EShell. 1) GtkApplication has a new "window-added" signal which replaces EShell's own "window-created" signal. 2) GtkApplication has a new "window-removed" signal which replaces EShell's own "window-destroyed" signal. 3) gtk_application_get_windows() now returns a list of windows sorted by most recently focused, replacing e_shell_get_watched_windows(). 4) GtkApplication now provides enough hooks to subclasses that we can remove e_shell_watch_window() and call gtk_application_add_window() directly. --- mail/e-mail-backend.c | 10 ++++++++-- mail/e-mail-browser.c | 5 +++-- mail/mail-mt.c | 4 +++- 3 files changed, 14 insertions(+), 5 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index 5768934b1a..7cc33c14c6 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -632,10 +632,13 @@ mail_backend_job_finished_cb (CamelSession *session, } else if (error != NULL) { EShell *shell; + GtkApplication *application; GList *list, *iter; shell = e_shell_backend_get_shell (shell_backend); - list = e_shell_get_watched_windows (shell); + + application = GTK_APPLICATION (shell); + list = gtk_application_get_windows (application); /* Submit the error to an appropriate EAlertSink. */ for (iter = list; iter != NULL; iter = g_list_next (iter)) { @@ -917,6 +920,7 @@ e_mail_backend_submit_alert (EMailBackend *backend, EShellContent *shell_content; EShellWindow *shell_window = NULL; EShellBackendClass *class; + GtkApplication *application; GList *list, *iter; va_list va; @@ -931,8 +935,10 @@ e_mail_backend_submit_alert (EMailBackend *backend, shell_backend = E_SHELL_BACKEND (backend); shell = e_shell_backend_get_shell (shell_backend); + application = GTK_APPLICATION (shell); + list = gtk_application_get_windows (application); + /* Find the most recently used EShellWindow. */ - list = e_shell_get_watched_windows (shell); for (iter = list; iter != NULL; iter = g_list_next (iter)) { if (E_IS_SHELL_WINDOW (iter->data)) { shell_window = E_SHELL_WINDOW (iter->data); diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index 95084c6d28..fe8b8984f3 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -580,9 +580,10 @@ mail_browser_constructed (GObject *object) priv->ui_manager = ui_manager; domain = GETTEXT_PACKAGE; - formatter = e_mail_reader_get_formatter (reader); - e_shell_watch_window (shell, GTK_WINDOW (object)); + gtk_application_add_window ( + GTK_APPLICATION (shell), GTK_WINDOW (object)); + formatter = e_mail_reader_get_formatter (reader); web_view = em_format_html_get_web_view (formatter); /* The message list is a widget, but it is not shown in the browser. diff --git a/mail/mail-mt.c b/mail/mail-mt.c index d904eed546..0d05a21a86 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -200,6 +200,7 @@ mail_msg_check_error (gpointer msg) EShellView *shell_view; EShellWindow *shell_window = NULL; EShellContent *shell_content; + GtkApplication *application; MailMsg *m = msg; gchar *what; GList *list, *iter; @@ -226,9 +227,10 @@ mail_msg_check_error (gpointer msg) return; shell = e_shell_get_default (); + application = GTK_APPLICATION (shell); + list = gtk_application_get_windows (application); /* Find the most recently used EShellWindow. */ - list = e_shell_get_watched_windows (shell); for (iter = list; iter != NULL; iter = g_list_next (iter)) { if (E_IS_SHELL_WINDOW (iter->data)) { shell_window = E_SHELL_WINDOW (iter->data); -- cgit v1.2.3 From 938505da180727fbc56b68b80851adc3cf676523 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 4 Sep 2011 14:30:36 -0400 Subject: Let GtkFileChooser track its own last-used-folder. GtkFileChooser in GTK+ 3.2 now keeps track of the last-used-folder itself, even across applications, so get out of its way and let it handle it. --- mail/evolution-mail.schemas.in | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'mail') diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index 82be1319c8..c26c0feb96 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -1588,20 +1588,6 @@ - - /schemas/apps/evolution/mail/composer/current_folder - /apps/evolution/mail/composer/current_folder - evolution-mail - string - - - Composer load/attach directory - - Directory for loading/attaching files to composer. - - - - -- cgit v1.2.3 From 126aa2398abc1bbab0fd0cd76fda5042cc83fe76 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 6 Oct 2011 09:35:14 -0400 Subject: Prefer g_simple_async_result_take_error(). Slightly more efficient and convenient than: g_simple_async_result_set_from_error (simple, error); g_error_free (error); One less GError to copy and destroy. --- mail/e-mail-folder-utils.c | 42 ++++++++++++++---------------------------- mail/e-mail-session-utils.c | 33 +++++++++++---------------------- mail/e-mail-session.c | 18 ++++++------------ mail/e-mail-store-utils.c | 24 ++++++++---------------- 4 files changed, 39 insertions(+), 78 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-folder-utils.c b/mail/e-mail-folder-utils.c index 77a9708e5f..fe093adb21 100644 --- a/mail/e-mail-folder-utils.c +++ b/mail/e-mail-folder-utils.c @@ -84,10 +84,8 @@ mail_folder_append_message_thread (GSimpleAsyncResult *simple, context->info, &context->message_uid, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } gboolean @@ -199,10 +197,8 @@ mail_folder_build_attachment_thread (GSimpleAsyncResult *simple, CAMEL_FOLDER (object), context->ptr_array, &context->fwd_subject, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } CamelMimePart * @@ -359,10 +355,8 @@ mail_folder_find_duplicate_messages_thread (GSimpleAsyncResult *simple, CAMEL_FOLDER (object), context->ptr_array, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } GHashTable * @@ -559,10 +553,8 @@ mail_folder_get_multiple_messages_thread (GSimpleAsyncResult *simple, CAMEL_FOLDER (object), context->ptr_array, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } GHashTable * @@ -685,10 +677,8 @@ mail_folder_remove_thread (GSimpleAsyncResult *simple, e_mail_folder_remove_sync ( CAMEL_FOLDER (object), cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } static gboolean @@ -912,10 +902,8 @@ mail_folder_remove_attachments_thread (GSimpleAsyncResult *simple, CAMEL_FOLDER (object), context->ptr_array, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } /* Helper for e_mail_folder_remove_attachments_sync() */ @@ -1128,10 +1116,8 @@ mail_folder_save_messages_thread (GSimpleAsyncResult *simple, CAMEL_FOLDER (object), context->ptr_array, context->destination, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } /* Helper for e_mail_folder_save_messages_sync() */ diff --git a/mail/e-mail-session-utils.c b/mail/e-mail-session-utils.c index 217e7e2e8e..eca58bcad0 100644 --- a/mail/e-mail-session-utils.c +++ b/mail/e-mail-session-utils.c @@ -131,10 +131,8 @@ mail_session_handle_draft_headers_thread (GSimpleAsyncResult *simple, e_mail_session_handle_draft_headers_sync ( session, context->message, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } gboolean @@ -249,10 +247,8 @@ mail_session_handle_source_headers_thread (GSimpleAsyncResult *simple, e_mail_session_handle_source_headers_sync ( session, context->message, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } gboolean @@ -426,8 +422,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, /* XXX This API does not allow for cancellation. */ if (!em_utils_connect_service_sync (service, cancellable, &error)) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); + g_simple_async_result_take_error (simple, error); return; } } @@ -448,8 +443,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, cancellable, error ? NULL : &error); if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); + g_simple_async_result_take_error (simple, error); return; } } @@ -466,8 +460,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, if (error != NULL) { g_warn_if_fail (folder == NULL); - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); + g_simple_async_result_take_error (simple, error); return; } @@ -480,8 +473,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, g_object_unref (folder); if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); + g_simple_async_result_take_error (simple, error); return; } } @@ -615,8 +607,7 @@ exit: /* If we were cancelled, disregard any other errors. */ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); + g_simple_async_result_take_error (simple, error); /* Stuff the accumulated error messages in a GError. */ } else if (error_messages->len > 0) { @@ -843,10 +834,8 @@ mail_session_unsubscribe_folder_thread (GSimpleAsyncResult *simple, e_mail_session_unsubscribe_folder_sync ( session, context->folder_uri, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } gboolean diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c index 45c8e0209c..0687d7561f 100644 --- a/mail/e-mail-session.c +++ b/mail/e-mail-session.c @@ -1249,10 +1249,8 @@ mail_session_get_inbox_thread (GSimpleAsyncResult *simple, context->folder = e_mail_session_get_inbox_sync ( session, context->uid, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } CamelFolder * @@ -1348,10 +1346,8 @@ mail_session_get_trash_thread (GSimpleAsyncResult *simple, context->folder = e_mail_session_get_trash_sync ( session, context->uid, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } CamelFolder * @@ -1448,10 +1444,8 @@ mail_session_uri_to_folder_thread (GSimpleAsyncResult *simple, session, context->uri, context->flags, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } CamelFolder * diff --git a/mail/e-mail-store-utils.c b/mail/e-mail-store-utils.c index 0bf70ae94d..7f978c8b7f 100644 --- a/mail/e-mail-store-utils.c +++ b/mail/e-mail-store-utils.c @@ -54,10 +54,8 @@ mail_store_create_folder_thread (GSimpleAsyncResult *simple, CAMEL_STORE (object), context->full_name, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } gboolean @@ -191,10 +189,8 @@ mail_store_go_offline_thread (GSimpleAsyncResult *simple, } else em_utils_disconnect_service_sync (service, TRUE, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); camel_operation_pop_message (cancellable); } @@ -270,10 +266,8 @@ mail_store_go_online_thread (GSimpleAsyncResult *simple, CAMEL_OFFLINE_STORE (store), TRUE, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); camel_operation_pop_message (cancellable); } @@ -343,10 +337,8 @@ mail_store_prepare_for_offline_thread (GSimpleAsyncResult *simple, camel_offline_store_prepare_for_offline_sync ( CAMEL_OFFLINE_STORE (store), cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); camel_operation_pop_message (cancellable); } -- cgit v1.2.3 From d79ca40b62e72b1ec516631bbffabd6e2cad15e6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 6 Oct 2011 16:59:04 +0200 Subject: Adapt to CamelFolderSummary API changes --- mail/e-mail-backend.c | 2 +- mail/em-folder-properties.c | 6 +++--- mail/em-format-html-display.c | 2 +- mail/mail-folder-cache.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index 7cc33c14c6..cb91339503 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -349,7 +349,7 @@ mail_backend_quit_requested_cb (EShell *shell, if (folder == NULL) return; - if (folder->summary->visible_count == 0) + if (camel_folder_summary_get_visible_count (folder->summary) == 0) return; response = e_alert_run_dialog_for_args ( diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index a89abcd036..6e8e04c26f 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -268,9 +268,9 @@ emfp_dialog_run (AsyncContext *context) * messages. VISIBLE+DELETED gives the correct count that matches * the label below the Send & Receive button. */ name = camel_folder_get_display_name (context->folder); - context->total = context->folder->summary->visible_count; - context->unread = context->folder->summary->unread_count; - deleted = context->folder->summary->deleted_count; + context->total = camel_folder_summary_get_visible_count (context->folder->summary); + context->unread = camel_folder_summary_get_unread_count (context->folder->summary); + deleted = camel_folder_summary_get_deleted_count (context->folder->summary); client = gconf_client_get_default (); key = "/apps/evolution/mail/display/show_deleted"; diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index de165073ce..a2a49defaa 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -1137,7 +1137,7 @@ efhd_attachment_button (EMFormatHTML *efh, if (emf->folder && emf->folder->summary && emf->uid) { CamelMessageInfo *mi; - mi = camel_folder_summary_uid (emf->folder->summary, emf->uid); + mi = camel_folder_summary_get (emf->folder->summary, emf->uid); if (mi) { const CamelMessageContentInfo *ci; diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 30bbce6579..5dd215a156 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -287,7 +287,7 @@ update_1folder (MailFolderCache *self, if ((deleted = camel_folder_get_deleted_message_count (folder)) > 0) unread -= deleted; - junked = folder->summary->junk_count; + junked = camel_folder_summary_get_junk_count (folder->summary); if (junked > 0) unread -= junked; } -- cgit v1.2.3 From 03a438c3acff6e97146836a84da7236b69cd37fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Fri, 7 Oct 2011 14:29:37 +0200 Subject: Bug #658066 - Security dialog is too big Fixed security dialog default size and resizing issues by simplifying the layout and replacing GtkVBoxes by GtkGrids. --- mail/em-format-html-display.c | 28 +++++++++--------- mail/mail-dialogs.ui | 68 ++++--------------------------------------- 2 files changed, 21 insertions(+), 75 deletions(-) (limited to 'mail') diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index a2a49defaa..158b647641 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -206,7 +206,7 @@ efhd_xpkcs7mime_viewcert_clicked (GtkWidget *button, #endif static void -efhd_xpkcs7mime_add_cert_table (GtkWidget *vbox, +efhd_xpkcs7mime_add_cert_table (GtkWidget *grid, CamelDList *certlist, struct _smime_pobject *po) { @@ -260,7 +260,7 @@ efhd_xpkcs7mime_add_cert_table (GtkWidget *vbox, info = info->next; } - gtk_box_pack_start ((GtkBox *) vbox, (GtkWidget *) table, TRUE, TRUE, 6); + gtk_container_add (GTK_CONTAINER (grid), GTK_WIDGET (table)); } static void @@ -269,7 +269,7 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button, { struct _smime_pobject *po = (struct _smime_pobject *) pobject; GtkBuilder *builder; - GtkWidget *vbox, *w; + GtkWidget *grid, *w; if (po->widget) /* FIXME: window raise? */ @@ -280,11 +280,11 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button, po->widget = e_builder_get_widget(builder, "message_security_dialog"); - vbox = e_builder_get_widget(builder, "signature_vbox"); + grid = e_builder_get_widget(builder, "signature_grid"); w = gtk_label_new (_(smime_sign_table[po->valid->sign.status].description)); gtk_misc_set_alignment ((GtkMisc *) w, 0.0, 0.5); gtk_label_set_line_wrap ((GtkLabel *) w, TRUE); - gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 6); + gtk_container_add (GTK_CONTAINER (grid), w); if (po->valid->sign.description) { GtkTextBuffer *buffer; @@ -294,6 +294,7 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button, "hscrollbar_policy", GTK_POLICY_AUTOMATIC, "vscrollbar_policy", GTK_POLICY_AUTOMATIC, "shadow_type", GTK_SHADOW_IN, + "expand", TRUE, "child", g_object_new(gtk_text_view_get_type(), "buffer", buffer, "cursor_visible", FALSE, @@ -304,19 +305,19 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button, NULL); g_object_unref (buffer); - gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 6); + gtk_container_add (GTK_CONTAINER (grid), w); } if (!camel_dlist_empty (&po->valid->sign.signers)) - efhd_xpkcs7mime_add_cert_table (vbox, &po->valid->sign.signers, po); + efhd_xpkcs7mime_add_cert_table (grid, &po->valid->sign.signers, po); - gtk_widget_show_all (vbox); + gtk_widget_show_all (grid); - vbox = e_builder_get_widget(builder, "encryption_vbox"); + grid = e_builder_get_widget(builder, "encryption_grid"); w = gtk_label_new (_(smime_encrypt_table[po->valid->encrypt.status].description)); gtk_misc_set_alignment ((GtkMisc *) w, 0.0, 0.5); gtk_label_set_line_wrap ((GtkLabel *) w, TRUE); - gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 6); + gtk_container_add (GTK_CONTAINER (grid), w); if (po->valid->encrypt.description) { GtkTextBuffer *buffer; @@ -326,6 +327,7 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button, "hscrollbar_policy", GTK_POLICY_AUTOMATIC, "vscrollbar_policy", GTK_POLICY_AUTOMATIC, "shadow_type", GTK_SHADOW_IN, + "expand", TRUE, "child", g_object_new(gtk_text_view_get_type(), "buffer", buffer, "cursor_visible", FALSE, @@ -336,13 +338,13 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button, NULL); g_object_unref (buffer); - gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 6); + gtk_container_add (GTK_CONTAINER (grid), w); } if (!camel_dlist_empty (&po->valid->encrypt.encrypters)) - efhd_xpkcs7mime_add_cert_table (vbox, &po->valid->encrypt.encrypters, po); + efhd_xpkcs7mime_add_cert_table (grid, &po->valid->encrypt.encrypters, po); - gtk_widget_show_all (vbox); + gtk_widget_show_all (grid); g_object_unref (builder); diff --git a/mail/mail-dialogs.ui b/mail/mail-dialogs.ui index 58a9f8c2aa..d3382dc18d 100644 --- a/mail/mail-dialogs.ui +++ b/mail/mail-dialogs.ui @@ -578,41 +578,13 @@ Please select a follow up action from the "Flag" menu. - + True + GTK_ORIENTATION_VERTICAL - - True - 12 - - - False - False - 0 - - - - - True - 6 - 2 - - - True - - - - - - - - 1 - + - - 1 - @@ -641,41 +613,13 @@ Please select a follow up action from the "Flag" menu. - + True + GTK_ORIENTATION_VERTICAL - - True - 12 - - - False - False - 0 - - - - - True - 6 - 2 - - - True - - - - - - - - 1 - + - - 1 - -- cgit v1.2.3