Commit 620b36b5 authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge branch 'location-manager-fixes' into agx

parents 64459b51 3458d307
......@@ -498,7 +498,7 @@ setup_idle_cb (PhoshShell *self)
self,
G_CONNECT_SWAPPED);
priv->location_manager = phosh_location_manager_new ();
phosh_shell_get_location_manager (self);
if (priv->sensor_proxy_manager) {
priv->proximity = phosh_proximity_new (priv->sensor_proxy_manager,
priv->lockscreen_manager);
......@@ -1062,7 +1062,7 @@ phosh_shell_get_location_manager (PhoshShell *self)
g_return_val_if_fail (PHOSH_IS_SHELL (self), NULL);
priv = phosh_shell_get_instance_private (self);
if (!priv->torch_manager)
if (!priv->location_manager)
priv->location_manager = phosh_location_manager_new ();
g_return_val_if_fail (PHOSH_IS_LOCATION_MANAGER (priv->location_manager), NULL);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment