Merge lp:~donadigo/switchboard-plug-notifications/fix-1485317 into lp:~elementary-pantheon/switchboard-plug-notifications/trunk

[Adam Bieńkowski]

* Completely hide notify-send item.
* Fix bug #1485317.

Fix bug #1485317 Change notify-send to something else.

[lp:~donadigo/switchboard-plug-notifications/fix-1485317]

118. By Adam Bieńkowski on 2015-08-30

Completely hide notify-send entry

119. By Adam Bieńkowski on 2015-08-30

Remove exception

[Marcus Wichelmann (l-admin-3)]

Works and the code looks good.

review: Approve (code & testing)

=== modified file 'src/Widgets/AppItem.vala'
--- src/Widgets/AppItem.vala	2015-02-14 19:51:16 +0000
+++ src/Widgets/AppItem.vala	2015-08-30 20:35:22 +0000
@@ -35,7 +35,7 @@
 	private string[] cond_sounds = ({"on", "off"});
 
 	// Please add more exceptions! TODO: app-name, title and icon all in one array.
-	private string[] exceptions = ({"", "indicator-sound", "notify-send", "NetworkManager", "gnome-settings-daemon"});
+	private string[] exceptions = ({"", "indicator-sound", "NetworkManager", "gnome-settings-daemon"});
 
 	public AppItem (string app_name, string[] properties) {
 		if (search_appinfo_for_name (app_name) && load_icon ()) {
@@ -51,7 +51,7 @@
 		try {
 			AppInfo found_info = AppInfo.create_from_commandline ("", app_name, AppInfoCreateFlags.NONE);
 
-			if ((app_name in exceptions) == false) {
+			if (!(app_name in exceptions)) {
 				var found = false;
 
 				AppInfo.get_all ().foreach ((info) => {
@@ -86,9 +86,6 @@
 					case "indicator-sound":
 						appicon = Icon.new_for_string ("preferences-desktop-sound");
 						break;
-					case "notify-send":
-						appicon = Icon.new_for_string ("dialog-information");
-						break;
 					case "NetworkManager":
 						appicon = Icon.new_for_string ("preferences-system-network");
 						break;
 
=== modified file 'src/Widgets/AppList.vala'
--- src/Widgets/AppList.vala	2014-11-14 19:07:17 +0000
+++ src/Widgets/AppList.vala	2015-08-30 20:35:22 +0000
@@ -59,7 +59,7 @@
 			if (parameters.length == 2) {
 				var properties = parameters[1].split (",");
 
-				if (properties.length == 2) {
+				if (properties.length == 2 && parameters[0] != "notify-send") {
 					var item = new AppItem (parameters[0], properties);
 					this.add (item);
 				}