From e504cee6fb41801fb669dea5ba9cafdd5323bffb Mon Sep 17 00:00:00 2001
From: Stephan Erb <steve-e@h3c.de>
Date: Mon, 21 Apr 2008 20:07:08 +0000
Subject: [PATCH] Revert r9519. It was breaking DND.

---
 data/glade/roster_window.glade | 5 -----
 src/roster_window.py           | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/glade/roster_window.glade b/data/glade/roster_window.glade
index 834a2a531..c480f6879 100644
--- a/data/glade/roster_window.glade
+++ b/data/glade/roster_window.glade
@@ -377,20 +377,15 @@
                         <property name="headers_visible">False</property>
                         <property name="reorderable">True</property>
                         <signal name="leave_notify_event" handler="on_roster_treeview_leave_notify_event"/>
-                        <signal name="drag_data_get" handler="self.drag_data_get_data"/>
                         <signal name="button_press_event" handler="on_roster_treeview_button_press_event"/>
-                        <signal name="drag_begin" handler="self.drag_begin"/>
                         <signal name="motion_notify_event" handler="on_roster_treeview_motion_notify_event"/>
                         <signal name="row_collapsed" handler="on_roster_treeview_row_collapsed"/>
                         <signal name="row_expanded" handler="on_roster_treeview_row_expanded"/>
                         <signal name="key_press_event" handler="on_roster_treeview_key_press_event"/>
                         <signal name="row_activated" handler="on_roster_treeview_row_activated"/>
                         <signal name="button_release_event" handler="on_roster_treeview_button_release_event"/>
-                        <signal name="drag_drop" handler="self.drag_drop"/>
-                        <signal name="drag_data_received" handler="self.drag_data_received_data"/>
                         <signal name="scroll_event" handler="on_roster_treeview_scroll_event"/>
                         <signal name="style_set" handler="on_roster_treeview_style_set"/>
-                        <signal name="drag_end" handler="self.drag_end"/>
                       </widget>
                     </child>
                   </widget>
diff --git a/src/roster_window.py b/src/roster_window.py
index 2f5dac077..79e9a11d4 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -5826,6 +5826,11 @@ class RosterWindow:
 		self.tree.enable_model_drag_source(gtk.gdk.BUTTON1_MASK, TARGETS,
 			gtk.gdk.ACTION_DEFAULT | gtk.gdk.ACTION_MOVE | gtk.gdk.ACTION_COPY)
 		self.tree.enable_model_drag_dest(TARGETS2, gtk.gdk.ACTION_DEFAULT)
+		self.tree.connect('drag_begin', self.drag_begin)
+		self.tree.connect('drag_end', self.drag_end)
+		self.tree.connect('drag_drop', self.drag_drop)
+		self.tree.connect('drag_data_get', self.drag_data_get_data)
+		self.tree.connect('drag_data_received', self.drag_data_received_data)
 		self.dragging = False
 		self.xml.signal_autoconnect(self)
 		self.combobox_callback_active = True