[conduit] 2009-07-15 Andrew Stormont <astormont svn gnome org>

[Andrew Stormont <astormont src gnome org>]

commit 31476bcf3d4dd4441589e7b47d656f68067f44a2
Author: Andrew Stormont <andy andrew-stormonts-power-mac-g4 local>
Date:   Wed Jul 15 14:55:59 2009 +0200

    2009-07-15  Andrew Stormont  <astormont svn gnome org>
    
    	* conduit/conduit.real:
    	* conduit/gtkui/UI.py:
    	Workaround for PyGTK bug on Mac OSX

 ChangeLog             |    6 ++++++
 conduit/conduit.real  |    2 +-
 conduit/gtkui/Tree.py |   10 +++++-----
 conduit/gtkui/UI.py   |    8 +++++++-
 4 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9422a23..2bc2c27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-15  Andrew Stormont  <astormont svn gnome org>
+
+	* conduit/conduit.real:
+	* conduit/gtkui/UI.py:
+	Workaround for PyGTK bug on Mac OSX
+
 2009-04-17 John Stowers  <john stowers gmail com>
 
 	* conduit/modules/NetworkModule/XMLRPCUtils.py:
diff --git a/conduit/conduit.real b/conduit/conduit.real
index a2ac906..38e9ddb 100755
--- a/conduit/conduit.real
+++ b/conduit/conduit.real
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 """
 This module tests whether conduit appears 
 to be running from the source directory.
diff --git a/conduit/gtkui/Tree.py b/conduit/gtkui/Tree.py
index d8c9785..e2bca4e 100644
--- a/conduit/gtkui/Tree.py
+++ b/conduit/gtkui/Tree.py
@@ -363,11 +363,11 @@ class DataProviderTreeView(gtk.TreeView):
         # DND info:
         # drag
         self.enable_model_drag_source(  gtk.gdk.BUTTON1_MASK,
-                                        self.DND_TARGETS,
-                                        gtk.gdk.ACTION_DEFAULT | gtk.gdk.ACTION_MOVE)
-        self.drag_source_set(           gtk.gdk.BUTTON1_MASK | gtk.gdk.BUTTON3_MASK,
-                                        self.DND_TARGETS,
-                                        gtk.gdk.ACTION_COPY | gtk.gdk.ACTION_LINK)
+                               self.DND_TARGETS,
+                               gtk.gdk.ACTION_DEFAULT | gtk.gdk.ACTION_MOVE)
+        self.drag_source_set(  gtk.gdk.BUTTON1_MASK | gtk.gdk.BUTTON3_MASK,
+                               self.DND_TARGETS,
+                               gtk.gdk.ACTION_COPY | gtk.gdk.ACTION_LINK)
         self.connect('drag-data-get', self.on_drag_data_get)
         self.connect('drag-data-delete', self.on_drag_data_delete)
         
diff --git a/conduit/gtkui/UI.py b/conduit/gtkui/UI.py
index 05fc2d7..e66edfd 100644
--- a/conduit/gtkui/UI.py
+++ b/conduit/gtkui/UI.py
@@ -532,7 +532,13 @@ class MainWindow:
         """
         drop cb
         """
-        self.canvas.drag_get_data(context, context.targets[0], time)
+        if context.targets:
+            target = context.targets[0]
+        else:
+            # FIXME: work-around for a bug in PyGTK on OSX: 
+            # http://bugzilla.gnome.org/show_bug.cgi?id=588643
+            target = 'conduit/element-name'
+        self.canvas.drag_get_data(context, target, time)
         return True
         
     def drag_data_received_data(self, treeview, context, x, y, selection, info, etime):