Merge lp:~davidmhewitt/pantheon-agent-geoclue2/fix-1667757 into lp:~elementary-pantheon/pantheon-agent-geoclue2/trunk

[David Hewitt]

Remove "never ask again" checkbox.

Remove "never ask again" checkbox. If you deny, you will prompted each time the app requests access again. If you allow, you will not be asked again.

[Danielle Foré (danrabbit)]

Does what it says it does! Just a minor code style issue ;)

[lp:~davidmhewitt/pantheon-agent-geoclue2/fix-1667757]

17. By David Hewitt on 2017-02-25

Fix code style

=== modified file 'src/Agent.vala'
--- src/Agent.vala	2017-02-24 17:37:39 +0000
+++ src/Agent.vala	2017-02-25 00:36:22 +0000
@@ -97,11 +97,9 @@
 				var stored_accuracy = remembered_accuracy.get_uint32();
 				if (req_accuracy <= stored_accuracy) {
 					authorized = true;
-				} else {
-					authorized = false;
-				}
-				allowed_accuracy = req_accuracy;
-				return;
+					allowed_accuracy = req_accuracy;
+					return;
+				}				
 			}
 
 			string app_name = app_info.get_display_name ();
@@ -121,7 +119,6 @@
 			dialog.show_all ();
 
 			var result = dialog.run ();
-			var remember = dialog.remember_checked ();
 
 			switch (result) {
 				case Gtk.ResponseType.YES:
@@ -132,12 +129,10 @@
 					break;
 			}
 
-			if (remember) {
-				if(authorized) {
-					remember_app (id, new Variant.uint32 (req_accuracy));
-				} else {
-					remember_app (id, new Variant.uint32 (0));
-				}
+			if (authorized) {
+				remember_app (id, new Variant.uint32 (req_accuracy));
+			} else {
+				remember_app (id, new Variant.uint32 (0));
 			}
 
 			dialog.destroy ();
 
=== modified file 'src/Geoclue2Dialog.vala'
--- src/Geoclue2Dialog.vala	2017-02-24 17:37:39 +0000
+++ src/Geoclue2Dialog.vala	2017-02-25 00:36:22 +0000
@@ -21,8 +21,6 @@
 
 namespace Ag.Widgets {
     public class Geoclue2Dialog : Gtk.Dialog {
-        public signal void done (bool allow);
-        private Gtk.CheckButton remember_checkbox;
 
         public Geoclue2Dialog (string message, string app_name, string icon_name) {
             Object (title: _("Location Dialog"), window_position: Gtk.WindowPosition.CENTER, resizable: false, deletable: false, skip_taskbar_hint: true);
@@ -41,9 +39,6 @@
             message_label.wrap = true;
             message_label.xalign = 0;
 
-            remember_checkbox = new Gtk.CheckButton.with_label (_("Never ask again"));
-            remember_checkbox.margin_top = 12;
-
             var image = new Gtk.Image.from_icon_name ("find-location", Gtk.IconSize.DIALOG);
 
             var overlay = new Gtk.Overlay ();
@@ -63,7 +58,6 @@
             grid.attach (overlay, 0, 0, 1, 3);
             grid.attach (heading, 1, 0, 1, 1);
             grid.attach (message_label, 1, 1, 1, 1);
-            grid.attach (remember_checkbox, 1, 2, 1, 1);
 
             var deny_button = (Gtk.Button)add_button (_("Deny"), Gtk.ResponseType.NO);
             var allow_button = (Gtk.Button)add_button (_("Allow"), Gtk.ResponseType.YES);
@@ -89,9 +83,5 @@
 
             window.focus (Gdk.CURRENT_TIME);
         }
-
-        public bool remember_checked () {
-            return remember_checkbox.get_active ();
-        }
     }
 }