Unity

Merge lp:~xnox/unity/lowgfx-profile-setter-no-upstart into lp:unity

  1. lowgfx-profile-setter-no-upstart
  2. Merge into trunk
Proposed by Dimitri John Ledkov on 2017-04-25
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2017-04-28
Approved revision: 4247
Merged at revision: 4234
Proposed branch: lp:~xnox/unity/lowgfx-profile-setter-no-upstart
Merge into: lp:unity
Prerequisite: lp:~3v1n0/unity/lowgfx-profile-setter
Diff against target: 24 lines (+3/-4)
1 file modified
tools/compiz_config_profile_setter.c (+3/-4)
To merge this branch: bzr merge lp:~xnox/unity/lowgfx-profile-setter-no-upstart
Reviewer Review Type Date Requested Status
Unity Team 2017-04-25 Pending
Review via email: mp+323118@code.launchpad.net

Commit Message

Do not use upstart-dbus.h in compiz_config_profile_setter either.

Description of the Change

Do not use upstart-dbus.h in compiz_config_profile_setter either.

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 'tools/compiz_config_profile_setter.c'
2--- tools/compiz_config_profile_setter.c 2017-04-25 09:55:32 +0000
3+++ tools/compiz_config_profile_setter.c 2017-04-25 09:55:32 +0000
4@@ -18,7 +18,6 @@
5
6 #include <ccs.h>
7 #include <gio/gio.h>
8-#include <upstart/upstart-dbus.h>
9
10 #define COMPIZ_CONFIG_PROFILE_ENV "COMPIZ_CONFIG_PROFILE"
11 #define COMPIZ_CONFIG_DEFAULT_PROFILE "ubuntu"
12@@ -81,9 +80,9 @@
13 {
14 const gchar * const * empty_array[] = {0};
15 environment_prop_list = g_dbus_connection_call_sync (bus,
16- DBUS_SERVICE_UPSTART,
17- DBUS_PATH_UPSTART,
18- DBUS_INTERFACE_UPSTART,
19+ "com.ubuntu.Upstart",
20+ "/com/ubuntu/Upstart",
21+ "com.ubuntu.Upstart0_6",
22 "ListEnv",
23 g_variant_new("(@as)",
24 g_variant_new_strv (NULL, 0)),