Merge lp:~timchen119/notify-osd/notify-osd.lp404658 into lp:notify-osd

[Tim Chen]

Provide the "x-canonical-private-synchronous" to work with notifications different with LAYOUT_ICON_INDICATOR layout.
  Currently the "x-canonical-private-synchronous" interface only provide this layout to support brightness and volume control.

  This make following command behave correctly.
  $notify-send "RF-status" "enabled" -h string:x-canonical-private-synchronous:1 -h string:image_path:/tmp/test.jpg

  Canonical OEM projects need this function to

  * enable OSD for enable/disable WiFi or bluetooth with a hotkey
  * enable OSD for display switching with a hotkey
(LP: #404658)

  Provide the "x-canonical-private-synchronous" to work with notifications different with LAYOUT_ICON_INDICATOR layout.
  Currently the "x-canonical-private-synchronous" interface only provide this layout to support brightness and volume control.

  This make following command behave correctly.
  $notify-send "RF-status" "enabled" -h string:x-canonical-private-synchronous:1 -h string:image_path:/tmp/test.jpg

  Canonical OEM projects need this function to

  * enable OSD for enable/disable WiFi or bluetooth with a hotkey
  * enable OSD for display switching with a hotkey

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:472
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~timchen119/notify-osd/notify-osd.lp404658/+merge/192467/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/notify-osd-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-i386-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notify-osd-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[lp:~timchen119/notify-osd/notify-osd.lp404658]

473. By Tim Chen on 2013-10-24

* Add changelog.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:473
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-i386-ci/2

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notify-osd-ci/6/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Thanks for this patch, but it doesn't fully fix bug #404658. The summary and body of a synchronous notification are not updated when a new synchronous notification is sent.

This patch also changes whitespace around the changed lines.

I've incorporated your patch in lp:~~larsu/notify-osd/update-sync.

Unmerged revisions

473. By Tim Chen on 2013-10-24

* Add changelog.

472. By Tim Chen on 2013-10-24

Provide the "x-canonical-private-synchronous" to work with notifications different with LAYOUT_ICON_INDICATOR layout.
Currently the "x-canonical-private-synchronous" interface only provide this layout to support brightness and volume control.

This make following command behave correctly.
$notify-send "RF-status" "enabled" -h string:x-canonical-private-synchronous:1 -h string:image_path:/tmp/test.jpg

Canonical OEM projects need this function to

* enable OSD for enable/disable WiFi or bluetooth with a hotkey
* enable OSD for display switching with a hotkey

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-17 22:04:19 +0000
+++ debian/changelog	2013-10-24 09:19:38 +0000
@@ -1,3 +1,13 @@
+notify-osd (0.9.35+13.10.20130917.1-0ubuntu2) UNRELEASE; urgency=low
+
+  * Provide the "x-canonical-private-synchronous" to work with notifications 
+    different with LAYOUT_ICON_INDICATOR layout.
+    Currently the "x-canonical-private-synchronous" interface only provide 
+    this layout to support brightness and volume control.
+    (LP: #404658)
+  
+ -- Jian-Ding Chen (timchen119) <[e-mail]>  Thu, 24 Oct 2013 17:15:38 +0800
+
 notify-osd (0.9.35+13.10.20130917.1-0ubuntu1) saucy; urgency=low
 
   [ Sami Jaktholm ]

=== modified file 'src/stack.c'
--- src/stack.c	2013-09-08 08:38:11 +0000
+++ src/stack.c	2013-10-24 09:19:38 +0000
@@ -630,6 +630,29 @@
 		g_free (sender);
 	}
 
+	if (hints)
+	{
+		data   = (GValue*) g_hash_table_lookup (hints, "x-canonical-private-synchronous");
+		compat = (GValue*) g_hash_table_lookup (hints, "synchronous");
+		if ((data && G_VALUE_HOLDS_STRING (data)) || (compat && G_VALUE_HOLDS_STRING (compat)))
+		{
+			if (sync_bubble != NULL
+			    && IS_BUBBLE (sync_bubble))
+			{
+				g_object_unref (bubble);
+				bubble = sync_bubble;
+				/* Setup default value for default layout. */
+				bubble_set_value (bubble, -2);
+			}
+
+			if (data && G_VALUE_HOLDS_STRING (data))
+				bubble_set_synchronous (bubble, g_value_get_string (data));
+
+			if (compat && G_VALUE_HOLDS_STRING (compat))
+				bubble_set_synchronous (bubble, g_value_get_string (compat));
+		}
+	}
+
 	if (new_bubble && hints)
 	{
 		data   = (GValue*) g_hash_table_lookup (hints, "x-canonical-append");
@@ -665,27 +688,6 @@
 
 	if (hints)
 	{
-		data   = (GValue*) g_hash_table_lookup (hints, "x-canonical-private-synchronous");
-		compat = (GValue*) g_hash_table_lookup (hints, "synchronous");
-		if ((data && G_VALUE_HOLDS_STRING (data)) || (compat && G_VALUE_HOLDS_STRING (compat)))
-		{
-			if (sync_bubble != NULL
-			    && IS_BUBBLE (sync_bubble))
-			{
-				g_object_unref (bubble);
-				bubble = sync_bubble;
-			}
-
-			if (data && G_VALUE_HOLDS_STRING (data))
-				bubble_set_synchronous (bubble, g_value_get_string (data));
-
-			if (compat && G_VALUE_HOLDS_STRING (compat))
-				bubble_set_synchronous (bubble, g_value_get_string (compat));
-		}
-	}
-
-	if (hints)
-	{
 		data = (GValue*) g_hash_table_lookup (hints, "value");
 		if (data && G_VALUE_HOLDS_INT (data))
 			bubble_set_value (bubble, g_value_get_int (data));