← Back to branch summary

~mir-team/ubuntu-app-launch/mir-release-0.14.0

« back to all changes in this revision

Viewing changes to application-job.c

  • Committer: Ted Gould
  • Date: 2014-04-30 16:34:06 UTC
  • mto: This revision was merged to the branch mainline in revision 150.
  • Revision ID: ted@gould.cx-20140430163406-g0fsuw3txq0g6ehk
Static analysis (compiler) detected fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
application-job.c
18
18
 */
19
19
 
20
20
#include <gio/gio.h>
21
 
#include "libupstart-app-launch/upstart-app-launch.h"
 
21
#include "libubuntu-app-launch/ubuntu-app-launch.h"
22
22
 
23
23
int retval = 0;
24
24
const gchar * global_appid;
42
42
}
43
43
 
44
44
static void
45
 
app_failed (const gchar * appid, upstart_app_launch_app_failed_t failure_type, gpointer user_data)
 
45
app_failed (const gchar * appid, UbuntuAppLaunchAppFailed failure_type, gpointer user_data)
46
46
{
47
47
        if (g_strcmp0(appid, global_appid) != 0)
48
48
                return;
87
87
 
88
88
        GMainLoop * mainloop = g_main_loop_new(NULL, FALSE);
89
89
 
90
 
        upstart_app_launch_observer_add_app_started(app_started, mainloop);
91
 
        upstart_app_launch_observer_add_app_focus(app_focus, mainloop);
92
 
        upstart_app_launch_observer_add_app_failed(app_failed, mainloop);
 
90
        ubuntu_app_launch_observer_add_app_started(app_started, mainloop);
 
91
        ubuntu_app_launch_observer_add_app_focus(app_focus, mainloop);
 
92
        ubuntu_app_launch_observer_add_app_failed(app_failed, mainloop);
93
93
 
94
94
        guint timer = g_timeout_add_seconds(1, timeout_check, mainloop);
95
95
 
96
96
        g_debug("Start Application: %s", global_appid);
97
 
        g_return_val_if_fail(upstart_app_launch_start_application(global_appid, (const gchar * const *)uris), -1);
 
97
        g_return_val_if_fail(ubuntu_app_launch_start_application(global_appid, (const gchar * const *)uris), -1);
98
98
        g_strfreev(uris);
99
99
 
100
100
        g_debug("Wait for results");
102
102
 
103
103
        g_source_remove(timer);
104
104
 
105
 
        upstart_app_launch_observer_delete_app_started(app_started, mainloop);
106
 
        upstart_app_launch_observer_delete_app_focus(app_focus, mainloop);
107
 
        upstart_app_launch_observer_delete_app_failed(app_failed, mainloop);
 
105
        ubuntu_app_launch_observer_delete_app_started(app_started, mainloop);
 
106
        ubuntu_app_launch_observer_delete_app_focus(app_focus, mainloop);
 
107
        ubuntu_app_launch_observer_delete_app_failed(app_failed, mainloop);
108
108
 
109
109
        g_main_loop_unref(mainloop);
110
110
        g_object_unref(con);