Merge lp:~codygarver/switchboard-plug-security-privacy/fix-1343677 into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

[Cody Garver]

Change icon activity-log-manager to preferences-system-privacy

[Danielle Foré (danrabbit)]

review: Approve

=== modified file 'data/org.pantheon.security-privacy.policy.cmake'
--- data/org.pantheon.security-privacy.policy.cmake	2014-04-20 23:23:14 +0000
+++ data/org.pantheon.security-privacy.policy.cmake	2014-08-09 18:24:18 +0000
@@ -8,7 +8,7 @@
 
   <action id="org.pantheon.security-privacy">
     <message gettext-domain="@GETTEXT_PACKAGE@">Authentication is required to run the Firewall Configuration</message>
-    <icon_name>activity-log-manager</icon_name>
+    <icon_name>preferences-system-privacy</icon_name>
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>
@@ -17,4 +17,4 @@
     <annotate key="org.freedesktop.policykit.exec.path">@PKGDATADIR@/security-privacy-plug-helper</annotate>
   </action>
 
-</policyconfig>
+</policyconfig>
\ No newline at end of file

=== modified file 'data/pantheon-security-privacy-plug.desktop'
--- data/pantheon-security-privacy-plug.desktop	2014-04-24 13:01:56 +0000
+++ data/pantheon-security-privacy-plug.desktop	2014-08-09 18:24:18 +0000
@@ -2,11 +2,11 @@
 Name=Security & Privacy
 Comment=Privacy and Activity Manager
 Exec=switchboard -o pantheon-security-privacy
-Icon=activity-log-manager
+Icon=preferences-system-privacy
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-PANTHEON-Switchboard-Plugs;PersonalSettings
 OnlyShowIn=Pantheon;
 Keywords=Lock;Track;Firewall;ufw;
-X-GNOME-Gettext-Domain=pantheon-security-privacy-plug
+X-GNOME-Gettext-Domain=pantheon-security-privacy-plug
\ No newline at end of file

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2014-07-30 17:22:05 +0000
+++ src/Plug.vala	2014-08-09 18:24:18 +0000
@@ -34,7 +34,7 @@
                     code_name: Build.PLUGCODENAME,
                     display_name: _("Security & Privacy"),
                     description: _("Privacy and Activity Manager"),
-                    icon: "activity-log-manager");
+                    icon: "preferences-system-privacy");
             plug = this;
         }
 
@@ -127,4 +127,4 @@
     debug ("Activating Security & Privacy plug");
     var plug = new SecurityPrivacy.Plug ();
     return plug;
-}
+}
\ No newline at end of file