[Xfce4-commits] [apps/xfdashboard] 03/04: Do not return preview icon actor when looking up actor for a requested GAppInfo
noreply at xfce.org
noreply at xfce.org
Thu Sep 3 09:00:35 CEST 2015
This is an automated email from the git hooks/post-receive script.
nomad pushed a commit to branch master
in repository apps/xfdashboard.
commit 1a061206fd09046f3ddc79ed8d448b0c7fdd61be
Author: Stephan Haller <nomad at froevel.de>
Date: Thu Sep 3 08:43:55 2015 +0200
Do not return preview icon actor when looking up actor for a requested GAppInfo
---
xfdashboard/quicklaunch.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/xfdashboard/quicklaunch.c b/xfdashboard/quicklaunch.c
index e8b974d..27ea9f4 100644
--- a/xfdashboard/quicklaunch.c
+++ b/xfdashboard/quicklaunch.c
@@ -146,6 +146,7 @@ static void _xfdashboard_quicklaunch_update_property_from_icons(XfdashboardQuick
static ClutterActor* _xfdashboard_quicklaunch_get_actor_for_appinfo(XfdashboardQuicklaunch *self,
GAppInfo *inAppInfo)
{
+ XfdashboardQuicklaunchPrivate *priv;
ClutterActorIter iter;
ClutterActor *child;
GAppInfo *desktopAppInfo;
@@ -154,6 +155,8 @@ static ClutterActor* _xfdashboard_quicklaunch_get_actor_for_appinfo(XfdashboardQ
g_return_val_if_fail(XFDASHBOARD_IS_QUICKLAUNCH(self), TRUE);
g_return_val_if_fail(G_IS_APP_INFO(inAppInfo), TRUE);
+ priv=self->priv;
+
/* If requested application information does not contain a desktop file
* (means it must derive from XfdashboardDesktopAppInfo) then assume
* no actor exists for it.
@@ -185,6 +188,9 @@ static ClutterActor* _xfdashboard_quicklaunch_get_actor_for_appinfo(XfdashboardQ
/* Only check application buttons */
if(!XFDASHBOARD_IS_APPLICATION_BUTTON(child)) continue;
+ /* Do not check preview icon for drag if available */
+ if(priv->dragPreviewIcon && child==priv->dragPreviewIcon) continue;
+
/* Check if application button provides requested desktop file */
desktopAppInfo=xfdashboard_application_button_get_app_info(XFDASHBOARD_APPLICATION_BUTTON(child));
if(desktopAppInfo &&
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list