Merge lp:~ted/url-dispatcher/alarm-url into lp:url-dispatcher/13.10

[Ted Gould]

Adding the alarm URL pattern

Alarms alarms alarms

[lp:~ted/url-dispatcher/alarm-url]

33. By Ted Gould on 2013-10-01

Using the right app

34. By Ted Gould on 2013-10-01

Again

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-armhf-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins:8080/job/url-dispatcher-ci/27/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-armhf-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-i386-ci/28

Click here to trigger a rebuild:
http://s-jenkins:8080/job/url-dispatcher-ci/28/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Looks right.

review: Approve

=== modified file 'service/dispatcher.c'
--- service/dispatcher.c	2013-09-27 20:58:55 +0000
+++ service/dispatcher.c	2013-10-01 17:39:44 +0000
@@ -137,6 +137,12 @@
 
 /* TODO: Make these come from registrations, but this works for now */
 url_type_t url_types[] = {
+	/* Alarms */
+	{
+		.regex_patern = "^alarm:///",
+		.regex_object = NULL,
+		.app_id = "ubuntu-clock-app"
+	},
 	/* Address Book */
 	{
 		.regex_patern = "^addressbook:///",