Merge lp:~ted/indicator-sound/lp1422745-menu-open into lp:indicator-sound/15.04

[Ted Gould]

Switch to an internal variable to track blocking notifications

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:483
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/215/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/42/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/215/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/service.vala'
--- src/service.vala	2015-02-24 19:06:39 +0000
+++ src/service.vala	2015-02-24 19:06:39 +0000
@@ -97,12 +97,16 @@
 		/* Hide the notification when the menu is shown */
 		var shown_action = actions.lookup_action ("indicator-shown") as SimpleAction;
 		shown_action.change_state.connect ((state) => {
-			if (state.get_boolean()) {
+			block_notifications = state.get_boolean();
+			if (block_notifications) {
+				debug("Indicator is shown");
 				try {
 					sync_notification.close();
 				} catch (Error e) {
 					warning("Unable to close synchronous volume notification: %s", e.message);
 				}
+			} else {
+				debug("Indicator is hidden");
 			}
 		});
 
@@ -280,6 +284,7 @@
 
 	private bool check_sync_notification = false;
 	private bool support_sync_notification = false;
+	private bool block_notifications = false;
 
 	void update_sync_notification () {
 		if (!check_sync_notification) {
@@ -294,8 +299,7 @@
 		if (!support_sync_notification)
 			return;
 
-		var shown_action = actions.lookup_action ("indicator-shown") as SimpleAction;
-		if (shown_action != null && shown_action.get_state().get_boolean())
+		if (block_notifications)
 			return;
 
 		/* Determine Label */
 
=== modified file 'tests/notifications-test.cc'
--- tests/notifications-test.cc	2015-02-24 19:06:39 +0000
+++ tests/notifications-test.cc	2015-02-24 19:06:39 +0000
@@ -146,6 +146,25 @@
 			volume_control_set_volume(volumeControl.get(), vol);
 			g_object_unref(vol);
 		}
+
+		void setIndicatorShown (bool shown) {
+			auto bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, nullptr);
+
+			g_dbus_connection_call(bus,
+				g_dbus_connection_get_unique_name(bus),
+				"/com/canonical/indicator/sound",
+				"org.gtk.Actions",
+				"SetState",
+				g_variant_new("(sva{sv})", "indicator-shown", g_variant_new_boolean(shown), nullptr),
+				nullptr,
+				G_DBUS_CALL_FLAGS_NONE,
+				-1,
+				nullptr,
+				nullptr,
+				nullptr);
+
+			g_clear_object(&bus);
+		}
 };
 
 TEST_F(NotificationsTest, BasicObject) {
@@ -357,6 +376,36 @@
 	EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]);
 }
 
+TEST_F(NotificationsTest, MenuHide) {
+	auto volumeControl = volumeControlMock();
+	auto soundService = standardService(volumeControl, playerListMock());
+
+	/* Set a volume */
+	notifications->clearNotifications();
+	setMockVolume(volumeControl, 0.50);
+	loop(50);
+	auto notev = notifications->getNotifications();
+	EXPECT_EQ(1, notev.size());
+
+	/* Set the indicator to shown, and set a new volume */
+	notifications->clearNotifications();
+	setIndicatorShown(true);
+	loop(50);
+	setMockVolume(volumeControl, 0.60);
+	loop(50);
+	notev = notifications->getNotifications();
+	EXPECT_EQ(0, notev.size());
+
+	/* Set the indicator to hidden, and set a new volume */
+	notifications->clearNotifications();
+	setIndicatorShown(false);
+	loop(50);
+	setMockVolume(volumeControl, 0.70);
+	loop(50);
+	notev = notifications->getNotifications();
+	EXPECT_EQ(1, notev.size());
+}
+
 TEST_F(NotificationsTest, ExtendendVolumeNotification) {
 	auto volumeControl = volumeControlMock();
 	auto soundService = standardService(volumeControl, playerListMock());
@@ -397,4 +446,3 @@
 	ASSERT_EQ(1, notev.size());
 	EXPECT_GVARIANT_EQ("@i 100", notev[0].hints["value"]);
 }
-