[Xfce4-commits] [apps/xfdashboard] 01/01: Silence compiler warnings (aka fixed bugs :( )

[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 1d7811156ecb96f42d14ab145792c84042cca66b
Author: Stephan Haller <nomad at froevel.de>
Date:   Tue Nov 17 09:46:37 2015 +0100

    Silence compiler warnings (aka fixed bugs :( )
---
 xfdashboard/application-tracker.c |    3 ++-
 xfdashboard/applications-view.c   |    2 +-
 xfdashboard/desktop-app-info.c    |    2 +-
 xfdashboard/theme-effects.c       |    4 +---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/xfdashboard/application-tracker.c b/xfdashboard/application-tracker.c
index 1e33df5..65a348d 100644
--- a/xfdashboard/application-tracker.c
+++ b/xfdashboard/application-tracker.c
@@ -526,6 +526,7 @@ static GAppInfo* _xfdashboard_application_tracker_get_desktop_id_from_window_nam
 			GAppInfo						*globAppInfo;
 
 			/* Build glob pattern */
+			globAppInfo=NULL;
 			globName=g_strconcat("*-", iterNameLowerCase, NULL);
 			globPattern=g_pattern_spec_new(globName);
 
@@ -556,7 +557,7 @@ static GAppInfo* _xfdashboard_application_tracker_get_desktop_id_from_window_nam
 				appInfo=G_APP_INFO(g_object_ref(G_OBJECT(foundSubdirApps->data)));
 
 				g_debug("Found exactly one application named '%s' for window '%s' using pattern '%s'",
-						g_app_info_get_id(globAppInfo),
+						g_app_info_get_id(appInfo),
 						xfdashboard_window_tracker_window_get_title(inWindow),
 						globName);
 			}
diff --git a/xfdashboard/applications-view.c b/xfdashboard/applications-view.c
index 5211971..94c23b5 100644
--- a/xfdashboard/applications-view.c
+++ b/xfdashboard/applications-view.c
@@ -1604,7 +1604,7 @@ void xfdashboard_applications_view_set_format_title_description(XfdashboardAppli
 /* Get/set flag whether to show an "all applications" menu at root menu */
 gboolean xfdashboard_applications_view_get_show_all_apps(XfdashboardApplicationsView *self)
 {
-	g_return_val_if_fail(XFDASHBOARD_IS_APPLICATIONS_VIEW(self), NULL);
+	g_return_val_if_fail(XFDASHBOARD_IS_APPLICATIONS_VIEW(self), FALSE);
 
 	return(self->priv->showAllAppsMenu);
 }
diff --git a/xfdashboard/desktop-app-info.c b/xfdashboard/desktop-app-info.c
index 98132e4..0983f88 100644
--- a/xfdashboard/desktop-app-info.c
+++ b/xfdashboard/desktop-app-info.c
@@ -1413,7 +1413,7 @@ gboolean xfdashboard_desktop_app_info_reload(XfdashboardDesktopAppInfo *self)
 	XfdashboardDesktopAppInfoPrivate	*priv;
 	gboolean							success;
 
-	g_return_val_if_fail(XFDASHBOARD_IS_DESKTOP_APP_INFO(self), NULL);
+	g_return_val_if_fail(XFDASHBOARD_IS_DESKTOP_APP_INFO(self), FALSE);
 
 	priv=self->priv;
 	success=FALSE;
diff --git a/xfdashboard/theme-effects.c b/xfdashboard/theme-effects.c
index 53711b4..11794ec 100644
--- a/xfdashboard/theme-effects.c
+++ b/xfdashboard/theme-effects.c
@@ -1044,7 +1044,6 @@ static gboolean _xfdashboard_theme_effects_parse_xml(XfdashboardThemeEffects *se
 											NULL,
 										};
 
-	XfdashboardThemeEffectsPrivate		*priv;
 	XfdashboardThemeEffectsParserData	*data;
 	GMarkupParseContext					*context;
 	GError								*error;
@@ -1055,7 +1054,6 @@ static gboolean _xfdashboard_theme_effects_parse_xml(XfdashboardThemeEffects *se
 	g_return_val_if_fail(inContents && *inContents, FALSE);
 	g_return_val_if_fail(outError==NULL || *outError==NULL, FALSE);
 
-	priv=self->priv;
 	error=NULL;
 	success=TRUE;
 
@@ -1120,7 +1118,7 @@ static gboolean _xfdashboard_theme_effects_parse_xml(XfdashboardThemeEffects *se
 	if(!success)
 	{
 		g_slist_foreach(data->effects, (GFunc)_xfdashboard_theme_effects_print_parsed_objects, "Effects (this file):");
-		g_slist_foreach(priv->effects, (GFunc)_xfdashboard_theme_effects_print_parsed_objects, "Effects (parsed before):");
+		g_slist_foreach(self->priv->effects, (GFunc)_xfdashboard_theme_effects_print_parsed_objects, "Effects (parsed before):");
 		g_debug("PARSER ERROR: %s", (outError && *outError) ? (*outError)->message : "unknown error");
 	}
 #endif

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