Unity Greeter

Merge lp:~ubuntu-desktop/unity-greeter/unity-settings-daemon into lp:unity-greeter

  1. unity-settings-daemon
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 1121
Merged at revision: 1134
Proposed branch: lp:~ubuntu-desktop/unity-greeter/unity-settings-daemon
Merge into: lp:unity-greeter
Diff against target: 83 lines (+10/-10)
5 files modified
configure.ac (+4/-4)
debian/control (+2/-2)
src/config.vapi (+1/-1)
src/menubar.vala (+1/-1)
src/settings-daemon.vala (+2/-2)
To merge this branch: bzr merge lp:~ubuntu-desktop/unity-greeter/unity-settings-daemon
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Robert Ancell Approve
Review via email: mp+206648@code.launchpad.net

Commit message

Use unity-settings-daemon

To post a comment you must log in.
lp:~ubuntu-desktop/unity-greeter/unity-settings-daemon updated
1120. By Robert Ancell

merge with trunk

1121. By Robert Ancell

Remove unnecessary debian/changelog entry

Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2014-02-05 10:10:04 +0000
3+++ configure.ac 2014-02-20 03:18:03 +0000
4@@ -35,11 +35,11 @@
5 INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
6 AC_SUBST(INDICATORDIR)
7
8-GSD_BINARY=`$PKG_CONFIG --variable=binary gnome-settings-daemon`
9-if test -z "$GSD_BINARY"; then
10- AC_MSG_ERROR([Could not find path to gnome-settings-daemon binary])
11+USD_BINARY=`$PKG_CONFIG --variable=binary unity-settings-daemon`
12+if test -z "$USD_BINARY"; then
13+ AC_MSG_ERROR([Could not find path to unity-settings-daemon binary])
14 fi
15-AC_DEFINE_UNQUOTED([GSD_BINARY], ["$GSD_BINARY"], [Path to g-s-d])
16+AC_DEFINE_UNQUOTED([USD_BINARY], ["$USD_BINARY"], [Path to g-s-d])
17
18 dnl ###########################################################################
19 dnl Internationalization
20
21=== modified file 'debian/control'
22--- debian/control 2014-02-05 12:36:59 +0000
23+++ debian/control 2014-02-20 03:18:03 +0000
24@@ -9,7 +9,7 @@
25 debhelper (>= 9),
26 dh-autoreconf,
27 gnome-common,
28- gnome-settings-daemon-dev,
29+ unity-settings-daemon-dev,
30 libcanberra-dev,
31 libgtk-3-dev,
32 libindicator3-dev,
33@@ -28,7 +28,7 @@
34 Architecture: any
35 Depends: ${misc:Depends},
36 ${shlibs:Depends},
37-Recommends: gnome-settings-daemon,
38+Recommends: unity-settings-daemon,
39 indicator-application,
40 indicator-datetime,
41 indicator-keyboard,
42
43=== modified file 'src/config.vapi'
44--- src/config.vapi 2013-07-04 19:15:52 +0000
45+++ src/config.vapi 2014-02-20 03:18:03 +0000
46@@ -8,5 +8,5 @@
47 public const string INDICATOR_FILE_DIR;
48 public const string PKGDATADIR;
49 public const string INDICATORDIR;
50- public const string GSD_BINARY;
51+ public const string USD_BINARY;
52 }
53
54=== modified file 'src/menubar.vala'
55--- src/menubar.vala 2013-11-10 21:50:46 +0000
56+++ src/menubar.vala 2014-02-20 03:18:03 +0000
57@@ -318,7 +318,7 @@
58 greeter_set_env ("GIO_USE_VFS", "local");
59 greeter_set_env ("GVFS_DISABLE_FUSE", "1");
60
61- /* Hint to have gnome-settings-daemon run in greeter mode */
62+ /* Hint to have unity-settings-daemon run in greeter mode */
63 greeter_set_env ("RUNNING_UNDER_GDM", "1");
64
65 /* Let indicators know about our unique dbus name */
66
67=== modified file 'src/settings-daemon.vala'
68--- src/settings-daemon.vala 2013-10-21 20:23:28 +0000
69+++ src/settings-daemon.vala 2014-02-20 03:18:03 +0000
70@@ -117,11 +117,11 @@
71 {
72 try
73 {
74- Process.spawn_command_line_async (Config.GSD_BINARY);
75+ Process.spawn_command_line_async (Config.USD_BINARY);
76 }
77 catch (SpawnError e)
78 {
79- debug ("Could not start gnome-settings-daemon: %s", e.message);
80+ debug ("Could not start unity-settings-daemon: %s", e.message);
81 }
82 }
83 }

Subscribers

People subscribed via source and target branches