epiphany r8606 - branches/gnome-2-24/lib/egg

[chpe svn gnome org]

Author: chpe
Date: Wed Nov  5 14:53:03 2008
New Revision: 8606
URL: http://svn.gnome.org/viewvc/epiphany?rev=8606&view=rev

Log:
Fix multi-dnd with gtk 2.14

Modified:
   branches/gnome-2-24/lib/egg/eggtreemultidnd.c

Modified: branches/gnome-2-24/lib/egg/eggtreemultidnd.c
==============================================================================
--- branches/gnome-2-24/lib/egg/eggtreemultidnd.c	(original)
+++ branches/gnome-2-24/lib/egg/eggtreemultidnd.c	Wed Nov  5 14:53:03 2008
@@ -17,8 +17,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <gtk/gtk.h>
+
 #include "eggtreemultidnd.h"
 
 #define EGG_TREE_MULTI_DND_STRING "EggTreeMultiDndString"
@@ -56,7 +59,7 @@
 
   if (!our_type)
     {
-      const GTypeInfo our_info =
+      static const GTypeInfo our_info =
       {
         sizeof (EggTreeMultiDragSourceIface), /* class_size */
 	NULL,		/* base_init */
@@ -315,7 +318,11 @@
 	{
 
 	  context = gtk_drag_begin (widget,
+#if GTK_CHECK_VERSION (2, 14, 0)
+                                    gtk_drag_source_get_target_list (widget),
+#else
 				    di->source_target_list,
+#endif
 				    di->source_actions,
 				    priv_data->pressed_button,
 				    (GdkEvent*)event);