Changes in protocols/oscar/oscar.c [68198e9:5469952]

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;
 }
 
@@ -1954 +1952 @@
 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"))) {
@@ -1963 +1959 @@
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
                 return;
-        } else if (message == NULL) {
-                message = state;
-        }
+        } /* else... */
 
         if (od->rights.maxawaymsglen == 0)
@@ -2008 +2002 @@
         }
 
-        if (state == NULL) {
+        if (!g_strcasecmp(state, "Online")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
         } else if (!g_strcasecmp(state, "Away")) {
@@ -2033 +2027 @@
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
                 ic->away = g_strdup(msg);
-        } else {
+        } else if (!g_strcasecmp(state, GAIM_AWAY_CUSTOM)) {
                 if (no_message) {
                         aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
@@ -2282 +2276 @@
 {
         struct oscar_data *od = ic->proto_data;
-
-        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;
-        }
+        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;
 }