Ubuntu Application Launcher

Merge lp:~ted/ubuntu-app-launch/application-dir-detect into lp:ubuntu-app-launch/13.10

  1. application-dir-detect
  2. Merge into trunk.13.10
Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 45
Merged at revision: 47
Proposed branch: lp:~ted/ubuntu-app-launch/application-dir-detect
Merge into: lp:ubuntu-app-launch/13.10
Diff against target: 12 lines (+1/-1)
1 file modified
desktop-hook.c (+1/-1)
To merge this branch: bzr merge lp:~ted/ubuntu-app-launch/application-dir-detect
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+182897@code.launchpad.net

Commit message

Making sure to look for the application directory

Description of the change

Let's never talk of this.

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

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-saucy-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-saucy-armhf-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-saucy-i386-ci/63

Click here to trigger a rebuild:
http://s-jenkins:8080/job/upstart-app-launch-ci/63/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

d'oh!

review: Approve

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 2013-08-11 19:34:25 +0000
3+++ desktop-hook.c 2013-08-29 13:27:00 +0000
4@@ -353,7 +353,7 @@
5 /* Find all the click desktop files */
6 gchar * desktopdir = g_build_filename(g_get_user_data_dir(), "applications", NULL);
7 gboolean desktopdirexists = FALSE;
8- if (!g_file_test(symlinkdir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
9+ if (!g_file_test(desktopdir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
10 g_warning("No applications defined");
11 } else {
12 dir_for_each(desktopdir, add_desktop_file, apparray);

Subscribers

People subscribed via source and target branches