From d158af8cdfa6e4bf85c1e74769e8d61bc469494c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Wed, 10 Dec 2008 18:30:29 +0000
Subject: Merge revisions 36811:36865 from trunk.

svn path=/branches/kill-bonobo/; revision=36867
---
 widgets/misc/ChangeLog            | 14 ++++++++++++++
 widgets/misc/e-attachment-bar.c   |  3 ++-
 widgets/misc/e-send-options.glade |  4 ++--
 3 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'widgets/misc')

diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index e7b9460b10..c519df2d47 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,17 @@
+2008-12-10  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #556303
+
+	* e-attachment-bar.c: (eab_icon_clicked_cb):
+	Check whether attachment has a body already before accessing it.
+
+2008-12-09  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #563669
+
+	* e-send-options.glade:
+	Use zero GtkSpinButton's PageSize, as Gtk+ requires.
+
 2008-10-29  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/widgets/misc/e-attachment-bar.c b/widgets/misc/e-attachment-bar.c
index 1e41a95338..bdb6852e13 100644
--- a/widgets/misc/e-attachment-bar.c
+++ b/widgets/misc/e-attachment-bar.c
@@ -1001,7 +1001,8 @@ eab_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, gpointer *dummy)
 
 	if (E_IS_ATTACHMENT_BAR (bar) && event->type == GDK_2BUTTON_PRESS) {
 		p = e_attachment_bar_get_selected (bar);
-		if (p && p->next == NULL) {
+		/* check if has body already, remote files can take longer to fetch */
+		if (p && p->next == NULL && ((EAttachment *)p->data)->body) {
 			attachment = p->data;
 
 			/* Check if the file is stored already */
diff --git a/widgets/misc/e-send-options.glade b/widgets/misc/e-send-options.glade
index fd509488da..1c1cc486d0 100644
--- a/widgets/misc/e-send-options.glade
+++ b/widgets/misc/e-send-options.glade
@@ -220,7 +220,7 @@
 				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 				  <property name="snap_to_ticks">False</property>
 				  <property name="wrap">False</property>
-				  <property name="adjustment">5 0 100 1 10 10</property>
+				  <property name="adjustment">5 0 100 1 10 0</property>
 				</widget>
 				<packing>
 				  <property name="left_attach">1</property>
@@ -450,7 +450,7 @@
 				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 				  <property name="snap_to_ticks">False</property>
 				  <property name="wrap">False</property>
-				  <property name="adjustment">2 0 100 1 10 10</property>
+				  <property name="adjustment">2 0 100 1 10 0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
-- 
cgit