[Commits] [SCM] claws branch, master, updated. 3.12.0-21-g3b14f47

[ticho at claws-mail.org]

The branch, master has been updated
       via  3b14f476066860518abe501187f600125832f2ad (commit)
      from  f0b7352b384ee88c1202378483ec213395ccf94b (commit)

Summary of changes:
 src/compose.c |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 3b14f476066860518abe501187f600125832f2ad
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Jul 25 14:02:33 2015 +0200

    Fixed handling of drag&drop onto compose text area on Windows.
    
    Fixes bug #3475.

diff --git a/src/compose.c b/src/compose.c
index 959f6fc..13a7def 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -11144,11 +11144,8 @@ static void compose_attach_drag_received_cb (GtkWidget		*widget,
 	GdkAtom type;
 
 	type = gtk_selection_data_get_data_type(data);
-	if (((gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "text/uri-list"))
-#ifdef G_OS_WIN32
-	 || (gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "DROPFILES_DND"))
-#endif
-	   ) && gtk_drag_get_source_widget(context) != 
+	if ((gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "text/uri-list"))
+	   && gtk_drag_get_source_widget(context) !=
 	        summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
 		list = uri_list_extract_filenames(
 			(const gchar *)gtk_selection_data_get_data(data));
@@ -11231,11 +11228,7 @@ static void compose_insert_drag_received_cb (GtkWidget		*widget,
 	/* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
 	 * does not work */
 	type = gtk_selection_data_get_data_type(data);
-#ifndef G_OS_WIN32
 	if (gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "text/uri-list")) {
-#else
-	if (gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "DROPFILES_DND")) {
-#endif
 		AlertValue val = G_ALERTDEFAULT;
 		const gchar* ddata = (const gchar *)gtk_selection_data_get_data(data);
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail