diff options
| author | Alberto Mardegan <mardy@users.sourceforge.net> | 2008-02-11 12:42:09 +0000 |
|---|---|---|
| committer | Alberto Mardegan <mardy@users.sourceforge.net> | 2008-02-11 12:42:09 +0000 |
| commit | 3433d02a1265b16905ef23e585f5b03f1e67de40 (patch) | |
| tree | f2d110154dfdbb2b22ddbaa08244db6f6927c975 | |
| parent | 5a45c3b780d097e3f51a766f89b361b9eec314b8 (diff) | |
| download | telepathy-mission-control-3433d02a1265b16905ef23e585f5b03f1e67de40.tar.gz | |
Fix the comparison of pending channels (the condition on the channel
type was inverted).
Fixes: http://bugzilla.gnome.org/show_bug.cgi?id=511063
git-svn-id: https://mission-control.svn.sourceforge.net/svnroot/mission-control/trunk@280 d91c8aed-3f2b-0410-a83d-924a1c20a0ba
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/mcd-connection.c | 10 |
2 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2008-02-11 Alberto Mardegan <alberto.mardegan@nokia.com> + + * src/mcd-connection.c: + Fix the comparison of pending channels (the condition on the channel + type was inverted). + Fixes: http://bugzilla.gnome.org/show_bug.cgi?id=511063 + 2008-02-08 Simon McVittie <simon.mcvittie@collabora.co.uk> * xml/MissionControl.xml: Use tp: namespace prefix in preparation for diff --git a/src/mcd-connection.c b/src/mcd-connection.c index f8dc661f..d2927b3b 100644 --- a/src/mcd-connection.c +++ b/src/mcd-connection.c @@ -2024,9 +2024,13 @@ remove_capabilities_refs (gpointer data) static gint pending_channel_cmp (const McdPendingChannel *a, const McdPendingChannel *b) { - return a->handle == b->handle && - a->handle_type == b->handle_type && - strcmp (a->type, b->type); + gint ret; + + ret = a->handle - b->handle; + if (ret) return ret; + ret = a->handle_type - b->handle_type; + if (ret) return ret; + return strcmp (a->type, b->type); } static void |