Revert r9519. It was breaking DND.

This commit is contained in:
Stephan Erb 2008-04-21 20:07:08 +00:00
parent 7d8f72d663
commit e504cee6fb
2 changed files with 5 additions and 5 deletions

View File

@ -377,20 +377,15 @@
<property name="headers_visible">False</property> <property name="headers_visible">False</property>
<property name="reorderable">True</property> <property name="reorderable">True</property>
<signal name="leave_notify_event" handler="on_roster_treeview_leave_notify_event"/> <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="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="motion_notify_event" handler="on_roster_treeview_motion_notify_event"/>
<signal name="row_collapsed" handler="on_roster_treeview_row_collapsed"/> <signal name="row_collapsed" handler="on_roster_treeview_row_collapsed"/>
<signal name="row_expanded" handler="on_roster_treeview_row_expanded"/> <signal name="row_expanded" handler="on_roster_treeview_row_expanded"/>
<signal name="key_press_event" handler="on_roster_treeview_key_press_event"/> <signal name="key_press_event" handler="on_roster_treeview_key_press_event"/>
<signal name="row_activated" handler="on_roster_treeview_row_activated"/> <signal name="row_activated" handler="on_roster_treeview_row_activated"/>
<signal name="button_release_event" handler="on_roster_treeview_button_release_event"/> <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="scroll_event" handler="on_roster_treeview_scroll_event"/>
<signal name="style_set" handler="on_roster_treeview_style_set"/> <signal name="style_set" handler="on_roster_treeview_style_set"/>
<signal name="drag_end" handler="self.drag_end"/>
</widget> </widget>
</child> </child>
</widget> </widget>

View File

@ -5826,6 +5826,11 @@ class RosterWindow:
self.tree.enable_model_drag_source(gtk.gdk.BUTTON1_MASK, TARGETS, self.tree.enable_model_drag_source(gtk.gdk.BUTTON1_MASK, TARGETS,
gtk.gdk.ACTION_DEFAULT | gtk.gdk.ACTION_MOVE | gtk.gdk.ACTION_COPY) 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.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.dragging = False
self.xml.signal_autoconnect(self) self.xml.signal_autoconnect(self)
self.combobox_callback_active = True self.combobox_callback_active = True