Mercurial > pidgin
changeset 1819:47e064712091
[gaim-migrate @ 1829]
i read the news today oh boy
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Sun, 06 May 2001 11:24:04 +0000 |
| parents | 84782d1cb051 |
| children | 73bb4244165f |
| files | ChangeLog src/buddy_chat.c src/gaim.h src/oscar.c src/toc.c |
| diffstat | 5 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun May 06 10:14:51 2001 +0000 +++ b/ChangeLog Sun May 06 11:24:04 2001 +0000 @@ -6,6 +6,8 @@ * Redesigned the Font Options preference page * Improved Jabber chat support (it whispers now, too) * Zephyr can do Subscriptions now (thanks to nsanch) + * Auto-recon plugin got reworked + * Lots of clean-ups version 0.11.0-pre11 (04/30/2001): * Zephyr updates and additions, thanks Neil Sanchala (nsanch)
--- a/src/buddy_chat.c Sun May 06 10:14:51 2001 +0000 +++ b/src/buddy_chat.c Sun May 06 11:24:04 2001 +0000 @@ -39,7 +39,7 @@ #include "pixmaps/join.xpm" #include "pixmaps/close.xpm" -static GtkWidget *joinchat; +GtkWidget *joinchat; static struct gaim_connection *joinchatgc; static GtkWidget *entry; static GtkWidget *invite; @@ -83,7 +83,7 @@ } -static void do_join_chat() +void do_join_chat() { if (joinchat) { if (joinchatgc->prpl->draw_join_chat) @@ -104,15 +104,17 @@ rowbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(fbox), rowbox, TRUE, TRUE, 0); + gtk_widget_show(rowbox); label = gtk_label_new(_("Join what group:")); gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0); + gtk_widget_show(label); + entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(rowbox), entry, TRUE, TRUE, 0); - - gtk_widget_show(label); + gtk_window_set_focus(GTK_WINDOW(joinchat), entry); + gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(do_join_chat), NULL); gtk_widget_show(entry); - gtk_widget_show(rowbox); } static void rebuild_jc() @@ -248,7 +250,7 @@ join = picture_button(joinchat, _("Join"), join_xpm); gtk_box_pack_end(GTK_BOX(bbox), join, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(join), "clicked", GTK_SIGNAL_FUNC(do_join_chat), joinchat); + gtk_signal_connect(GTK_OBJECT(join), "clicked", GTK_SIGNAL_FUNC(do_join_chat), NULL); } gtk_widget_show_all(joinchat); }
--- a/src/gaim.h Sun May 06 10:14:51 2001 +0000 +++ b/src/gaim.h Sun May 06 11:24:04 2001 +0000 @@ -436,6 +436,8 @@ extern GtkWidget *all_chats; extern GtkWidget *chat_notebook; +extern GtkWidget *joinchat; + /* Globals in away.c */ extern struct away_message *awaymessage; extern struct away_message *default_away; @@ -583,6 +585,7 @@ extern void update_chat_tabs(); extern void update_im_tabs(); extern void update_idle_times(); +extern void do_join_chat(); /* Functions in html.c */ extern struct g_url parse_url(char *);
--- a/src/oscar.c Sun May 06 10:14:51 2001 +0000 +++ b/src/oscar.c Sun May 06 11:24:04 2001 +0000 @@ -2132,6 +2132,8 @@ join_chat_entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(rowbox), join_chat_entry, TRUE, TRUE, 0); + gtk_window_set_focus(GTK_WINDOW(joinchat), join_chat_entry); + gtk_signal_connect(GTK_OBJECT(join_chat_entry), "activate", GTK_SIGNAL_FUNC(do_join_chat), NULL); gtk_widget_show(join_chat_entry); rowbox = gtk_hbox_new(FALSE, 5);
--- a/src/toc.c Sun May 06 10:14:51 2001 +0000 +++ b/src/toc.c Sun May 06 11:24:04 2001 +0000 @@ -945,6 +945,8 @@ join_chat_entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(rowbox), join_chat_entry, TRUE, TRUE, 0); + gtk_window_set_focus(GTK_WINDOW(joinchat), join_chat_entry); + gtk_signal_connect(GTK_OBJECT(join_chat_entry), "activate", GTK_SIGNAL_FUNC(do_join_chat), NULL); gtk_widget_show(join_chat_entry); rowbox = gtk_hbox_new(FALSE, 5);