Changeset b1dc403 for protocols/jabber/jabber.c
- Timestamp:
- 2015-05-04T21:58:50Z (9 years ago)
- Children:
- 5726a0d
- Parents:
- 531eabd (diff), 5ca1416 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/jabber.c
r531eabd rb1dc403 61 61 s = set_add(&acc->set, "activity_timeout", "600", set_eval_int, acc); 62 62 63 s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);64 65 63 s = set_add(&acc->set, "display_name", NULL, NULL, acc); 66 64 … … 83 81 s = set_add(&acc->set, "server", NULL, set_eval_account, acc); 84 82 s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK; 83 84 if (strcmp(acc->prpl->name, "hipchat") == 0) { 85 set_setstr(&acc->set, "server", "chat.hipchat.com"); 86 } else { 87 s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc); 88 } 85 89 86 90 s = set_add(&acc->set, "ssl", "false", set_eval_bool, acc); … … 121 125 122 126 jd->fd = jd->r_inpa = jd->w_inpa = -1; 127 128 if (strcmp(acc->prpl->name, "hipchat") == 0) { 129 jd->flags |= JFLAG_HIPCHAT; 130 } 123 131 124 132 if (jd->server == NULL) { … … 656 664 { 657 665 struct prpl *ret = g_new0(struct prpl, 1); 666 struct prpl *hipchat = NULL; 658 667 659 668 ret->name = "jabber"; … … 686 695 687 696 register_protocol(ret); 688 } 697 698 /* Another one for hipchat, which has completely different logins */ 699 hipchat = g_memdup(ret, sizeof(struct prpl)); 700 hipchat->name = "hipchat"; 701 register_protocol(hipchat); 702 }
Note: See TracChangeset
for help on using the changeset viewer.