diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-03-27 03:33:16 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-03-27 03:33:16 +0800 |
| commit | bc4f60ba176b64cc8fd8ffa47a01542f8eb25bdf (patch) | |
| tree | ba8f579a8027e4e65d037e5947930fc04d8512e2 /mail | |
| parent | c05c973cff53769ef575bfc5257a2a414117b323 (diff) | |
| download | gsoc2013-evolution-bc4f60ba176b64cc8fd8ffa47a01542f8eb25bdf.tar.gz gsoc2013-evolution-bc4f60ba176b64cc8fd8ffa47a01542f8eb25bdf.tar.zst gsoc2013-evolution-bc4f60ba176b64cc8fd8ffa47a01542f8eb25bdf.zip | |
Saving progress again on the attachment rewrite.
svn path=/branches/kill-bonobo/; revision=37478
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-attachment-bar.c | 4 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 4424a84684..97f5a7fb00 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -453,7 +453,7 @@ mail_attachment_bar_init (EMailAttachmentBar *bar) container = GTK_WIDGET (bar); - widget = gtk_hbox_new (FALSE, 6); + widget = gtk_hbox_new (FALSE, 12); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); gtk_widget_show (widget); @@ -481,7 +481,7 @@ mail_attachment_bar_init (EMailAttachmentBar *bar) container = bar->priv->expander; - widget = gtk_hbox_new (FALSE, 0); + widget = gtk_hbox_new (FALSE, 6); gtk_size_group_add_widget (size_group, widget); gtk_expander_set_label_widget (GTK_EXPANDER (container), widget); gtk_widget_show (widget); diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 6020ce4845..1bbe282394 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -477,9 +477,6 @@ efhd_format_attachment (EMFormat *emf, const gchar *mime_type, const EMFormatHandler *handle) { - EMFormatHTMLDisplay *efhd; - EAttachmentView *view; - EAttachmentStore *store; char *classid, *text, *html; struct _attach_puri *info; @@ -1295,11 +1292,9 @@ static gboolean efhd_attachment_button(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject) { EMFormatHTMLDisplay *efhd = (EMFormatHTMLDisplay *)efh; - EAttachment *new; struct _attach_puri *info; GtkWidget *hbox, *w, *button, *mainbox; - char *simple_type, *tmp, *new_file = NULL; - const char *file; + char *simple_type; GtkTargetEntry drag_types[] = { { NULL, 0, 0 }, { "text/uri-list", 0, 1 }, @@ -1321,7 +1316,7 @@ efhd_attachment_button(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObje EAttachmentStore *store; gpointer parent; - parent = gtk_widget_get_toplevel (efhd->priv->attachment_bar); + parent = gtk_widget_get_toplevel (GTK_WIDGET (efh->html)); parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL; view = E_ATTACHMENT_VIEW (efhd->priv->attachment_bar); |