diff options
| author | Alban Crequy <alban.crequy@collabora.co.uk> | 2008-12-05 15:25:06 +0000 |
|---|---|---|
| committer | Alban Crequy <alban.crequy@collabora.co.uk> | 2008-12-05 15:25:06 +0000 |
| commit | b90bd2c2bb5a399783ff0193f543facb2dde8f02 (patch) | |
| tree | 6da9ff062799c34c705cc788552909b74c28218c /src/roomlist-manager.c | |
| parent | 11fdd8164e906f3dbe28588d8be418785b36bd99 (diff) | |
| parent | 89252dda5c729060db03b3af957c492d51a92a86 (diff) | |
| download | telepathy-gabble-b90bd2c2bb5a399783ff0193f543facb2dde8f02.tar.gz | |
Merge branch 'master' into alban-enhanced-caps-with-complex-types
Conflicts:
src/connection.h
Diffstat (limited to 'src/roomlist-manager.c')
| -rw-r--r-- | src/roomlist-manager.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/roomlist-manager.c b/src/roomlist-manager.c index 8708995cb..e0c943706 100644 --- a/src/roomlist-manager.c +++ b/src/roomlist-manager.c @@ -94,6 +94,9 @@ gabble_roomlist_manager_close_all (GabbleRoomlistManager *self) self->priv->status_changed_id = 0; } + /* Use a temporary variable because we don't want + * roomlist_channel_closed_cb to remove the channel from the ptr array a + * second time */ if (self->priv->channels != NULL) { GPtrArray *tmp = self->priv->channels; |