← Back to branch summary

~ubuntu-branches/ubuntu/wily/ubuntu-app-launch/wily-proposed

« back to all changes in this revision

Viewing changes to libubuntu-app-launch/ubuntu-app-launch.c

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Ted Gould
  • Date: 2014-11-21 21:17:30 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20141121211730-mr5ltrnvztfhxwx0
Tags: 0.4+15.04.20141121-0ubuntu1
https://launchpad.net/bugs/1394919
https://launchpad.net/bugs/1394622
[ Ted Gould ]
* Remove reporting a recoverable problem on cgmanager (LP: #1394919)
* Use a version script to ensure we're not leaking symbols
* Create a custom GMainContext when waiting on the CGManager DBus
  connection. (LP: #1394622)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libubuntu-app-launch/ubuntu-app-launch.c
1301
1301
 
1302
1302
        if (is_click(appid)) {
1303
1303
                GList * pids = pids_from_cgroup(cgmanager, "application-click", appid);
1304
 
                g_clear_object(&cgmanager);
 
1304
                cgroup_manager_unref(cgmanager);
1305
1305
 
1306
1306
                ual_tracepoint(pids_list_finished, appid, g_list_length(pids));
1307
1307
                return pids;
1309
1309
                gchar * jobname = g_strdup_printf("%s-", appid);
1310
1310
                GList * pids = pids_from_cgroup(cgmanager, "application-legacy", jobname);
1311
1311
                g_free(jobname);
1312
 
                g_clear_object(&cgmanager);
 
1312
                cgroup_manager_unref(cgmanager);
1313
1313
 
1314
1314
                ual_tracepoint(pids_list_finished, appid, g_list_length(pids));
1315
1315
                return pids;
1340
1340
        g_array_free(apps, TRUE);
1341
1341
        g_object_unref(con);
1342
1342
 
1343
 
        g_clear_object(&cgmanager);
 
1343
        cgroup_manager_unref(cgmanager);
1344
1344
 
1345
1345
        ual_tracepoint(pids_list_finished, appid, g_list_length(pids));
1346
1346
        return pids;