[Xfce4-commits] [apps/xfdashboard] 02/03: Use generic should_show() function of GAppInfo to determine if a menu item should be shown and remove unneeded functions

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

n   o   m   a   d       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfdashboard.

commit ad5359538f7001c1a160aa96362f5024d079d8a7
Author: Stephan Haller <nomad at froevel.de>
Date:   Tue Jun 6 12:03:11 2017 +0200

    Use generic should_show() function of GAppInfo to determine if a menu item should be shown and remove unneeded functions
    
    Fixes issue GH #151
---
 libxfdashboard/applications-search-provider.c |  3 +-
 libxfdashboard/applications-view.c            |  3 +-
 libxfdashboard/desktop-app-info.c             | 40 ---------------------------
 libxfdashboard/desktop-app-info.h             |  3 --
 4 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/libxfdashboard/applications-search-provider.c b/libxfdashboard/applications-search-provider.c
index 3540ae3..6fe61a2 100644
--- a/libxfdashboard/applications-search-provider.c
+++ b/libxfdashboard/applications-search-provider.c
@@ -1068,8 +1068,7 @@ static XfdashboardSearchResultSet* _xfdashboard_applications_search_provider_get
 		appInfo=XFDASHBOARD_DESKTOP_APP_INFO(iter->data);
 
 		/* If desktop app info should be hidden then continue with next one */
-		if(xfdashboard_desktop_app_info_get_hidden(appInfo) ||
-			xfdashboard_desktop_app_info_get_nodisplay(appInfo))
+		if(!g_app_info_should_show(G_APP_INFO(appInfo)))
 		{
 			continue;
 		}
diff --git a/libxfdashboard/applications-view.c b/libxfdashboard/applications-view.c
index 95a5657..8642943 100644
--- a/libxfdashboard/applications-view.c
+++ b/libxfdashboard/applications-view.c
@@ -432,8 +432,7 @@ static void _xfdashboard_applications_view_on_all_applications_menu_clicked(Xfda
 		appInfo=XFDASHBOARD_DESKTOP_APP_INFO(iter->data);
 
 		/* If desktop app info should be hidden then continue with next one */
-		if(xfdashboard_desktop_app_info_get_hidden(appInfo) ||
-			xfdashboard_desktop_app_info_get_nodisplay(appInfo))
+		if(!g_app_info_should_show(G_APP_INFO(appInfo)))
 		{
 			continue;
 		}
diff --git a/libxfdashboard/desktop-app-info.c b/libxfdashboard/desktop-app-info.c
index 332ac6a..78942bd 100644
--- a/libxfdashboard/desktop-app-info.c
+++ b/libxfdashboard/desktop-app-info.c
@@ -1369,46 +1369,6 @@ gboolean xfdashboard_desktop_app_info_is_valid(XfdashboardDesktopAppInfo *self)
 	return(self->priv->isValid);
 }
 
-/* Determine if desktop app info is hidden */
-gboolean xfdashboard_desktop_app_info_get_hidden(XfdashboardDesktopAppInfo *self)
-{
-	XfdashboardDesktopAppInfoPrivate	*priv;
-	gboolean							isHidden;
-
-	g_return_val_if_fail(XFDASHBOARD_IS_DESKTOP_APP_INFO(self), TRUE);
-
-	priv=self->priv;
-	isHidden=TRUE;
-
-	/* If a menu item exists get hidden state from it  */
-	if(priv->item)
-	{
-		isHidden=garcon_menu_item_get_hidden(priv->item);
-	}
-
-	return(isHidden);
-}
-
-/* Get "NoDisplay" value of desktop app info */
-gboolean xfdashboard_desktop_app_info_get_nodisplay(XfdashboardDesktopAppInfo *self)
-{
-	XfdashboardDesktopAppInfoPrivate	*priv;
-	gboolean							noDisplay;
-
-	g_return_val_if_fail(XFDASHBOARD_IS_DESKTOP_APP_INFO(self), TRUE);
-
-	priv=self->priv;
-	noDisplay=TRUE;
-
-	/* If a menu item exists get "NoDisplay" value from it */
-	if(priv->item)
-	{
-		noDisplay=garcon_menu_item_get_no_display(priv->item);
-	}
-
-	return(noDisplay);
-}
-
 /* Get file of desktop app info */
 GFile* xfdashboard_desktop_app_info_get_file(XfdashboardDesktopAppInfo *self)
 {
diff --git a/libxfdashboard/desktop-app-info.h b/libxfdashboard/desktop-app-info.h
index ab9c5f8..193b917 100644
--- a/libxfdashboard/desktop-app-info.h
+++ b/libxfdashboard/desktop-app-info.h
@@ -75,9 +75,6 @@ GAppInfo* xfdashboard_desktop_app_info_new_from_menu_item(GarconMenuItem *inMenu
 
 gboolean xfdashboard_desktop_app_info_is_valid(XfdashboardDesktopAppInfo *self);
 
-gboolean xfdashboard_desktop_app_info_get_hidden(XfdashboardDesktopAppInfo *self);
-gboolean xfdashboard_desktop_app_info_get_nodisplay(XfdashboardDesktopAppInfo *self);
-
 GFile* xfdashboard_desktop_app_info_get_file(XfdashboardDesktopAppInfo *self);
 gboolean xfdashboard_desktop_app_info_reload(XfdashboardDesktopAppInfo *self);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.