[Xfce4-commits] [xfce/xfdesktop] 01/35: Fix a previous commit
noreply at xfce.org
noreply at xfce.org
Sun May 17 11:37:49 CEST 2015
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch xfce-4.12
in repository xfce/xfdesktop.
commit c689577e2cda7443b74eccbc0ff9ba21374ba3c6
Author: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
Date: Tue Mar 17 22:19:02 2015 +0100
Fix a previous commit
This fixes commit 26bc8820e502f74b99648b213c28b681971e6ca6.
---
src/xfdesktop-icon-view.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index de764df..1b8c64e 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -43,6 +43,7 @@
#include "xfdesktop-icon-view.h"
#include "xfdesktop-file-icon-manager.h"
+#include "xfdesktop-window-icon-manager.h"
#include "xfdesktop-marshal.h"
#include "xfce-desktop.h"
#include "xfdesktop-volume-icon.h"
@@ -1716,7 +1717,7 @@ xfdesktop_icon_view_drag_data_get(GtkWidget *widget,
TRACE("entering");
- if(XFDESKTOP_IS_ICON_VIEW_MANAGER(icon_view) == FALSE)
+ if(XFDESKTOP_IS_WINDOW_ICON_MANAGER(icon_view->priv->manager))
return;
/* Sometimes during a ctrl+drag this is NULL
@@ -1762,7 +1763,7 @@ xfdesktop_icon_view_drag_data_received(GtkWidget *widget,
GdkDragAction action = icon_view->priv->proposed_drop_action;
- if(XFDESKTOP_IS_ICON_VIEW_MANAGER(icon_view)) {
+ if(!XFDESKTOP_IS_WINDOW_ICON_MANAGER(icon_view->priv->manager)) {
action = xfdesktop_icon_view_manager_propose_drop_action(icon_view->priv->manager,
icon_on_dest,
action,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list