Changes in protocols/oscar/oscar.c [545d7c0:5469952]

File:

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

protocols/oscar/oscar.c

@@ -373 +373 @@
         set_t *s;
         
+        s = set_add( &acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc );
+        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        
         if (isdigit(acc->user[0])) {
-                set_add(&acc->set, "ignore_auth_requests", "false", set_eval_bool, acc);
-        }
-        
-        s = set_add(&acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
-        
-        if(isdigit(acc->user[0])) {
-                s = set_add(&acc->set, "web_aware", "false", set_eval_bool, acc);
+                s = set_add( &acc->set, "web_aware", "false", set_eval_bool, acc );
                 s->flags |= ACC_SET_OFFLINE_ONLY;
         }
-        
-        acc->flags |= ACC_FLAG_AWAY_MESSAGE;
 }
 
@@ -1216 +1210 @@
  */
 static void gaim_icq_authask(struct im_connection *ic, guint32 uin, char *msg) {
-        struct icq_auth *data;
+        struct icq_auth *data = g_new(struct icq_auth, 1);
         char *reason = NULL;
         char *dialog_msg;
-
-        if (set_getbool(&ic->acc->set, "ignore_auth_requests"))
-                return;
-        
-        data = g_new(struct icq_auth, 1);
-
+        
         if (strlen(msg) > 6)
                 reason = msg + 6;
@@ -1963 +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"))) {
@@ -1972 +1959 @@
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
                 return;
-        } else if (message == NULL) {
-                message = state;
-        }
+        } /* else... */
 
         if (od->rights.maxawaymsglen == 0)
@@ -2017 +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")) {
@@ -2042 +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);
@@ -2291 +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;
 }