From c788ba0fafe0143c06efb32a633aef139d21e142 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 13 Sep 2001 21:11:22 +0000 Subject: Disable DnD on the EStorageSetView to avoid strange behaviors. * e-shell-view.c (pop_up_folder_bar): Disable DnD on the EStorageSetView to avoid strange behaviors. (reparent_storage_set_view_box_and_destroy_popup): Re-enable DnD here. (popdown_transient_folder_bar): And here as well. * evolution-storage-set-view-factory.c (evolution_storage_set_view_factory_new_view): Disable DnD on the EStorageSetView. * e-shell-folder-selection-dialog.c (e_shell_folder_selection_dialog_construct): Disable DnD on the EStorageSetView. * e-shell-folder-creation-dialog.c (add_storage_set_view): Disable DnD on the EStorageSetView. * e-storage-set-view.c: New member `allow_dnd' in `EStorageSetViewPrivate'. (init): Init to `allow_dnd' %TRUE. (tree_start_drag): If `allow_dnd' is false, don't start the drag and return %FALSE. (tree_drag_motion): If `allow_dnd' is false, return %FALSE. (e_storage_set_view_get_allow_dnd): New. (e_storage_set_view_set_allow_dnd): New. svn path=/trunk/; revision=12810 --- shell/e-shell-view.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'shell/e-shell-view.c') diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 2182c53d8d..974da73007 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -307,6 +307,10 @@ reparent_storage_set_view_box_and_destroy_popup (EShellView *shell_view) gtk_widget_destroy (priv->folder_bar_popup); priv->folder_bar_popup = NULL; + + /* Re-enable DnD on the StorageSetView (it got disabled when displaying + the pop-up). */ + e_storage_set_view_set_allow_dnd (E_STORAGE_SET_VIEW (priv->storage_set_view), TRUE); } static void @@ -320,6 +324,10 @@ popdown_transient_folder_bar (EShellView *shell_view) gtk_widget_hide (priv->storage_set_view_box); e_shell_folder_title_bar_set_toggle_state (E_SHELL_FOLDER_TITLE_BAR (priv->folder_title_bar), FALSE); + + /* Re-enable DnD on the StorageSetView (it got disabled when displaying + the pop-up). */ + e_storage_set_view_set_allow_dnd (E_STORAGE_SET_VIEW (priv->storage_set_view), TRUE); } static int @@ -485,6 +493,9 @@ pop_up_folder_bar (EShellView *shell_view) gtk_widget_show (priv->storage_set_view_box); gtk_widget_popup (priv->folder_bar_popup, x, y); + + /* Disable DnD or "interesting" things will happen. */ + e_storage_set_view_set_allow_dnd (E_STORAGE_SET_VIEW (priv->storage_set_view), FALSE); } -- cgit v1.2.3