From d80040726cf55f4f65a7353baff4cf864d981b17 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 2 Oct 2013 12:21:47 +0200 Subject: messages-service.c: return FALSE from set_status() if preconditions aren't met --- src/messages-service.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/messages-service.c b/src/messages-service.c index 04e4fc6..2a5f3fd 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -99,11 +99,12 @@ set_status (IndicatorMessagesService *service, GDesktopAppInfo *appinfo; const gchar *id; - g_return_if_fail (g_str_equal (status_str, "available") || - g_str_equal (status_str, "away")|| - g_str_equal (status_str, "busy") || - g_str_equal (status_str, "invisible") || - g_str_equal (status_str, "offline")); + g_return_val_if_fail (g_str_equal (status_str, "available") || + g_str_equal (status_str, "away")|| + g_str_equal (status_str, "busy") || + g_str_equal (status_str, "invisible") || + g_str_equal (status_str, "offline"), + FALSE); appinfo = g_desktop_app_info_new (desktop_id); if (!appinfo) { -- cgit v1.2.3 From 3e1f4715f80e057d7e0b46e9966caee0bbf88444 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 2 Oct 2013 13:33:09 +0200 Subject: im-application-list.c: return values from functions that have return values --- src/im-application-list.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/im-application-list.c b/src/im-application-list.c index fc9775f..b04321d 100644 --- a/src/im-application-list.c +++ b/src/im-application-list.c @@ -675,8 +675,8 @@ im_application_list_add (ImApplicationList *list, GSimpleAction *launch_action; IndicatorDesktopShortcuts * shortcuts = NULL; - g_return_if_fail (IM_IS_APPLICATION_LIST (list)); - g_return_if_fail (desktop_id != NULL); + g_return_val_if_fail (IM_IS_APPLICATION_LIST (list), FALSE); + g_return_val_if_fail (desktop_id != NULL, FALSE); if (im_application_list_lookup (list, desktop_id)) return TRUE; @@ -689,7 +689,7 @@ im_application_list_add (ImApplicationList *list, } id = g_app_info_get_id (G_APP_INFO (info)); - g_return_if_fail (id != NULL); + g_return_val_if_fail (id != NULL, FALSE); { const char * filename = g_desktop_app_info_get_filename(info); -- cgit v1.2.3