Messaging Menu

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

  1. set-status-return-value
  2. Merge into trunk.13.10
Proposed by Lars Karlitski
Status: Merged
Approved by: Ted Gould
Approved revision: 387
Merged at revision: 387
Proposed branch: lp:~larsu/indicator-messages/set-status-return-value
Merge into: lp:~indicator-applet-developers/indicator-messages/trunk.13.10
Diff against target: 45 lines (+9/-8)
2 files modified
src/im-application-list.c (+3/-3)
src/messages-service.c (+6/-5)
To merge this branch: bzr merge lp:~larsu/indicator-messages/set-status-return-value
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+188803@code.launchpad.net

Description of the change

Return values from functions that have return values.

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
387. By Lars Karlitski

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/im-application-list.c'
2--- src/im-application-list.c 2013-09-30 18:51:16 +0000
3+++ src/im-application-list.c 2013-10-02 12:20:48 +0000
4@@ -675,8 +675,8 @@
5 GSimpleAction *launch_action;
6 IndicatorDesktopShortcuts * shortcuts = NULL;
7
8- g_return_if_fail (IM_IS_APPLICATION_LIST (list));
9- g_return_if_fail (desktop_id != NULL);
10+ g_return_val_if_fail (IM_IS_APPLICATION_LIST (list), FALSE);
11+ g_return_val_if_fail (desktop_id != NULL, FALSE);
12
13 if (im_application_list_lookup (list, desktop_id))
14 return TRUE;
15@@ -689,7 +689,7 @@
16 }
17
18 id = g_app_info_get_id (G_APP_INFO (info));
19- g_return_if_fail (id != NULL);
20+ g_return_val_if_fail (id != NULL, FALSE);
21
22 {
23 const char * filename = g_desktop_app_info_get_filename(info);
24
25=== modified file 'src/messages-service.c'
26--- src/messages-service.c 2013-09-27 14:09:43 +0000
27+++ src/messages-service.c 2013-10-02 12:20:48 +0000
28@@ -99,11 +99,12 @@
29 GDesktopAppInfo *appinfo;
30 const gchar *id;
31
32- g_return_if_fail (g_str_equal (status_str, "available") ||
33- g_str_equal (status_str, "away")||
34- g_str_equal (status_str, "busy") ||
35- g_str_equal (status_str, "invisible") ||
36- g_str_equal (status_str, "offline"));
37+ g_return_val_if_fail (g_str_equal (status_str, "available") ||
38+ g_str_equal (status_str, "away")||
39+ g_str_equal (status_str, "busy") ||
40+ g_str_equal (status_str, "invisible") ||
41+ g_str_equal (status_str, "offline"),
42+ FALSE);
43
44 appinfo = g_desktop_app_info_new (desktop_id);
45 if (!appinfo) {

Subscribers

People subscribed via source and target branches