Changeset fb020ac for protocols/oscar

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/oscar/oscar.c (modified) (6 diffs)

protocols/oscar/oscar.c

@@ -380 +380 @@
                 s->flags |= ACC_SET_OFFLINE_ONLY;
         }
+        
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE;
 }
 
@@ -1952 +1954 @@
 static void oscar_set_away_aim(struct im_connection *ic, struct oscar_data *od, const char *state, const char *message)
 {
+        if (state == NULL)
+                state = "";
 
         if (!g_strcasecmp(state, _("Visible"))) {
@@ -1959 +1963 @@
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
                 return;
-        } /* else... */
+        } else if (message == NULL) {
+                message = state;
+        }
 
         if (od->rights.maxawaymsglen == 0)
@@ -2002 +2008 @@
         }
 
-        if (!g_strcasecmp(state, "Online")) {
+        if (state == NULL) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
         } else if (!g_strcasecmp(state, "Away")) {
@@ -2027 +2033 @@
                 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 +2282 @@
 {
         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;
+        }
 }