Changeset 81ee561 for protocols/nogaim.c

Timestamp:

2010-03-20T18:03:18Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

85693e6

Parents:

3330468 (diff), 0baed0d (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 head. Most changes are not so relevant because they're to IM
modules.

File:

• protocols/nogaim.c (modified) (2 diffs)

protocols/nogaim.c

@@ -655 +655 @@
         oo = u->online;
         
-        if( u->away )
-        {
-                g_free( u->away );
-                u->away = NULL;
-        }
+        g_free( u->away );
+        g_free( u->status_msg );
+        u->away = u->status_msg = NULL;
         
         if( ( flags & OPT_LOGGED_IN ) && !u->online )
@@ -697 +695 @@
                 }
         }
-        /* else waste_any_state_information_for_now(); */
+        else
+        {
+                u->status_msg = g_strdup( message );
+        }
         
         /* LISPy... */