diff options
| author | Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk> | 2009-06-02 01:39:38 +0800 |
|---|---|---|
| committer | Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk> | 2009-06-02 01:39:38 +0800 |
| commit | fce49b89f9e5e0f864b7f2d7fbda69397a575ed4 (patch) | |
| tree | 4713131594c81c9e9e9be3ab6f9f55ab8cce764c /libempathy-gtk/empathy-location-manager.c | |
| parent | 76d2f71aecdc4abd5ca423626792c66dc4eeb2b0 (diff) | |
| download | gsoc2013-empathy-fce49b89f9e5e0f864b7f2d7fbda69397a575ed4.tar gsoc2013-empathy-fce49b89f9e5e0f864b7f2d7fbda69397a575ed4.tar.gz gsoc2013-empathy-fce49b89f9e5e0f864b7f2d7fbda69397a575ed4.tar.bz2 gsoc2013-empathy-fce49b89f9e5e0f864b7f2d7fbda69397a575ed4.tar.lz gsoc2013-empathy-fce49b89f9e5e0f864b7f2d7fbda69397a575ed4.tar.xz gsoc2013-empathy-fce49b89f9e5e0f864b7f2d7fbda69397a575ed4.tar.zst gsoc2013-empathy-fce49b89f9e5e0f864b7f2d7fbda69397a575ed4.zip | |
Fix Bug 584518: Critical error in publish_to_all_connections
The account_manager was initialised after the callbacks were.
Diffstat (limited to 'libempathy-gtk/empathy-location-manager.c')
| -rw-r--r-- | libempathy-gtk/empathy-location-manager.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index 436e0a216..1bb1b732f 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -628,6 +628,12 @@ empathy_location_manager_init (EmpathyLocationManager *location_manager) priv->location = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_free, (GDestroyNotify) tp_g_value_slice_free); + /* Setup account status callbacks */ + priv->account_manager = empathy_account_manager_dup_singleton (); + g_signal_connect (priv->account_manager, + "new-connection", + G_CALLBACK (new_connection_cb), location_manager); + /* Setup settings status callbacks */ conf = empathy_conf_get (); empathy_conf_notify_add (conf, EMPATHY_PREFS_LOCATION_PUBLISH, publish_cb, @@ -646,12 +652,6 @@ empathy_location_manager_init (EmpathyLocationManager *location_manager) resource_cb (conf, EMPATHY_PREFS_LOCATION_RESOURCE_GPS, location_manager); accuracy_cb (conf, EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY, location_manager); publish_cb (conf, EMPATHY_PREFS_LOCATION_PUBLISH, location_manager); - - /* Setup account status callbacks */ - priv->account_manager = empathy_account_manager_dup_singleton (); - g_signal_connect (priv->account_manager, - "new-connection", - G_CALLBACK (new_connection_cb), location_manager); } EmpathyLocationManager * |