Merge lp:~psusi/ubuntu/natty/indicator-session/sleep into lp:ubuntu/natty/indicator-session

Proposed by Phillip Susi on 2011-03-19
Status: Rejected
Rejected by: James Westby on 2011-05-17
Proposed branch: lp:~psusi/ubuntu/natty/indicator-session/sleep
Merge into: lp:ubuntu/natty/indicator-session
Diff against target: 61 lines (+9/-14)
3 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
src/session-service.c (+1/-13)
To merge this branch: bzr merge lp:~psusi/ubuntu/natty/indicator-session/sleep
Reviewer Review Type Date Requested Status
Chris Halse Rogers Approve on 2011-03-29
Ubuntu branches 2011-03-19 Pending
Review via email: mp+54094@code.launchpad.net

Description of the change

See linked bug report and related branches that all need merged together.

To post a comment you must log in.
Chris Halse Rogers (raof) wrote :

Looks good to me, but I can't upload.

review: Approve

Unmerged revisions

45. By Phillip Susi on 2011-03-19

Remove screen saver start and lock functions, as this is
the job of gnome-power-manager (LP: #578542).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-10 16:10:19 +0000
3+++ debian/changelog 2011-03-19 03:39:27 +0000
4@@ -1,3 +1,10 @@
5+indicator-session (0.2.15-0ubuntu2) natty; urgency=low
6+
7+ * Remove screen saver start and lock functions, as this is
8+ the job of gnome-power-manager (LP: #578542).
9+
10+ -- Phillip Susi <psusi@cfl.rr.com> Mon, 07 Mar 2011 19:14:47 -0500
11+
12 indicator-session (0.2.15-0ubuntu1) natty; urgency=low
13
14 * New upstream release.
15
16=== modified file 'debian/control'
17--- debian/control 2011-02-17 13:31:40 +0000
18+++ debian/control 2011-03-19 03:39:27 +0000
19@@ -20,7 +20,7 @@
20
21 Package: indicator-session
22 Architecture: any
23-Depends: ${shlibs:Depends}, ${misc:Depends}, upower
24+Depends: ${shlibs:Depends}, ${misc:Depends}, upower (>= 0.9.8-3ubuntu1)
25 Recommends: indicator-applet (>= 0.2) | indicator-renderer
26 Suggests: gdm
27 Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
28
29=== modified file 'src/session-service.c'
30--- src/session-service.c 2011-03-10 16:10:19 +0000
31+++ src/session-service.c 2011-03-19 03:39:27 +0000
32@@ -176,15 +176,6 @@
33 return;
34 }
35
36-/* A return from the command to sleep the system. Make sure
37- that we unthrottle the screensaver. */
38-static void
39-sleep_response (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
40-{
41- screensaver_unthrottle();
42- return;
43-}
44-
45 /* Let's put this machine to sleep, with some info on how
46 it should sleep. */
47 static void
48@@ -196,12 +187,9 @@
49 g_warning("Can not %s as no upower proxy", type);
50 }
51
52- screensaver_throttle(type);
53- lock_if_possible();
54-
55 dbus_g_proxy_begin_call(up_main_proxy,
56 type,
57- sleep_response,
58+ NULL,
59 NULL,
60 NULL,
61 G_TYPE_INVALID);

Subscribers

People subscribed via source and target branches

to all changes: