Changeset 291c49b

Timestamp:

2015-04-13T22:21:06Z (9 years ago)

Author:

dequis <dx@…>

Children:

356e2dd

Parents:

1aacef41

Message:

Set hipchat server with set_setstr so set_eval_account gets called

File:

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

protocols/jabber/jabber.c

@@ -56 +56 @@
 static void jabber_init(account_t *acc)
 {
-        char *default_server = NULL;
         set_t *s;
         char str[16];
-
-        if (strcmp(acc->prpl->name, "hipchat") == 0) {
-                default_server = "chat.hipchat.com";
-        } else {
-                s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
-        }
 
         s = set_add(&acc->set, "activity_timeout", "600", set_eval_int, acc);
@@ -86 +79 @@
         s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
 
-        s = set_add(&acc->set, "server", default_server, set_eval_account, acc);
+        s = set_add(&acc->set, "server", NULL, set_eval_account, acc);
         s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
+
+        if (strcmp(acc->prpl->name, "hipchat") == 0) {
+                set_setstr(&acc->set, "server", "chat.hipchat.com");
+        } else {
+                s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+        }
 
         s = set_add(&acc->set, "ssl", "false", set_eval_bool, acc);