Merge lp:~macslow/unity-notifications/sound-hint-support into lp:unity-notifications

[Mirco Müller]

Added the backend-part of sound-hint support with two additional examples demonstrating its use.

Added the backend-part of sound-hint support with two additional examples demonstrating its use.

* Are there any related MPs required for this MP to build/function as expected?
Not applicable.

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

* Did you make sure that your branch does not contain spurious tags?
Yes.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable.

* If you changed the UI, has there been a design review?
Not applicable.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-i386-ci/2

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Minor comments inline.

review: Needs Fixing

[lp:~macslow/unity-notifications/sound-hint-support]

204. By Mirco Müller on 2014-06-16

Fixed identation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-utopic-i386-ci/5

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Yes.

review: Approve

=== modified file 'examples/example.py'
--- examples/example.py	2014-05-07 15:32:40 +0000
+++ examples/example.py	2014-06-16 10:11:21 +0000
@@ -42,6 +42,8 @@
 				'icon-multi':                        False,
 				'icon-static':                       False,
 				'sound':                             False,
+				'sound-file':                        False,
+				'suppress-sound':                    False,
 				'image/svg+xml':                     False,
 				'urgency':                           False,
 				'x-canonical-private-synchronous':   False,
@@ -94,6 +96,10 @@
 		print "\ticon-static"
 	if capabilities['sound']:
 		print "\tsound"
+	if capabilities['sound-file']:
+		print "\tsound-file"
+	if capabilities['suppress-sound']:
+		print "\tsuppress-sound"
 	if capabilities['urgency']:
 		print "\turgency"
 	if capabilities['image/svg+xml']:

=== added file 'examples/sound.py'
--- examples/sound.py	1970-01-01 00:00:00 +0000
+++ examples/sound.py	2014-06-16 10:11:21 +0000
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+
+################################################################################
+##3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
+##      10        20        30        40        50        60        70        80
+##
+## Info: 
+##    Example of how to use libnotify correctly
+##
+## Run:
+##    chmod +x sound.py
+##    ./sound.py
+##
+## Copyright 2014 Canonical Ltd.
+##
+## Author:
+##    Mirco "MacSlow" Mueller <[e-mail]>
+##
+## This program is free software: you can redistribute it and/or modify it
+## under the terms of the GNU General Public License version 3, as published
+## by the Free Software Foundation.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranties of
+## MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+## PURPOSE.  See the GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+################################################################################
+
+import os
+import sys
+import pynotify
+import example
+
+if __name__ == '__main__':
+	if not pynotify.init ("sound"):
+		sys.exit (1)
+
+	# call this so we can savely use capabilities dictionary later
+	example.initCaps ()
+
+	# show what's supported
+	example.printCaps ()
+
+	# try the sound support
+	n = pynotify.Notification ("Lotsof N. Oise",
+				   "With the popping up of this notification, you should hear a sound being played.",
+				   os.getcwd() + "/assets/avatar2.jpg")
+	n.set_hint_string ("sound-file", "/usr/share/sounds/ubuntu/stereo/desktop-login.ogg")
+	n.show ()

=== added file 'examples/suppress-sound.py'
--- examples/suppress-sound.py	1970-01-01 00:00:00 +0000
+++ examples/suppress-sound.py	2014-06-16 10:11:21 +0000
@@ -0,0 +1,54 @@
+#!/usr/bin/python
+
+################################################################################
+##3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
+##      10        20        30        40        50        60        70        80
+##
+## Info: 
+##    Example of how to use libnotify correctly
+##
+## Run:
+##    chmod +x suppress-sound.py
+##    ./suppress-sound.py
+##
+## Copyright 2014 Canonical Ltd.
+##
+## Author:
+##    Mirco "MacSlow" Mueller <[e-mail]>
+##
+## This program is free software: you can redistribute it and/or modify it
+## under the terms of the GNU General Public License version 3, as published
+## by the Free Software Foundation.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranties of
+## MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+## PURPOSE.  See the GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+################################################################################
+
+import os
+import sys
+import pynotify
+import example
+
+if __name__ == '__main__':
+	if not pynotify.init ("suppress-sound"):
+		sys.exit (1)
+
+	# call this so we can savely use capabilities dictionary later
+	example.initCaps ()
+
+	# show what's supported
+	example.printCaps ()
+
+	# try suppress-sound support
+	n = pynotify.Notification ("Lotsof N. Oise",
+				   "With the popping up of this notification, you should NOT hear a sound being played.",
+				   os.getcwd() + "/assets/avatar2.jpg")
+	n.set_hint_string ("sound-file", "/usr/share/sounds/ubuntu/stereo/desktop-login.ogg")
+	n.set_hint_string ("suppress-sound", "true")
+	n.show ()

=== modified file 'include/notify-backend.h.in'
--- include/notify-backend.h.in	2014-05-07 15:32:40 +0000
+++ include/notify-backend.h.in	2014-06-16 10:11:21 +0000
@@ -56,6 +56,8 @@
 #endif
 
 #define URGENCY_HINT "urgency"
+#define SOUND_HINT "sound-file"
+#define SUPPRESS_SOUND_HINT "suppress-sound"
 #define SYNCH_HINT "x-canonical-private-synchronous"
 #define SNAP_HINT "x-canonical-snap-decisions"
 #define MENU_MODEL_HINT "x-canonical-private-menu-model"

=== modified file 'src/NotificationServer.cpp'
--- src/NotificationServer.cpp	2014-06-02 10:58:21 +0000
+++ src/NotificationServer.cpp	2014-06-16 10:11:21 +0000
@@ -47,6 +47,8 @@
     capabilities.push_back("icon-static");
     capabilities.push_back("image/svg+xml");
     capabilities.push_back(URGENCY_HINT);
+    capabilities.push_back(SOUND_HINT);
+    capabilities.push_back(SUPPRESS_SOUND_HINT);
     capabilities.push_back(SYNCH_HINT);
     capabilities.push_back(APPEND_HINT);
     capabilities.push_back(ICON_ONLY_HINT);