Mercurial > pidgin
diff plugins/jabber/jabber.c @ 1881:a02584b98823
[gaim-migrate @ 1891]
C:)
committer: Tailor Script <tailor@pidgin.im>
author | Eric Warmenhoven <eric@warmenhoven.org> |
---|---|
date | Wed, 23 May 2001 07:59:05 +0000 |
parents | 8ebd3b0ff325 |
children | 42584a17de9a |
line wrap: on
line diff
--- a/plugins/jabber/jabber.c Tue May 22 23:23:28 2001 +0000 +++ b/plugins/jabber/jabber.c Wed May 23 07:59:05 2001 +0000 @@ -74,12 +74,6 @@ #define DEFAULT_SERVER "jabber.org" #define DEFAULT_GROUPCHAT "conference.jabber.org" -#define USEROPT_PROXYSERV 2 -#define USEROPT_PROXYPORT 3 -#define USEROPT_PROXYTYPE 4 -#define USEROPT_USER 5 -#define USEROPT_PASS 6 - typedef struct gjconn_struct { /* Core structure */ pool p; /* Memory allocation pool */ @@ -472,11 +466,7 @@ XML_SetElementHandler(j->parser, startElement, endElement); XML_SetCharacterDataHandler(j->parser, charData); - j->fd = proxy_connect(j->user->server, 5222, - user->proto_opt[USEROPT_PROXYSERV], atoi(user->proto_opt[USEROPT_PROXYPORT]), - atoi(user->proto_opt[USEROPT_PROXYTYPE]), - user->proto_opt[USEROPT_USER], user->proto_opt[USEROPT_PASS], - gjab_connected, j); + j->fd = proxy_connect(j->user->server, 5222, gjab_connected, j); if (!user->gc || (j->fd < 0)) { STATE_EVT(JCONN_STATE_OFF) return; @@ -1909,167 +1899,6 @@ jd->idle = idle ? time(NULL) - idle : idle; } -static void jabber_print_option(GtkEntry *entry, struct aim_user *user) -{ - int entrynum; - - entrynum = (int)gtk_object_get_user_data(GTK_OBJECT(entry)); - - if (entrynum == USEROPT_PROXYSERV) { - g_snprintf(user->proto_opt[USEROPT_PROXYSERV], - sizeof(user->proto_opt[USEROPT_PROXYSERV]), "%s", gtk_entry_get_text(entry)); - } else if (entrynum == USEROPT_PROXYPORT) { - g_snprintf(user->proto_opt[USEROPT_PROXYPORT], - sizeof(user->proto_opt[USEROPT_PROXYPORT]), "%s", gtk_entry_get_text(entry)); - } else if (entrynum == USEROPT_USER) { - g_snprintf(user->proto_opt[USEROPT_USER], - sizeof(user->proto_opt[USEROPT_USER]), "%s", gtk_entry_get_text(entry)); - } else if (entrynum == USEROPT_PASS) { - g_snprintf(user->proto_opt[USEROPT_PASS], - sizeof(user->proto_opt[USEROPT_PASS]), "%s", gtk_entry_get_text(entry)); - } -} - -static void jabber_print_optionrad(GtkRadioButton *entry, struct aim_user *user) -{ - int entrynum; - - entrynum = (int)gtk_object_get_user_data(GTK_OBJECT(entry)); - - g_snprintf(user->proto_opt[USEROPT_PROXYTYPE], - sizeof(user->proto_opt[USEROPT_PROXYTYPE]), "%d", entrynum); -} - -static void jabber_user_opts(GtkWidget *book, struct aim_user *user) -{ - /* so here, we create the new notebook page */ - GtkWidget *vbox; - GtkWidget *hbox; - GtkWidget *label; - GtkWidget *entry; - GtkWidget *first, *opt; - - vbox = gtk_vbox_new(FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); - gtk_notebook_append_page(GTK_NOTEBOOK(book), vbox, gtk_label_new("Jabber Options")); - gtk_widget_show(vbox); - - hbox = gtk_hbox_new(TRUE, 0); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show(hbox); - - first = gtk_radio_button_new_with_label(NULL, "No proxy"); - gtk_box_pack_start(GTK_BOX(hbox), first, FALSE, FALSE, 0); - gtk_object_set_user_data(GTK_OBJECT(first), (void *)PROXY_NONE); - gtk_signal_connect(GTK_OBJECT(first), "clicked", GTK_SIGNAL_FUNC(jabber_print_optionrad), user); - gtk_widget_show(first); - if (atoi(user->proto_opt[USEROPT_PROXYTYPE]) == PROXY_NONE) - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(first), TRUE); - - opt = - gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), "SOCKS 4"); - gtk_box_pack_start(GTK_BOX(hbox), opt, FALSE, FALSE, 0); - gtk_object_set_user_data(GTK_OBJECT(opt), (void *)PROXY_SOCKS4); - gtk_signal_connect(GTK_OBJECT(opt), "clicked", GTK_SIGNAL_FUNC(jabber_print_optionrad), user); - gtk_widget_show(opt); - if (atoi(user->proto_opt[USEROPT_PROXYTYPE]) == PROXY_SOCKS4) - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); - - hbox = gtk_hbox_new(TRUE, 0); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show(hbox); - - opt = - gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), "SOCKS 5"); - gtk_box_pack_start(GTK_BOX(hbox), opt, FALSE, FALSE, 0); - gtk_object_set_user_data(GTK_OBJECT(opt), (void *)PROXY_SOCKS5); - gtk_signal_connect(GTK_OBJECT(opt), "clicked", GTK_SIGNAL_FUNC(jabber_print_optionrad), user); - gtk_widget_show(opt); - if (atoi(user->proto_opt[USEROPT_PROXYTYPE]) == PROXY_SOCKS5) - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); - - opt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), "HTTP"); - gtk_box_pack_start(GTK_BOX(hbox), opt, FALSE, FALSE, 0); - gtk_object_set_user_data(GTK_OBJECT(opt), (void *)PROXY_HTTP); - gtk_signal_connect(GTK_OBJECT(opt), "clicked", GTK_SIGNAL_FUNC(jabber_print_optionrad), user); - gtk_widget_show(opt); - if (atoi(user->proto_opt[USEROPT_PROXYTYPE]) == PROXY_HTTP) - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); - - hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show(hbox); - - label = gtk_label_new("Proxy Host:"); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - - entry = gtk_entry_new(); - gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 0); - gtk_object_set_user_data(GTK_OBJECT(entry), (void *)USEROPT_PROXYSERV); - gtk_signal_connect(GTK_OBJECT(entry), "changed", GTK_SIGNAL_FUNC(jabber_print_option), user); - if (user->proto_opt[USEROPT_PROXYSERV][0]) { - debug_printf("setting text %s\n", user->proto_opt[USEROPT_PROXYSERV]); - gtk_entry_set_text(GTK_ENTRY(entry), user->proto_opt[USEROPT_PROXYSERV]); - } - gtk_widget_show(entry); - - hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show(hbox); - - label = gtk_label_new("Proxy Port:"); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - - entry = gtk_entry_new(); - gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 0); - gtk_object_set_user_data(GTK_OBJECT(entry), (void *)USEROPT_PROXYPORT); - gtk_signal_connect(GTK_OBJECT(entry), "changed", GTK_SIGNAL_FUNC(jabber_print_option), user); - if (user->proto_opt[USEROPT_PROXYPORT][0]) { - debug_printf("setting text %s\n", user->proto_opt[USEROPT_PROXYPORT]); - gtk_entry_set_text(GTK_ENTRY(entry), user->proto_opt[USEROPT_PROXYPORT]); - } - gtk_widget_show(entry); - - hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show(hbox); - - label = gtk_label_new("Proxy User:"); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - - entry = gtk_entry_new(); - gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 0); - gtk_object_set_user_data(GTK_OBJECT(entry), (void *)USEROPT_USER); - gtk_signal_connect(GTK_OBJECT(entry), "changed", GTK_SIGNAL_FUNC(jabber_print_option), user); - if (user->proto_opt[USEROPT_USER][0]) { - debug_printf("setting text %s\n", user->proto_opt[USEROPT_USER]); - gtk_entry_set_text(GTK_ENTRY(entry), user->proto_opt[USEROPT_USER]); - } - gtk_widget_show(entry); - - hbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show(hbox); - - label = gtk_label_new("Proxy Password:"); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - - entry = gtk_entry_new(); - gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 0); - gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); - gtk_object_set_user_data(GTK_OBJECT(entry), (void *)USEROPT_PASS); - gtk_signal_connect(GTK_OBJECT(entry), "changed", GTK_SIGNAL_FUNC(jabber_print_option), user); - if (user->proto_opt[USEROPT_PASS][0]) { - debug_printf("setting text %s\n", user->proto_opt[USEROPT_PASS]); - gtk_entry_set_text(GTK_ENTRY(entry), user->proto_opt[USEROPT_PASS]); - } - gtk_widget_show(entry); -} - static struct prpl *my_protocol = NULL; void Jabber_init(struct prpl *ret) @@ -2081,7 +1910,7 @@ ret->list_icon = jabber_list_icon; ret->away_states = jabber_away_states; ret->buddy_menu = jabber_buddy_menu; - ret->user_opts = jabber_user_opts; + ret->user_opts = NULL; ret->draw_new_user = jabber_draw_new_user; ret->do_new_user = jabber_do_new_user; ret->login = jabber_login;