Merge lp:~ted/ubuntu-app-launch/lp1301173-debug-message into lp:ubuntu-app-launch/14.04

Proposed by Ted Gould on 2014-04-16
Status: Merged
Approved by: Charles Kerr on 2014-04-22
Approved revision: 145
Merged at revision: 146
Proposed branch: lp:~ted/ubuntu-app-launch/lp1301173-debug-message
Merge into: lp:ubuntu-app-launch/14.04
Diff against target: 21 lines (+2/-2)
1 file modified
desktop-hook.c (+2/-2)
To merge this branch: bzr merge lp:~ted/ubuntu-app-launch/lp1301173-debug-message
Reviewer Review Type Date Requested Status
Charles Kerr (community) 2014-04-16 Approve on 2014-04-22
PS Jenkins bot (community) continuous-integration Approve on 2014-04-16
Review via email: mp+216157@code.launchpad.net

Commit message

Debug message for valid, though rare, conditions.

Description of the change

This condition can reasonably happen for instance on a desktop, so we shouldn't warn about it.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'desktop-hook.c'
2--- desktop-hook.c 2014-03-07 12:33:01 +0000
3+++ desktop-hook.c 2014-04-16 17:03:59 +0000
4@@ -479,7 +479,7 @@
5 /* Find all the symlinks of desktop files */
6 gchar * symlinkdir = g_build_filename(g_get_user_cache_dir(), "upstart-app-launch", "desktop", NULL);
7 if (!g_file_test(symlinkdir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
8- g_warning("No installed click packages");
9+ g_debug("No installed click packages");
10 } else {
11 dir_for_each(symlinkdir, add_click_package, apparray);
12 }
13@@ -488,7 +488,7 @@
14 gchar * desktopdir = g_build_filename(g_get_user_data_dir(), "applications", NULL);
15 gboolean desktopdirexists = FALSE;
16 if (!g_file_test(desktopdir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
17- g_warning("No applications defined");
18+ g_debug("No applications defined");
19 } else {
20 dir_for_each(desktopdir, add_desktop_file, apparray);
21 desktopdirexists = TRUE;

Subscribers

People subscribed via source and target branches