Changes in protocols/jabber/jabber.c [9dc67f4:5ebff60]

File:

• protocols/jabber/jabber.c (modified) (5 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);
+
+        s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
 
         s = set_add(&acc->set, "display_name", NULL, NULL, acc);
@@ -86 +81 @@
         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;
 
@@ -126 +121 @@
 
         jd->fd = jd->r_inpa = jd->w_inpa = -1;
-
-        if (strcmp(acc->prpl->name, "hipchat") == 0) {
-                jd->flags |= JFLAG_HIPCHAT;
-        }
 
         if (jd->server == NULL) {
@@ -665 +656 @@
 {
         struct prpl *ret = g_new0(struct prpl, 1);
-        struct prpl *hipchat = NULL;
 
         ret->name = "jabber";
@@ -696 +686 @@
 
         register_protocol(ret);
-
-        /* Another one for hipchat, which has completely different logins */
-        hipchat = g_memdup(ret, sizeof(struct prpl));
-        hipchat->name = "hipchat";
-        register_protocol(hipchat);
-}
+}