Merge lp:~jbicha/activity-log-manager/add-apps-drop-spreadsheets-presentations into lp:activity-log-manager

[Jeremy Bícha]

...and changes the capitalization of "Chat Logs" to "Chat logs" which I think fits better in the style Unity is aiming towards in the dash and elsewhere.

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

I am not sure if dropping Presentations and Spreadsheets makes sense because Datahub's recent-manager-provider.vala does take care of openoffice stuff. Check lines 113 and it is able to deduce the proper Interpretation from the mimetype (line 148)

review: Needs Information

[Jeremy Bícha (jbicha)]

Yes, Zeitgeist can handle Spreadsheets separately than Presentations but I can't think of a good reason why a typical user wouldn't just want a single toggle for all document types.

I used zg's data/ontology/nfo.trig to see that Spreadsheets and Presentations are subclasses of Documents anyway (as are several other document types that we don't have toggles for).

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

review: Approve

=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala	2013-07-09 23:46:11 +0000
+++ src/unified-privacy.vala	2013-07-11 02:28:33 +0000
@@ -115,13 +115,12 @@
 			});
 			
 			mime_dict = new HashMap<string, string>(str_hash, str_equal);
+			mime_dict.set(_("Applications"), NFO.SOFTWARE);
 			mime_dict.set(_("Music"), NFO.AUDIO);
 			mime_dict.set(_("Videos"), NFO.VIDEO);
 			mime_dict.set(_("Pictures"), NFO.IMAGE);
 			mime_dict.set(_("Documents"), NFO.DOCUMENT);
-			mime_dict.set(_("Presentations"), NFO.PRESENTATION);
-			mime_dict.set(_("Spreadsheets"), NFO.SPREADSHEET);
-			mime_dict.set(_("Chat Logs"), NMO.IMMESSAGE);
+			mime_dict.set(_("Chat logs"), NMO.IMMESSAGE);
 			mime_dict.set(_("Emails"), NMO.EMAIL);
 			mime_dict.set(_("Websites"), NFO.WEBSITE);