2011-10-25 [colin] 3.7.10cvs47

	* src/mimeview.c
		Fix bug #2529, 'crash in mimeview_start_drag after
		deleting message'. Patch by Ricardo

diff --git a/ChangeLog b/ChangeLog
index b5da2d1820220daf97e793394cdb7cd5915edcfd..03807e59338665bbae7caa2d46e7a4772b5d3fbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-25 [colin]     3.7.10cvs47
+
+       * src/mimeview.c
+               Fix bug #2529, 'crash in mimeview_start_drag after
+               deleting message'. Patch by Ricardo
+
 2011-10-23 [colin]     3.7.10cvs46
 
        * src/gtk/gtkcmclist.c

diff --git a/PATCHSETS b/PATCHSETS
index 1e88efb8394a779e9657d96bb282a993ebf18a36..1050e574397cc4fead632dbd89c241ee6522bd65 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4250,3 +4250,4 @@
 ( cvs diff -u -r 1.9.2.33 -r 1.9.2.34 src/addressadd.c;  cvs diff -u -r 1.60.2.145 -r 1.60.2.146 src/addressbook.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/addressbook_foldersel.c;  cvs diff -u -r 1.11.2.27 -r 1.11.2.28 src/editgroup.c;  cvs diff -u -r 1.26.2.47 -r 1.26.2.48 src/foldersel.c;  cvs diff -u -r 1.207.2.223 -r 1.207.2.224 src/folderview.c;  cvs diff -u -r 1.14.2.31 -r 1.14.2.32 src/grouplistdialog.c;  cvs diff -u -r 1.204.2.202 -r 1.204.2.203 src/prefs_common.c;  cvs diff -u -r 1.103.2.133 -r 1.103.2.134 src/prefs_common.h;  cvs diff -u -r 1.395.2.433 -r 1.395.2.434 src/summaryview.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtkcmctree.h;  cvs diff -u -r 1.1.4.62 -r 1.1.4.63 src/gtk/gtksctree.c;  ) > 3.7.10cvs44.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/gtkcmclist.h;  ) > 3.7.10cvs45.patchset
 ( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/gtk/gtkcmctree.c;  ) > 3.7.10cvs46.patchset
+( cvs diff -u -r 1.83.2.174 -r 1.83.2.175 src/mimeview.c;  ) > 3.7.10cvs47.patchset

diff --git a/configure.ac b/configure.ac
index 66f1a04c6714c7ccc90dedb61eadfdd9c2dd3fd5..68f08b61db611b22f1e695055007a9932cc2b07a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=46
+EXTRA_VERSION=47
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mimeview.c b/src/mimeview.c
index 4fba82de16a263d7dc8b9776e6e82f1dbb95e1fd..5c9d633d657a0fc5e798452498071d79a57dd3bc 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1290,7 +1290,9 @@ static void mimeview_start_drag(GtkWidget *widget, gint button,
        cm_return_if_fail(mimeview != NULL);
 
        partinfo = mimeview_get_selected_part(mimeview);
-       if (partinfo->disposition == DISPOSITIONTYPE_INLINE) return;
+       if (partinfo == NULL || 
+           partinfo->disposition == DISPOSITIONTYPE_INLINE)
+               return;
 
        context = gtk_drag_begin(widget, mimeview->target_list,
                                 GDK_ACTION_COPY, button, event);