[Xfce4-commits] [apps/xfdashboard] 02/02: Fix compiler warnings

[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 5b1b55940d1fca59ab992a33a55732c3c8fbf09b
Author: Stephan Haller <nomad at froevel.de>
Date:   Sun Jan 10 12:13:57 2016 +0100

    Fix compiler warnings
---
 xfdashboard/search-provider.c         |   12 ++++++------
 xfdashboard/search-result-container.c |    6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xfdashboard/search-provider.c b/xfdashboard/search-provider.c
index 50bf1d7..ad484ae 100644
--- a/xfdashboard/search-provider.c
+++ b/xfdashboard/search-provider.c
@@ -314,8 +314,8 @@ gboolean xfdashboard_search_provider_launch_search(XfdashboardSearchProvider *se
 {
 	XfdashboardSearchProviderClass	*klass;
 
-	g_return_if_fail(XFDASHBOARD_IS_SEARCH_PROVIDER(self));
-	g_return_if_fail(inSearchTerms);
+	g_return_val_if_fail(XFDASHBOARD_IS_SEARCH_PROVIDER(self), FALSE);
+	g_return_val_if_fail(inSearchTerms, FALSE);
 
 	klass=XFDASHBOARD_SEARCH_PROVIDER_GET_CLASS(self);
 
@@ -338,10 +338,10 @@ gboolean xfdashboard_search_provider_activate_result(XfdashboardSearchProvider*
 {
 	XfdashboardSearchProviderClass	*klass;
 
-	g_return_if_fail(XFDASHBOARD_IS_SEARCH_PROVIDER(self));
-	g_return_if_fail(inResultItem);
-	g_return_if_fail(CLUTTER_IS_ACTOR(inActor));
-	g_return_if_fail(inSearchTerms);
+	g_return_val_if_fail(XFDASHBOARD_IS_SEARCH_PROVIDER(self), FALSE);
+	g_return_val_if_fail(inResultItem, FALSE);
+	g_return_val_if_fail(CLUTTER_IS_ACTOR(inActor), FALSE);
+	g_return_val_if_fail(inSearchTerms, FALSE);
 
 	klass=XFDASHBOARD_SEARCH_PROVIDER_GET_CLASS(self);
 
diff --git a/xfdashboard/search-result-container.c b/xfdashboard/search-result-container.c
index 8e93fa9..21a75ac 100644
--- a/xfdashboard/search-result-container.c
+++ b/xfdashboard/search-result-container.c
@@ -404,7 +404,7 @@ static ClutterActor* _xfdashboard_search_result_container_result_item_actor_new(
 	priv=self->priv;
 
 	/* Check if search provider is set */
-	g_return_if_fail(priv->provider);
+	g_return_val_if_fail(priv->provider, NULL);
 
 	/* Create actor for item */
 	actor=xfdashboard_search_provider_create_result_actor(priv->provider, inResultItem);
@@ -1812,8 +1812,8 @@ ClutterActor* xfdashboard_search_result_container_find_selection(XfdashboardSear
 void xfdashboard_search_result_container_activate_selection(XfdashboardSearchResultContainer *self,
 																	ClutterActor *inSelection)
 {
-	g_return_val_if_fail(XFDASHBOARD_IS_SEARCH_RESULT_CONTAINER(self), FALSE);
-	g_return_val_if_fail(CLUTTER_IS_ACTOR(inSelection), FALSE);
+	g_return_if_fail(XFDASHBOARD_IS_SEARCH_RESULT_CONTAINER(self));
+	g_return_if_fail(CLUTTER_IS_ACTOR(inSelection));
 
 	/* Check that selection is a child of this actor */
 	if(!clutter_actor_contains(CLUTTER_ACTOR(self), inSelection))

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