comparison: src/protocols/jabber/jabber.c
src/protocols/jabber/jabber.c
- changeset 6622
- 277eb0b14653
- parent 6581
- dd89eb44f0ee
- child 6623
- 75ba9eb9d3f8
equal
deleted
inserted
replaced
| 6621:2a18ef3e5224 | 6622:277eb0b14653 |
|---|---|
| 2357 { | 2357 { |
| 2358 GaimConnection *gc = gaim_account_get_connection(account); | 2358 GaimConnection *gc = gaim_account_get_connection(account); |
| 2359 struct jabber_data *jd = gc->proto_data = g_new0(struct jabber_data, 1); | 2359 struct jabber_data *jd = gc->proto_data = g_new0(struct jabber_data, 1); |
| 2360 char *loginname = create_valid_jid(account->username, DEFAULT_SERVER, "Gaim"); | 2360 char *loginname = create_valid_jid(account->username, DEFAULT_SERVER, "Gaim"); |
| 2361 | 2361 |
| 2362 gc->flags |= OPT_CONN_HTML; | 2362 gc->flags |= GAIM_CONNECTION_HTML; |
| 2363 | 2363 |
| 2364 jd->buddies = g_hash_table_new(g_str_hash, g_str_equal); | 2364 jd->buddies = g_hash_table_new(g_str_hash, g_str_equal); |
| 2365 jd->chats = NULL; /* we have no chats yet */ | 2365 jd->chats = NULL; /* we have no chats yet */ |
| 2366 | 2366 |
| 2367 gaim_connection_update_progress(gc, _("Connecting"), 1, JABBER_CONNECT_STEPS); | 2367 gaim_connection_update_progress(gc, _("Connecting"), 1, JABBER_CONNECT_STEPS); |
| 2513 } | 2513 } |
| 2514 } | 2514 } |
| 2515 g_free(xhtml); | 2515 g_free(xhtml); |
| 2516 } | 2516 } |
| 2517 | 2517 |
| 2518 static int jabber_send_im(GaimConnection *gc, const char *who, const char *message, int len, int flags) | 2518 static int jabber_send_im(GaimConnection *gc, const char *who, const char *message, int len, GaimImFlags flags) |
| 2519 { | 2519 { |
| 2520 xmlnode x, y; | 2520 xmlnode x, y; |
| 2521 char *thread_id = NULL; | 2521 char *thread_id = NULL; |
| 2522 gjconn gjc = ((struct jabber_data *)gc->proto_data)->gjc; | 2522 gjconn gjc = ((struct jabber_data *)gc->proto_data)->gjc; |
| 2523 jab_res_info jri = jabber_find_resource(gc, who); | 2523 jab_res_info jri = jabber_find_resource(gc, who); |
