Changeset e8c8d00 for protocols/jabber/jabber_util.c
- Timestamp:
- 2010-03-17T15:15:19Z (14 years ago)
- Branches:
- master
- Children:
- 60e4df3
- Parents:
- 1c3008a (diff), f9928cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/jabber_util.c
r1c3008a re8c8d00 232 232 { 233 233 { "away", "Away" }, 234 { "chat", "Free for Chat" }, 234 { "chat", "Free for Chat" }, /* WTF actually uses this? */ 235 235 { "dnd", "Do not Disturb" }, 236 236 { "xa", "Extended Away" }, 237 { "", "Online" },238 237 { "", NULL } 239 238 }; … … 242 241 { 243 242 int i; 243 244 if( code == NULL ) 245 return NULL; 244 246 245 247 for( i = 0; jabber_away_state_list[i].full_name; i ++ ) … … 253 255 { 254 256 int i; 257 258 if( name == NULL ) 259 return NULL; 255 260 256 261 for( i = 0; jabber_away_state_list[i].full_name; i ++ )
Note: See TracChangeset
for help on using the changeset viewer.