aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-03-30 11:38:36 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-03-30 11:38:36 +0800
commit8a1f639a670696e71daac8305ae0823668d29a14 (patch)
tree3b7c8ec8f856095865211a40ebcaf33ca572d94f /composer
parentbc4f60ba176b64cc8fd8ffa47a01542f8eb25bdf (diff)
downloadgsoc2013-evolution-8a1f639a670696e71daac8305ae0823668d29a14.tar.gz
gsoc2013-evolution-8a1f639a670696e71daac8305ae0823668d29a14.tar.zst
gsoc2013-evolution-8a1f639a670696e71daac8305ae0823668d29a14.zip
Saving progress again on the attachment rewrite.
svn path=/branches/kill-bonobo/; revision=37482
Diffstat (limited to 'composer')
-rw-r--r--composer/e-composer-private.c2
-rw-r--r--composer/e-msg-composer.c2
-rw-r--r--composer/evolution-composer.ui3
3 files changed, 4 insertions, 3 deletions
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index aba1fdbe9f..91d71850fd 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -152,7 +152,7 @@ e_composer_private_init (EMsgComposer *composer)
/* Construct the attachment paned. */
widget = e_attachment_paned_new ();
- gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
+ /*gtk_container_set_border_width (GTK_CONTAINER (widget), 6);*/
gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
priv->attachment_paned = g_object_ref (widget);
gtk_widget_show (widget);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index fd7a9939f6..f6e85b78c8 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2285,6 +2285,7 @@ msg_composer_init (EMsgComposer *composer)
/* Drag-and-Drop Support */
+#if 0 /* KILL-BONOBO */
gtk_drag_dest_set (
GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL,
drop_types, G_N_ELEMENTS (drop_types),
@@ -2293,6 +2294,7 @@ msg_composer_init (EMsgComposer *composer)
g_signal_connect (
html, "drag-data-received",
G_CALLBACK (msg_composer_drag_data_received), NULL);
+#endif
/* Configure Headers */
diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui
index 1b8957640f..8c422c06f4 100644
--- a/composer/evolution-composer.ui
+++ b/composer/evolution-composer.ui
@@ -9,7 +9,7 @@
<menuitem action='save'/>
<menuitem action='save-as'/>
<menuitem action='save-draft'/>
- <placeholder name='template-holder'/>
+ <placeholder name='template-holder'/>
<separator/>
<menuitem action='print-preview'/>
<menuitem action='print'/>
@@ -58,7 +58,6 @@
<toolitem action='send'/>
<separator/>
<toolitem action='save-draft'/>
- <toolitem action='attach'/>
<separator/>
</placeholder>
</toolbar>