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

[David Hewitt]

Fix mix of tabs and spaces

Convert tabs to spaces. No changes to code were made.

[Danielle Foré (danrabbit)]

Looks good. I can confirm it builds and seems to be the same :)

review: Approve

=== modified file 'src/Agent.vala'
--- src/Agent.vala	2017-02-25 16:16:16 +0000
+++ src/Agent.vala	2017-02-25 17:42:29 +0000
@@ -21,189 +21,189 @@
 
 namespace Ag {
     public class Agent : Gtk.Application, GeoClue2Agent {
-		private uint _max_accuracy_level = GeoClue2.AccuracyLevel.EXACT;
+        private uint _max_accuracy_level = GeoClue2.AccuracyLevel.EXACT;
         public uint max_accuracy_level { get { return _max_accuracy_level; } }
 
         private MainLoop loop;
-		private uint object_id;
-		private bool bus_registered = false;		
+        private uint object_id;
+        private bool bus_registered = false;        
 
-		private GeoClue2Client? client = null;
-		private Settings settings;
-		private VariantDict remembered_apps;
+        private GeoClue2Client? client = null;
+        private Settings settings;
+        private VariantDict remembered_apps;
 
         construct {
             application_id = "org.pantheon.agent-geoclue2";
             settings = new Settings (application_id);
 
-			settings.changed.connect ((key) => {
-				refresh_enabled_state ();
-				refresh_remembered_apps ();
-			});
+            settings.changed.connect ((key) => {
+                refresh_enabled_state ();
+                refresh_remembered_apps ();
+            });
 
             loop = new MainLoop ();      
-			
+            
             refresh_enabled_state ();    
-			refresh_remembered_apps ();
+            refresh_remembered_apps ();
         }
 
         public override void activate () {
             loop.run ();
         }
                
-	    private void on_name (DBusConnection conn) {
-		    try {
-			    if (bus_registered) {
-				    conn.unregister_object (object_id);
-				    bus_registered = false;
-			    }
-				
-				debug ("Adding agent...");
-			    object_id = conn.register_object ("/org/freedesktop/GeoClue2/Agent", (GeoClue2Agent)this);
-			    bus_registered = true;
-			    register_with_geoclue.begin ();
-		    } catch (Error e) {
-			    error ("Error while registering the agent: %s \n", e.message);
-		    }	    	
-	    }
-
-	    private void watch (DBusConnection connection) {
-		    Bus.watch_name (BusType.SYSTEM, "org.freedesktop.GeoClue2", BusNameWatcherFlags.AUTO_START, on_name);
-	    }
-
-	    public override bool dbus_register (DBusConnection connection, string object_path) throws Error {
-		    base.dbus_register (connection, object_path);
-		    watch (connection);
-
-		    return true;
-	    }
-
-	    public override void dbus_unregister (DBusConnection connection, string object_path) {
-		    if (bus_registered) {
-			    connection.unregister_object (object_id);
-			}
-
-		    base.dbus_unregister (connection, object_path);
-	    }
+        private void on_name (DBusConnection conn) {
+            try {
+                if (bus_registered) {
+                    conn.unregister_object (object_id);
+                    bus_registered = false;
+                }
+                
+                debug ("Adding agent...");
+                object_id = conn.register_object ("/org/freedesktop/GeoClue2/Agent", (GeoClue2Agent)this);
+                bus_registered = true;
+                register_with_geoclue.begin ();
+            } catch (Error e) {
+                error ("Error while registering the agent: %s \n", e.message);
+            }           
+        }
+
+        private void watch (DBusConnection connection) {
+            Bus.watch_name (BusType.SYSTEM, "org.freedesktop.GeoClue2", BusNameWatcherFlags.AUTO_START, on_name);
+        }
+
+        public override bool dbus_register (DBusConnection connection, string object_path) throws Error {
+            base.dbus_register (connection, object_path);
+            watch (connection);
+
+            return true;
+        }
+
+        public override void dbus_unregister (DBusConnection connection, string object_path) {
+            if (bus_registered) {
+                connection.unregister_object (object_id);
+            }
+
+            base.dbus_unregister (connection, object_path);
+        }
         
         public async void authorize_app (string id, uint req_accuracy, out bool authorized, out uint allowed_accuracy) {
-			debug ("Request for '%s' at level '%u'", id, req_accuracy);
-
-			DesktopAppInfo app_info = new DesktopAppInfo (id + ".desktop");
-			if (app_info == null) {
-				debug ("Rejecting for invalid desktop file");
-				authorized = false;
-				allowed_accuracy = req_accuracy;
-				return;
-			}
-
-			Variant? remembered_accuracy = get_remembered_accuracy (id);
-			if (remembered_accuracy != null) {
-				var stored_auth = remembered_accuracy.get_child_value (0).get_boolean ();
-				var stored_accuracy = remembered_accuracy.get_child_value (1).get_uint32 ();				
-				if (req_accuracy <= stored_accuracy && stored_auth) {
-					authorized = true;
-					allowed_accuracy = req_accuracy;
-					return;
-				}
-			}
-
-			string app_name = app_info.get_display_name ();
-			string accuracy_string = accuracy_to_string (app_name, req_accuracy);
-
-			client = yield get_geoclue_client ();
-			debug ("Starting client...");
-			if (client != null) {
-				try {
-					client.start ();
-			    } catch (Error e) {
-			    	error ("Could not start client: %s", e.message);
-			    }
-			}
-
-			var dialog = new Widgets.Geoclue2Dialog (accuracy_string, app_name, app_info.get_icon ().to_string ());
-			dialog.show_all ();
-
-			var result = dialog.run ();
-
-			if (result == Gtk.ResponseType.YES) {
-				authorized = true;
+            debug ("Request for '%s' at level '%u'", id, req_accuracy);
+
+            DesktopAppInfo app_info = new DesktopAppInfo (id + ".desktop");
+            if (app_info == null) {
+                debug ("Rejecting for invalid desktop file");
+                authorized = false;
+                allowed_accuracy = req_accuracy;
+                return;
+            }
+
+            Variant? remembered_accuracy = get_remembered_accuracy (id);
+            if (remembered_accuracy != null) {
+                var stored_auth = remembered_accuracy.get_child_value (0).get_boolean ();
+                var stored_accuracy = remembered_accuracy.get_child_value (1).get_uint32 ();                
+                if (req_accuracy <= stored_accuracy && stored_auth) {
+                    authorized = true;
+                    allowed_accuracy = req_accuracy;
+                    return;
+                }
+            }
+
+            string app_name = app_info.get_display_name ();
+            string accuracy_string = accuracy_to_string (app_name, req_accuracy);
+
+            client = yield get_geoclue_client ();
+            debug ("Starting client...");
+            if (client != null) {
+                try {
+                    client.start ();
+                } catch (Error e) {
+                    error ("Could not start client: %s", e.message);
+                }
+            }
+
+            var dialog = new Widgets.Geoclue2Dialog (accuracy_string, app_name, app_info.get_icon ().to_string ());
+            dialog.show_all ();
+
+            var result = dialog.run ();
+
+            if (result == Gtk.ResponseType.YES) {
+                authorized = true;
             } else {
-				authorized = false;
-			}
-			
-			dialog.destroy ();
+                authorized = false;
+            }
+            
+            dialog.destroy ();
             allowed_accuracy = req_accuracy;
             remember_app (id, authorized, req_accuracy);
 
             debug ("Stopping client...");
-		    if (client != null) {
-				try {
-					client.stop ();
-			    } catch (Error e) {
-			    	error ("Could not stop client: %s", e.message);
-			    }
-		    }            
+            if (client != null) {
+                try {
+                    client.stop ();
+                } catch (Error e) {
+                    error ("Could not stop client: %s", e.message);
+                }
+            }            
         }
 
-		private string accuracy_to_string (string app_name, uint accuracy) {
-			string message = "";
-			switch (accuracy) {
-				case GeoClue2.AccuracyLevel.COUNTRY:
-					message = _("the current country");
-					break;
-				case GeoClue2.AccuracyLevel.CITY:
-					message = _("the nearest city or town");
-					break;
-				case GeoClue2.AccuracyLevel.NEIGHBORHOOD:
-					message = _("the nearest neighborhood");
-					break;
-				case GeoClue2.AccuracyLevel.STREET:
-					message = _("the nearest street");
-					break;
-				case GeoClue2.AccuracyLevel.EXACT:
-					message = _("your exact location");
-					break;
-				default:
-					message = _("your location");
-					break;
-			}
-			
-			return _("%s will be able to detect %s. Permissions can be changed in <a href='settings://security/privacy/location'>Location Settings…</a>").printf (app_name, message);
-		}
+        private string accuracy_to_string (string app_name, uint accuracy) {
+            string message = "";
+            switch (accuracy) {
+                case GeoClue2.AccuracyLevel.COUNTRY:
+                    message = _("the current country");
+                    break;
+                case GeoClue2.AccuracyLevel.CITY:
+                    message = _("the nearest city or town");
+                    break;
+                case GeoClue2.AccuracyLevel.NEIGHBORHOOD:
+                    message = _("the nearest neighborhood");
+                    break;
+                case GeoClue2.AccuracyLevel.STREET:
+                    message = _("the nearest street");
+                    break;
+                case GeoClue2.AccuracyLevel.EXACT:
+                    message = _("your exact location");
+                    break;
+                default:
+                    message = _("your location");
+                    break;
+            }
+            
+            return _("%s will be able to detect %s. Permissions can be changed in <a href='settings://security/privacy/location'>Location Settings…</a>").printf (app_name, message);
+        }
 
         private async void register_with_geoclue () {
             yield Utils.register_with_geoclue (application_id);
         }
 
-		private async GeoClue2Client? get_geoclue_client () {
-			return yield Utils.get_geoclue2_client (application_id);
-		}
-
-		private void refresh_remembered_apps () {
-			remembered_apps = new VariantDict(settings.get_value("remembered-apps"));
-		}
-
-		private void refresh_enabled_state () {
-			bool enabled = settings.get_value ("location-enabled").get_boolean ();
-			if (enabled) {
-				_max_accuracy_level = GeoClue2.AccuracyLevel.EXACT;
-			} else {
-				_max_accuracy_level = GeoClue2.AccuracyLevel.NONE;
-			}
-		}
-
-		public void remember_app (string desktop_id, bool authorized, uint32 accuracy_level) {
-			Variant[2] tuple_vals = new Variant[2];
-			tuple_vals[0] = new Variant.boolean (authorized);
-			tuple_vals[1] = new Variant.uint32 (accuracy_level);
-			remembered_apps.insert_value (desktop_id, new Variant.tuple (tuple_vals));
-			settings.set_value ("remembered-apps", remembered_apps.end ());
-		}
-
-		public Variant? get_remembered_accuracy (string desktop_id) {
-			return remembered_apps.lookup_value (desktop_id, GLib.VariantType.TUPLE);
-		}
+        private async GeoClue2Client? get_geoclue_client () {
+            return yield Utils.get_geoclue2_client (application_id);
+        }
+
+        private void refresh_remembered_apps () {
+            remembered_apps = new VariantDict(settings.get_value("remembered-apps"));
+        }
+
+        private void refresh_enabled_state () {
+            bool enabled = settings.get_value ("location-enabled").get_boolean ();
+            if (enabled) {
+                _max_accuracy_level = GeoClue2.AccuracyLevel.EXACT;
+            } else {
+                _max_accuracy_level = GeoClue2.AccuracyLevel.NONE;
+            }
+        }
+
+        public void remember_app (string desktop_id, bool authorized, uint32 accuracy_level) {
+            Variant[2] tuple_vals = new Variant[2];
+            tuple_vals[0] = new Variant.boolean (authorized);
+            tuple_vals[1] = new Variant.uint32 (accuracy_level);
+            remembered_apps.insert_value (desktop_id, new Variant.tuple (tuple_vals));
+            settings.set_value ("remembered-apps", remembered_apps.end ());
+        }
+
+        public Variant? get_remembered_accuracy (string desktop_id) {
+            return remembered_apps.lookup_value (desktop_id, GLib.VariantType.TUPLE);
+        }
     }
 
     public static int main (string[] args) {

=== modified file 'src/Interfaces.vala'
--- src/Interfaces.vala	2017-02-25 15:01:53 +0000
+++ src/Interfaces.vala	2017-02-25 17:42:29 +0000
@@ -27,12 +27,12 @@
     }
 
     [DBus (name = "org.freedesktop.GeoClue2.Agent")]
-	public interface GeoClue2Agent : GLib.Object {
+    public interface GeoClue2Agent : GLib.Object {
         [DBus (name = "AuthorizeApp")]
-		public abstract async void authorize_app(string desktop_id, uint req_accuracy_level, out bool authorized, out uint allowed_accuracy_level) throws DBusError, IOError;
+        public abstract async void authorize_app (string desktop_id, uint req_accuracy_level, out bool authorized, out uint allowed_accuracy_level) throws DBusError, IOError;
         [DBus (name ="MaxAccuracyLevel")]
-		public abstract uint max_accuracy_level {  get; }
-	}
+        public abstract uint max_accuracy_level {  get; }
+    }
 
     [DBus (name = "org.freedesktop.GeoClue2.Client")]
     public interface GeoClue2Client : GLib.Object {

=== modified file 'vapi/geoclue2.vapi'
--- vapi/geoclue2.vapi	2017-02-20 18:30:50 +0000
+++ vapi/geoclue2.vapi	2017-02-25 17:42:29 +0000
@@ -20,13 +20,13 @@
  */
 
 namespace GeoClue2 {
-	[CCode (cname = "GClueAccuracyLevel", cprefix = "GCLUE_ACCURACY_LEVEL_", cheader_filename = "gclue-enums.h" )]
-	public enum AccuracyLevel {
-		NONE,
-		COUNTRY,
-		CITY,
-		NEIGHBORHOOD,
-		STREET,
-		EXACT
-	}
+    [CCode (cname = "GClueAccuracyLevel", cprefix = "GCLUE_ACCURACY_LEVEL_", cheader_filename = "gclue-enums.h" )]
+    public enum AccuracyLevel {
+        NONE,
+        COUNTRY,
+        CITY,
+        NEIGHBORHOOD,
+        STREET,
+        EXACT
+    }
 }