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

noreply at xfce.org noreply at xfce.org
Mon Feb 22 13:17:34 CET 2016


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

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

commit 52515185cedf2c3b23cdfe2a40f62aa30eb79eca
Author: Stephan Haller <nomad at froevel.de>
Date:   Mon Feb 22 13:17:08 2016 +0100

    Fix compiler warnings
---
 libxfdashboard/application.c                                      | 2 +-
 libxfdashboard/plugins-manager.c                                  | 4 ++--
 plugins/gnome-shell-search-provider/gnome-shell-search-provider.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libxfdashboard/application.c b/libxfdashboard/application.c
index c0d48c4..91a0eeb 100644
--- a/libxfdashboard/application.c
+++ b/libxfdashboard/application.c
@@ -1168,7 +1168,7 @@ XfconfChannel* xfdashboard_application_get_xfconf_channel(XfdashboardApplication
 {
 	XfconfChannel			*channel=NULL;
 
-	g_return_if_fail(self==NULL || XFDASHBOARD_IS_APPLICATION(self));
+	g_return_val_if_fail(self==NULL || XFDASHBOARD_IS_APPLICATION(self), NULL);
 
 	/* Get default single instance if NULL is requested */
 	if(!self) self=_xfdashboard_application;
diff --git a/libxfdashboard/plugins-manager.c b/libxfdashboard/plugins-manager.c
index 6208b1c..0961778 100644
--- a/libxfdashboard/plugins-manager.c
+++ b/libxfdashboard/plugins-manager.c
@@ -198,8 +198,8 @@ static gboolean _xfdashboard_plugins_manager_has_plugin_id(XfdashboardPluginsMan
 {
 	XfdashboardPlugin					*plugin;
 
-	g_return_val_if_fail(XFDASHBOARD_IS_PLUGINS_MANAGER(self), NULL);
-	g_return_val_if_fail(inPluginID && *inPluginID, NULL);
+	g_return_val_if_fail(XFDASHBOARD_IS_PLUGINS_MANAGER(self), FALSE);
+	g_return_val_if_fail(inPluginID && *inPluginID, FALSE);
 
 	/* Get plugin by requested ID. If NULL is returned the plugin does not exist */
 	plugin=_xfdashboard_plugins_manager_find_plugin_by_id(self, inPluginID);
diff --git a/plugins/gnome-shell-search-provider/gnome-shell-search-provider.c b/plugins/gnome-shell-search-provider/gnome-shell-search-provider.c
index eedaf14..c7d6d48 100644
--- a/plugins/gnome-shell-search-provider/gnome-shell-search-provider.c
+++ b/plugins/gnome-shell-search-provider/gnome-shell-search-provider.c
@@ -419,7 +419,7 @@ static const gchar* _xfdashboard_gnome_shell_search_provider_get_name(Xfdashboar
 	XfdashboardGnomeShellSearchProvider				*self;
 	XfdashboardGnomeShellSearchProviderPrivate		*priv;
 
-	g_return_if_fail(XFDASHBOARD_IS_GNOME_SHELL_SEARCH_PROVIDER(inProvider));
+	g_return_val_if_fail(XFDASHBOARD_IS_GNOME_SHELL_SEARCH_PROVIDER(inProvider), NULL);
 
 	self=XFDASHBOARD_GNOME_SHELL_SEARCH_PROVIDER(inProvider);
 	priv=self->priv;
@@ -433,7 +433,7 @@ static const gchar* _xfdashboard_gnome_shell_search_provider_get_icon(Xfdashboar
 	XfdashboardGnomeShellSearchProvider				*self;
 	XfdashboardGnomeShellSearchProviderPrivate		*priv;
 
-	g_return_if_fail(XFDASHBOARD_IS_GNOME_SHELL_SEARCH_PROVIDER(inProvider));
+	g_return_val_if_fail(XFDASHBOARD_IS_GNOME_SHELL_SEARCH_PROVIDER(inProvider), NULL);
 
 	self=XFDASHBOARD_GNOME_SHELL_SEARCH_PROVIDER(inProvider);
 	priv=self->priv;

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


More information about the Xfce4-commits mailing list