[Xfce4-commits] [apps/xfdashboard] 02/20: Apply coding style

[noreply at xfce.org]

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

nomad pushed a commit to branch master
in repository apps/xfdashboard.

commit 8a23e998add5bddc73eda4c841b9d1be9fd00d89
Author: Stephan Haller <nomad at froevel.de>
Date:   Sat May 16 19:11:17 2015 +0200

    Apply coding style
---
 xfdashboard/application-database.c |   18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/xfdashboard/application-database.c b/xfdashboard/application-database.c
index 4706e94..4c1bf41 100644
--- a/xfdashboard/application-database.c
+++ b/xfdashboard/application-database.c
@@ -1048,7 +1048,7 @@ static gboolean _xfdashboard_application_database_load_application_menu(Xfdashbo
 
 	/* Load menu */
 	appsMenu=garcon_menu_new_applications();
-	if(garcon_menu_load(appsMenu, NULL, &error)==FALSE)
+	if(!garcon_menu_load(appsMenu, NULL, &error))
 	{
 		/* Propagate error */
 		g_propagate_error(outError, error);
@@ -1063,10 +1063,14 @@ static gboolean _xfdashboard_application_database_load_application_menu(Xfdashbo
 	/* Release old menus and set new one */
 	if(priv->appsMenu)
 	{
-		if(priv->appsMenuReloadRequiredID) g_signal_handler_disconnect(priv->appsMenu, priv->appsMenuReloadRequiredID);
+		if(priv->appsMenuReloadRequiredID)
+		{
+			g_signal_handler_disconnect(priv->appsMenu, priv->appsMenuReloadRequiredID);
+			priv->appsMenuReloadRequiredID=0;
+		}
+
 		g_object_unref(priv->appsMenu);
 		priv->appsMenu=NULL;
-		priv->appsMenuReloadRequiredID=0;
 	}
 
 	priv->appsMenu=appsMenu;
@@ -1106,10 +1110,14 @@ static void _xfdashboard_application_database_clean(XfdashboardApplicationDataba
 
 	if(priv->appsMenu)
 	{
-		if(priv->appsMenuReloadRequiredID) g_signal_handler_disconnect(priv->appsMenu, priv->appsMenuReloadRequiredID);
+		if(priv->appsMenuReloadRequiredID)
+		{
+			g_signal_handler_disconnect(priv->appsMenu, priv->appsMenuReloadRequiredID);
+			priv->appsMenuReloadRequiredID=0;
+		}
+
 		g_object_unref(priv->appsMenu);
 		priv->appsMenu=NULL;
-		priv->appsMenuReloadRequiredID=0;
 	}
 
 	if(priv->applications)

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