aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-location-manager.c
diff options
context:
space:
mode:
authorPierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>2009-06-01 00:12:34 +0800
committerPierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>2009-06-01 23:35:34 +0800
commit9869f68136e335d7439d434aa93a9ca229125a45 (patch)
tree84984ca91da0310b7b5aacf384de0427ea3ddc0a /libempathy-gtk/empathy-location-manager.c
parent131728206cdc9005585ebe3cb6d0c4430a42de73 (diff)
downloadgsoc2013-empathy-9869f68136e335d7439d434aa93a9ca229125a45.tar
gsoc2013-empathy-9869f68136e335d7439d434aa93a9ca229125a45.tar.gz
gsoc2013-empathy-9869f68136e335d7439d434aa93a9ca229125a45.tar.bz2
gsoc2013-empathy-9869f68136e335d7439d434aa93a9ca229125a45.tar.lz
gsoc2013-empathy-9869f68136e335d7439d434aa93a9ca229125a45.tar.xz
gsoc2013-empathy-9869f68136e335d7439d434aa93a9ca229125a45.tar.zst
gsoc2013-empathy-9869f68136e335d7439d434aa93a9ca229125a45.zip
Don't set priv on a separate line
Diffstat (limited to 'libempathy-gtk/empathy-location-manager.c')
-rw-r--r--libempathy-gtk/empathy-location-manager.c37
1 files changed, 11 insertions, 26 deletions
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 82a330635..27372a732 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -100,8 +100,7 @@ location_manager_constructor (GType type,
static void
location_manager_dispose (GObject *object)
{
- EmpathyLocationManagerPriv *priv;
- priv = GET_PRIV (object);
+ EmpathyLocationManagerPriv *priv = GET_PRIV (object);
if (priv->account_manager != NULL)
{
@@ -142,9 +141,7 @@ location_manager_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- EmpathyLocationManagerPriv *priv;
-
- priv = GET_PRIV (object);
+ EmpathyLocationManagerPriv *priv = GET_PRIV (object);
switch (param_id)
{
@@ -160,9 +157,7 @@ location_manager_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- EmpathyLocationManagerPriv *priv;
-
- priv = GET_PRIV (object);
+ EmpathyLocationManagerPriv *priv = GET_PRIV (object);
switch (param_id)
{
@@ -192,15 +187,13 @@ publish_location (EmpathyLocationManager *location_manager,
McAccount *account,
gboolean force_publication)
{
- EmpathyLocationManagerPriv *priv;
+ EmpathyLocationManagerPriv *priv = GET_PRIV (location_manager);
guint connection_status = -1;
gboolean can_publish;
EmpathyConf *conf = empathy_conf_get ();
TpConnection *conn;
EmpathyTpContactFactory *factory;
- priv = GET_PRIV (location_manager);
-
conn = mission_control_get_tpconnection (priv->mc, account, NULL);
if (!conn)
return;
@@ -296,14 +289,13 @@ address_changed_cb (GeoclueAddress *address,
gpointer location_manager)
{
GeoclueAccuracyLevel level;
- geoclue_accuracy_get_details (accuracy, &level, NULL, NULL);
- EmpathyLocationManagerPriv *priv;
+ EmpathyLocationManagerPriv *priv = GET_PRIV (location_manager);
GHashTableIter iter;
gpointer key, value;
DEBUG ("New address (accuracy level %d):", level);
- priv = GET_PRIV (location_manager);
+ geoclue_accuracy_get_details (accuracy, &level, NULL, NULL);
g_hash_table_remove_all (priv->location);
if (g_hash_table_size (details) == 0)
@@ -433,9 +425,7 @@ initial_position_cb (GeocluePosition *position,
static void
update_resources (EmpathyLocationManager *location_manager)
{
- EmpathyLocationManagerPriv *priv;
-
- priv = GET_PRIV (location_manager);
+ EmpathyLocationManagerPriv *priv = GET_PRIV (location_manager);
DEBUG ("Updating resources %d", priv->resources);
@@ -459,9 +449,7 @@ update_resources (EmpathyLocationManager *location_manager)
static void
setup_geoclue (EmpathyLocationManager *location_manager)
{
- EmpathyLocationManagerPriv *priv;
-
- priv = GET_PRIV (location_manager);
+ EmpathyLocationManagerPriv *priv = GET_PRIV (location_manager);
GeoclueMaster *master;
GError *error = NULL;
@@ -508,11 +496,10 @@ publish_cb (EmpathyConf *conf,
gpointer user_data)
{
EmpathyLocationManager *manager = EMPATHY_LOCATION_MANAGER (user_data);
- EmpathyLocationManagerPriv *priv;
+ EmpathyLocationManagerPriv *priv = GET_PRIV (manager);
gboolean can_publish;
DEBUG ("Publish Conf changed");
- priv = GET_PRIV (manager);
if (empathy_conf_get_bool (conf, key, &can_publish) == FALSE)
@@ -548,11 +535,10 @@ resource_cb (EmpathyConf *conf,
gpointer user_data)
{
EmpathyLocationManager *manager = EMPATHY_LOCATION_MANAGER (user_data);
- EmpathyLocationManagerPriv *priv;
+ EmpathyLocationManagerPriv *priv = GET_PRIV (manager);
GeoclueResourceFlags resource = 0;
gboolean resource_enabled;
- priv = GET_PRIV (manager);
DEBUG ("%s changed", key);
if (!empathy_conf_get_bool (conf, key, &resource_enabled))
@@ -580,11 +566,10 @@ accuracy_cb (EmpathyConf *conf,
gpointer user_data)
{
EmpathyLocationManager *manager = EMPATHY_LOCATION_MANAGER (user_data);
- EmpathyLocationManagerPriv *priv;
+ EmpathyLocationManagerPriv *priv = GET_PRIV (manager);
gboolean enabled;
- priv = GET_PRIV (manager);
DEBUG ("%s changed", key);
if (!empathy_conf_get_bool (conf, key, &enabled))