Merge lp:~larsu/indicator-messages/set-status-return-value into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

[Lars Karlitski]

Return values from functions that have return values.

Somehow -Wreturn-type warnings aren't always triggered for g_return_if_fail macros.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:386
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/53/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/100/rebuild

review: Approve (continuous-integration)

[lp:~larsu/indicator-messages/set-status-return-value]

387. By Lars Karlitski on 2013-10-02

im-application-list.c: return values from functions that have return values

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:387
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/54/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/101/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2013-09-30 18:51:16 +0000
+++ src/im-application-list.c	2013-10-02 12:20:48 +0000
@@ -675,8 +675,8 @@
   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 @@
     }
 
   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);
 
=== modified file 'src/messages-service.c'
--- src/messages-service.c	2013-09-27 14:09:43 +0000
+++ src/messages-service.c	2013-10-02 12:20:48 +0000
@@ -99,11 +99,12 @@
 	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) {