diff options
| author | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-10-11 21:21:41 +0000 |
|---|---|---|
| committer | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-10-11 21:21:41 +0000 |
| commit | 35ace593f081a69fe151c4cfd6ab19bc321a56ce (patch) | |
| tree | a1c12a3a4f3dc6deff717b4f94aa491214e35e55 | |
| parent | 85f491fe7fd5870909b283bbd3fb576605efd759 (diff) | |
| download | telepathy-gabble-35ace593f081a69fe151c4cfd6ab19bc321a56ce.tar.gz | |
GabbleConnection: resolve conflicts merging roomlist and IVC branches
20061011212141-418b8-c95b5a4eb371c12cc14ce14ae0acaf6e5bb48ca5.gz
| -rw-r--r-- | src/gabble-connection.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gabble-connection.c b/src/gabble-connection.c index 8b73f7dfd..085881dda 100644 --- a/src/gabble-connection.c +++ b/src/gabble-connection.c @@ -969,7 +969,10 @@ gabble_connection_finalize (GObject *object) g_free (priv->https_proxy_server); g_free (priv->fallback_conference_server); - g_list_free (priv->conference_servers); + g_free (priv->alias); + + g_free (priv->auth_mac); + g_free (priv->auth_btid); gabble_properties_mixin_finalize (object); |