[Xfce4-commits] <tumbler:master> Fix compiler warnings in tumbler-service.

[Nick Schermer]

Updating branch refs/heads/master
         to 29b13cff9f741f52af6f25528020f3d307fb7ccc (commit)
       from b8a4d8b76c631032d0f3d3ea1e2a56da1a05a0ba (commit)

commit 29b13cff9f741f52af6f25528020f3d307fb7ccc
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Aug 26 20:59:03 2010 +0200

    Fix compiler warnings in tumbler-service.

 tumblerd/tumbler-service.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index f5ebef5..541cf90 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -383,12 +383,12 @@ tumbler_service_error_idle (gpointer user_data)
   DBusMessage       *message;
   guint              n;
 
-  g_return_if_fail (info != NULL);
-  g_return_if_fail (TUMBLER_IS_SCHEDULER (info->scheduler));
-  g_return_if_fail (info->uris != NULL && info->uris[0] != NULL && *info->uris[0] != '\0');
-  g_return_if_fail (info->message != NULL && *info->message != '\0');
-  g_return_if_fail (info->origin != NULL && *info->origin != '\0');
-  g_return_if_fail (TUMBLER_IS_SERVICE (info->service));
+  g_return_val_if_fail (info != NULL, FALSE);
+  g_return_val_if_fail (TUMBLER_IS_SCHEDULER (info->scheduler), FALSE);
+  g_return_val_if_fail (info->uris != NULL && info->uris[0] != NULL && *info->uris[0] != '\0', FALSE);
+  g_return_val_if_fail (info->message != NULL && *info->message != '\0', FALSE);
+  g_return_val_if_fail (info->origin != NULL && *info->origin != '\0', FALSE);
+  g_return_val_if_fail (TUMBLER_IS_SERVICE (info->service), FALSE);
 
   /* create a D-Bus message for the error signal */
   message = dbus_message_new_signal (THUMBNAILER_PATH, THUMBNAILER_IFACE, "Error");
@@ -531,11 +531,11 @@ tumbler_service_ready_idle (gpointer user_data)
   DBusMessage       *message;
   guint              n;
 
-  g_return_if_fail (info != NULL);
-  g_return_if_fail (TUMBLER_IS_SCHEDULER (info->scheduler));
-  g_return_if_fail (info->uris != NULL && info->uris[0] != NULL && *info->uris[0] != '\0');
-  g_return_if_fail (info->origin != NULL && *info->origin != '\0');
-  g_return_if_fail (TUMBLER_IS_SERVICE (info->service));
+  g_return_val_if_fail (info != NULL, FALSE);
+  g_return_val_if_fail (TUMBLER_IS_SCHEDULER (info->scheduler), FALSE);
+  g_return_val_if_fail (info->uris != NULL && info->uris[0] != NULL && *info->uris[0] != '\0', FALSE);
+  g_return_val_if_fail (info->origin != NULL && *info->origin != '\0', FALSE);
+  g_return_val_if_fail (TUMBLER_IS_SERVICE (info->service), FALSE);
 
   /* create a D-Bus message for the ready signal */
   message = dbus_message_new_signal (THUMBNAILER_PATH, THUMBNAILER_IFACE, "Ready");
@@ -608,10 +608,10 @@ tumbler_service_started_idle (gpointer user_data)
   DBusMessageIter   iter;
   DBusMessage      *message;
 
-  g_return_if_fail (info != NULL);
-  g_return_if_fail (TUMBLER_IS_SCHEDULER (info->scheduler));
-  g_return_if_fail (info->origin != NULL && *info->origin != '\0');
-  g_return_if_fail (TUMBLER_IS_SERVICE (info->service));
+  g_return_val_if_fail (info != NULL, FALSE);
+  g_return_val_if_fail (TUMBLER_IS_SCHEDULER (info->scheduler), FALSE);
+  g_return_val_if_fail (info->origin != NULL && *info->origin != '\0', FALSE);
+  g_return_val_if_fail (TUMBLER_IS_SERVICE (info->service), FALSE);
 
   /* create a D-Bus message for the started signal */
   message = dbus_message_new_signal (THUMBNAILER_PATH, THUMBNAILER_IFACE, "Started");