Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/buddy.c @ 25804:9100b9176a16
propagate from branch 'im.pidgin.pidgin' (head a03e0bee477b05d1143ef3e5607d990c1120da34)
to branch 'im.pidgin.cpw.malu.xmpp.idle' (head e0c18c146f94850aa81c1e4094e7fe549d028148)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:01:08 +0000 |
parents | 61e0924de04a e3bb0bbfa388 |
children | 6185767dc03c |
comparison
equal
deleted
inserted
replaced
24761:c2054d8d23fc | 25804:9100b9176a16 |
---|---|
96 if(!jb) | 96 if(!jb) |
97 return NULL; | 97 return NULL; |
98 | 98 |
99 for(l = jb->resources; l; l = l->next) | 99 for(l = jb->resources; l; l = l->next) |
100 { | 100 { |
101 if(!jbr && !resource) { | 101 JabberBuddyResource *tmp = (JabberBuddyResource *) l->data; |
102 jbr = l->data; | 102 if (!jbr && !resource) { |
103 } else if(!resource) { | 103 jbr = tmp; |
104 if(((JabberBuddyResource *)l->data)->priority > jbr->priority) | 104 } else if (!resource) { |
105 jbr = l->data; | 105 if (tmp->priority > jbr->priority) |
106 else if(((JabberBuddyResource *)l->data)->priority == jbr->priority) { | 106 jbr = tmp; |
107 else if (tmp->priority == jbr->priority) { | |
107 /* Determine if this resource is more available than the one we've currently chosen */ | 108 /* Determine if this resource is more available than the one we've currently chosen */ |
108 switch(((JabberBuddyResource *)l->data)->state) { | 109 switch(tmp->state) { |
109 case JABBER_BUDDY_STATE_ONLINE: | 110 case JABBER_BUDDY_STATE_ONLINE: |
110 case JABBER_BUDDY_STATE_CHAT: | 111 case JABBER_BUDDY_STATE_CHAT: |
111 /* This resource is online/chatty. Prefer to one which isn't either. */ | 112 /* This resource is online/chatty. Prefer to one which isn't either. */ |
112 if ((jbr->state != JABBER_BUDDY_STATE_ONLINE) && (jbr->state != JABBER_BUDDY_STATE_CHAT)) | 113 if (((jbr->state != JABBER_BUDDY_STATE_ONLINE) && (jbr->state != JABBER_BUDDY_STATE_CHAT)) |
113 jbr = l->data; | 114 || (jbr->idle && !tmp->idle) |
115 || (jbr->idle && tmp->idle && tmp->idle > jbr->idle)) | |
116 jbr = tmp; | |
114 break; | 117 break; |
115 case JABBER_BUDDY_STATE_AWAY: | 118 case JABBER_BUDDY_STATE_AWAY: |
116 case JABBER_BUDDY_STATE_DND: | 119 case JABBER_BUDDY_STATE_DND: |
117 /* This resource is away/dnd. Prefer to one which is extended away, unavailable, or unknown. */ | 120 /* This resource is away/dnd. Prefer to one which is extended away, unavailable, or unknown. */ |
118 if ((jbr->state == JABBER_BUDDY_STATE_XA) || (jbr->state == JABBER_BUDDY_STATE_UNAVAILABLE) || | 121 if (((jbr->state == JABBER_BUDDY_STATE_XA) || (jbr->state == JABBER_BUDDY_STATE_UNAVAILABLE) || |
119 (jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR)) | 122 (jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR)) |
120 jbr = l->data; | 123 || (jbr->idle && !tmp->idle) |
124 || (jbr->idle && tmp->idle && tmp->idle > jbr->idle)) | |
125 jbr = tmp; | |
121 break; | 126 break; |
122 case JABBER_BUDDY_STATE_XA: | 127 case JABBER_BUDDY_STATE_XA: |
123 /* This resource is extended away. That's better than unavailable or unknown. */ | 128 /* This resource is extended away. That's better than unavailable or unknown. */ |
124 if ((jbr->state == JABBER_BUDDY_STATE_UNAVAILABLE) || (jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR)) | 129 if ((jbr->state == JABBER_BUDDY_STATE_UNAVAILABLE) || (jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR)) |
125 jbr = l->data; | 130 jbr = tmp; |
126 break; | 131 break; |
127 case JABBER_BUDDY_STATE_UNAVAILABLE: | 132 case JABBER_BUDDY_STATE_UNAVAILABLE: |
128 /* This resource is unavailable. That's better than unknown. */ | 133 /* This resource is unavailable. That's better than unknown. */ |
129 if ((jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR)) | 134 if ((jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR)) |
130 jbr = l->data; | 135 jbr = tmp; |
131 break; | 136 break; |
132 case JABBER_BUDDY_STATE_UNKNOWN: | 137 case JABBER_BUDDY_STATE_UNKNOWN: |
133 case JABBER_BUDDY_STATE_ERROR: | 138 case JABBER_BUDDY_STATE_ERROR: |
134 /* These are never preferable. */ | 139 /* These are never preferable. */ |
135 break; | 140 break; |
136 } | 141 } |
137 } | 142 } |
138 } else if(((JabberBuddyResource *)l->data)->name) { | 143 } else if(tmp->name) { |
139 if(!strcmp(((JabberBuddyResource *)l->data)->name, resource)) { | 144 if(!strcmp(tmp->name, resource)) { |
140 jbr = l->data; | 145 jbr = tmp; |
141 break; | 146 break; |
142 } | 147 } |
143 } | 148 } |
144 } | 149 } |
145 | 150 |