Changeset fb020ac for protocols/jabber/jabber_util.c

Timestamp:

2010-03-07T18:43:23Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

279607e

Parents:

e08e53c (diff), c32f492 (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.

Message:

Merging in mainline, including improved away/status stuff.

File:

• protocols/jabber/jabber_util.c (modified) (3 diffs)

protocols/jabber/jabber_util.c

@@ -228 +228 @@
 {
         { "away",  "Away" },
-        { "chat",  "Free for Chat" },
+        { "chat",  "Free for Chat" },   /* WTF actually uses this? */
         { "dnd",   "Do not Disturb" },
         { "xa",    "Extended Away" },
-        { "",      "Online" },
         { "",      NULL }
 };
@@ -238 +237 @@
 {
         int i;
+        
+        if( code == NULL )
+                return NULL;
         
         for( i = 0; jabber_away_state_list[i].full_name; i ++ )
@@ -249 +251 @@
 {
         int i;
+        
+        if( name == NULL )
+                return NULL;
         
         for( i = 0; jabber_away_state_list[i].full_name; i ++ )