unity-notifications

Merge lp:~macslow/unity-notifications/notification-fullscreen-support into lp:unity-notifications

  1. notification-fullscreen-support
  2. Merge into trunk
Proposed by Mirco Müller
Status: Merged
Approved by: Mirco Müller
Approved revision: 193
Merged at revision: 189
Proposed branch: lp:~macslow/unity-notifications/notification-fullscreen-support
Merge into: lp:unity-notifications
Diff against target: 74 lines (+7/-3)
4 files modified
examples/example.py (+3/-0)
examples/sd-example-simunlock.py (+2/-3)
include/notify-backend.h.in (+1/-0)
src/NotificationServer.cpp (+1/-0)
To merge this branch: bzr merge lp:~macslow/unity-notifications/notification-fullscreen-support
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Zanetti (community) Approve
Review via email: mp+192678@code.launchpad.net

Commit message

Added reporting-support for x-canonical-private-fullscreen hint.

Description of the change

Add reporting-support for "x-canonical-private-fullscreen" hint needed by some ext. snap-decisions... updated simunlock-example to use this new hint.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-i386-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-notifications-ci/26/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-i386-ci/4

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-notifications-ci/29/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

31 - pin_unlock.set_attribute_value ("x-canonical-pin-length", GLib.Variant('i', 4));
32 + pin_unlock.set_attribute_value ("x-canonical-pin-length", GLib.Variant('i', 5));

Pin length is no more. Also, this change doesn't seem to be related.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:192
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-notifications-ci/31/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

ack

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-notifications-autolanding/112/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3363/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-amd64-autolanding/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-autolanding/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-i386-autolanding/3/console

review: Needs Fixing (continuous-integration)
lp:~macslow/unity-notifications/notification-fullscreen-support updated
193. By Mirco Müller

Merged with trunk and fixed conflicts.

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 'examples/example.py'
2--- examples/example.py 2013-11-20 14:43:09 +0000
3+++ examples/example.py 2013-11-21 15:37:15 +0000
4@@ -53,6 +53,7 @@
5 'x-canonical-secondary-icon': False,
6 'x-canonical-private-button-tint': False,
7 'x-canonical-private-menu-model': False,
8+ 'x-canonical-private-fullscreen': False}
9 'x-canonical-non-shaped-icon': False}
10
11 def initCaps ():
12@@ -115,6 +116,8 @@
13 print "\tx-canonical-private-button-tint"
14 if capabilities['x-canonical-private-menu-model']:
15 print "\tx-canonical-private-menu-model"
16+ if capabilities['x-canonical-private-fullscreen']:
17+ print "\tx-canonical-private-fullscreen"
18 if capabilities['x-canonical-non-shaped-icon']:
19 print "\tx-canonical-non-shaped-icon"
20
21
22=== modified file 'examples/sd-example-simunlock.py'
23--- examples/sd-example-simunlock.py 2013-10-10 09:37:08 +0000
24+++ examples/sd-example-simunlock.py 2013-11-21 15:37:15 +0000
25@@ -67,8 +67,6 @@
26 unlock_menu = Gio.Menu();
27 pin_unlock = Gio.MenuItem.new ("", "notifications.simunlock");
28 pin_unlock.set_attribute_value ("x-canonical-type", GLib.Variant.new_string("com.canonical.snapdecision.pinlock"));
29- pin_unlock.set_attribute_value ("x-canonical-type", GLib.Variant.new_string("com.canonical.snapdecision.pinlock"));
30- pin_unlock.set_attribute_value ("x-canonical-pin-length", GLib.Variant('i', 4));
31 unlock_menu.append_item (pin_unlock);
32
33 # actions
34@@ -112,6 +110,7 @@
35 # indicate to the notification-daemon, that we want to use snap-decisions
36 simNotification.set_hint_string ("x-canonical-snap-decisions", "true");
37 simNotification.set_hint_string ("x-canonical-private-button-tint", "true");
38+ simNotification.set_hint_string ("x-canonical-private-fullscreen", "true");
39
40 Gio.bus_own_name(Gio.BusType.SESSION, APPLICATION_ID, 0, bus_acquired, None, None)
41
42@@ -128,7 +127,7 @@
43
44 loop = GLib.MainLoop()
45 global n
46- n = pushNotification ("Unlock SIM-card", "", "")
47+ n = pushNotification ("", "", "")
48 n.connect('closed', quit_callback, loop)
49 n.show ()
50
51
52=== modified file 'include/notify-backend.h.in'
53--- include/notify-backend.h.in 2013-10-31 12:55:18 +0000
54+++ include/notify-backend.h.in 2013-11-21 15:37:15 +0000
55@@ -59,6 +59,7 @@
56 #define SYNCH_HINT "x-canonical-private-synchronous"
57 #define SNAP_HINT "x-canonical-snap-decisions"
58 #define MENU_MODEL_HINT "x-canonical-private-menu-model"
59+#define FULLSCREEN_HINT "x-canonical-private-fullscreen"
60 #define INTERACTIVE_HINT "x-canonical-switch-to-application"
61 #define SECONDARY_ICON_HINT "x-canonical-secondary-icon"
62 #define NON_SHAPED_ICON_HINT "x-canonical-non-shaped-icon"
63
64=== modified file 'src/NotificationServer.cpp'
65--- src/NotificationServer.cpp 2013-11-20 16:58:42 +0000
66+++ src/NotificationServer.cpp 2013-11-21 15:37:15 +0000
67@@ -56,6 +56,7 @@
68 capabilities.push_back(NON_SHAPED_ICON_HINT);
69 capabilities.push_back(MENU_MODEL_HINT);
70 capabilities.push_back(INTERACTIVE_HINT);
71+ capabilities.push_back(FULLSCREEN_HINT);
72
73 return capabilities;
74 }

Subscribers

People subscribed via source and target branches

to all changes: