diff options
author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-10 18:50:18 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-10 18:50:18 +0800 |
commit | 56a166bb42bd55216a489c0b850ddd6bca2a3cd5 (patch) | |
tree | 3f87cf07fd6098ab2700c56d71d97686c5e5bc71 /mail/em-format-html-display.c | |
parent | 8fd93c9042bb30e53ce88303f8a0789a6ca688eb (diff) | |
parent | 6d5db4c7cd468d424ea8628344c5a1bba6fc3d7c (diff) | |
download | gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.gz gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.bz2 gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.lz gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.xz gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.zst gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.zip |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'mail/em-format-html-display.c')
-rw-r--r-- | mail/em-format-html-display.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index de165073ce..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); @@ -1137,7 +1139,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; |