Changeset 17f9522 for protocols/oscar

Timestamp:

2010-03-06T16:17:23Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4049061

Parents:

b051d39

Message:

OSCAR cleanup.

File:

• protocols/oscar/oscar.c (modified) (4 diffs)

protocols/oscar/oscar.c

@@ -380 +380 @@
                 s->flags |= ACC_SET_OFFLINE_ONLY;
         }
+        
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE;
 }
 
@@ -1959 +1961 @@
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
                 return;
-        } /* else... */
+        } else if (message == NULL) {
+                message = state;
+        }
 
         if (od->rights.maxawaymsglen == 0)
@@ -2027 +2031 @@
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
                 ic->away = g_strdup(msg);
-        } else if (!g_strcasecmp(state, GAIM_AWAY_CUSTOM)) {
+        } else {
                 if (no_message) {
                         aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
@@ -2276 +2280 @@
 {
         struct oscar_data *od = ic->proto_data;
-        GList *m = NULL;
-
-        if (!od->icq)
-                return g_list_append(m, GAIM_AWAY_CUSTOM);
-
-        m = g_list_append(m, "Online");
-        m = g_list_append(m, "Away");
-        m = g_list_append(m, "Do Not Disturb");
-        m = g_list_append(m, "Not Available");
-        m = g_list_append(m, "Occupied");
-        m = g_list_append(m, "Free For Chat");
-        m = g_list_append(m, "Invisible");
-
-        return m;
+
+        if (od->icq) {
+                static GList *m = NULL;
+                m = g_list_append(m, "Away");
+                m = g_list_append(m, "Do Not Disturb");
+                m = g_list_append(m, "Not Available");
+                m = g_list_append(m, "Occupied");
+                m = g_list_append(m, "Free For Chat");
+                m = g_list_append(m, "Invisible");
+                return m;
+        } else {
+                static GList *m = NULL;
+                m = g_list_append(m, "Away");
+                return m;
+        }
 }