Mercurial > pidgin
changeset 9606:03be9d653123
[gaim-migrate @ 10449]
(20:04:37) LSchiere: datallah: commit message?
(20:06:13) nosnilmot: LSchiere: "datallah removed some stuff and doesn't
know how to prevent extra tabs on blank lines" ;-)
(20:06:58) datallah: nosnilmot: i know.. i'm going to hell
(20:07:12) nosnilmot: datallah: save me a place :)
(20:07:21) datallah: "this should make multi-monitor people happier"
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Wed, 28 Jul 2004 00:07:02 +0000 |
| parents | b5dd5cb72f56 |
| children | 293de2970493 |
| files | src/about.c src/away.c src/conversation.c src/dnd-hints.c src/gtkblist.c src/gtkconn.c src/gtkconv.c src/gtkft.c src/gtkpounce.c src/gtkprefs.c src/gtkprivacy.c src/gtkroomlist.c src/main.c |
| diffstat | 13 files changed, 7 insertions(+), 51 deletions(-) [+] |
line wrap: on
line diff
--- a/src/about.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/about.c Wed Jul 28 00:07:02 2004 +0000 @@ -60,7 +60,6 @@ gtk_window_set_title(GTK_WINDOW(about), _("About Gaim")); gtk_window_set_role(GTK_WINDOW(about), "about"); gtk_window_set_resizable(GTK_WINDOW(about), TRUE); - gtk_widget_realize(about); hbox = gtk_hbox_new(FALSE, 12); gtk_container_set_border_width(GTK_CONTAINER(hbox), 12);
--- a/src/away.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/away.c Wed Jul 28 00:07:02 2004 +0000 @@ -227,7 +227,6 @@ gtk_window_set_title(GTK_WINDOW(imaway), _("Away!")); g_signal_connect(G_OBJECT(imaway), "destroy", G_CALLBACK(do_im_back), imaway); - gtk_widget_realize(imaway); vbox = gtk_vbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(imaway), vbox);
--- a/src/conversation.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/conversation.c Wed Jul 28 00:07:02 2004 +0000 @@ -812,10 +812,11 @@ GaimConvWindow *win; win = gaim_conv_window_new(); - gaim_conv_window_add_conversation(win, conv); - + /* Ensure the window is visible. */ gaim_conv_window_show(win); + + gaim_conv_window_add_conversation(win, conv); } else { @@ -2085,7 +2086,7 @@ GaimConvChatBuddy *cb; char tmp[BUF_LONG]; GList *l; - gboolean quiet; + gboolean quiet = FALSE; g_return_if_fail(chat != NULL); g_return_if_fail(users != NULL); @@ -2357,9 +2358,8 @@ if (win == NULL) { win = gaim_conv_window_new(); - + gaim_conv_window_show(win); gaim_conv_window_add_conversation(win, conv); - gaim_conv_window_show(win); } else gaim_conv_window_add_conversation(win, conv); @@ -2375,9 +2375,8 @@ if (win == NULL) { win = gaim_conv_window_new(); - + gaim_conv_window_show(win); gaim_conv_window_add_conversation(win, conv); - gaim_conv_window_show(win); } else gaim_conv_window_add_conversation(win, conv);
--- a/src/dnd-hints.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/dnd-hints.c Wed Jul 28 00:07:02 2004 +0000 @@ -66,7 +66,6 @@ gtk_widget_push_colormap(gdk_rgb_get_colormap()); win = gtk_window_new(GTK_WINDOW_POPUP); pix = gtk_image_new_from_pixmap(pixmap, bitmap); - gtk_widget_realize(win); gtk_container_add(GTK_CONTAINER(win), pix); gtk_widget_shape_combine_mask(win, bitmap, 0, 0); gtk_widget_pop_colormap();
--- a/src/gtkblist.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/gtkblist.c Wed Jul 28 00:07:02 2004 +0000 @@ -3061,8 +3061,6 @@ gtk_window_set_role(GTK_WINDOW(gtkblist->window), "buddy_list"); gtk_window_set_title(GTK_WINDOW(gtkblist->window), _("Buddy List")); - GTK_WINDOW(gtkblist->window)->allow_shrink = TRUE; - gtkblist->vbox = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(gtkblist->window), gtkblist->vbox);
--- a/src/gtkconn.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/gtkconn.c Wed Jul 28 00:07:02 2004 +0000 @@ -201,7 +201,6 @@ gtk_window_set_role(GTK_WINDOW(meter_win->window), "signon"); gtk_container_set_border_width(GTK_CONTAINER(meter_win->window), 5); gtk_window_set_title(GTK_WINDOW(meter_win->window), _("Signon")); - gtk_widget_realize(meter_win->window); vbox = gtk_vbox_new (FALSE, 0); gtk_container_add(GTK_CONTAINER(meter_win->window), vbox);
--- a/src/gtkconv.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/gtkconv.c Wed Jul 28 00:07:02 2004 +0000 @@ -4438,10 +4438,7 @@ /* Create the window. */ gtkwin->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_role(GTK_WINDOW(gtkwin->window), "conversation"); - gtk_window_set_resizable(GTK_WINDOW(gtkwin->window), TRUE); gtk_container_set_border_width(GTK_CONTAINER(gtkwin->window), 0); - GTK_WINDOW(gtkwin->window)->allow_shrink = TRUE; - gtk_widget_realize(gtkwin->window); g_signal_connect(G_OBJECT(gtkwin->window), "delete_event", G_CALLBACK(close_win_cb), win); @@ -4507,25 +4504,6 @@ GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win); gtk_widget_show(gtkwin->window); - -#ifdef _WIN32 - /* This works around a win32 gtk+ bug, where it can't handle - * creating the button correctly before the window is shown. - * That's why we get the appearance of a button, without all - * the normal button-like properties, like being able to click - * it. ;-) --Nathan */ - if (gaim_prefs_get_bool("/gaim/gtk/conversations/close_on_tabs")) { - GaimConversation *conv; - GaimGtkConversation *gtkconv; - - conv = gaim_conv_window_get_conversation_at(win, 0); - if(conv) { - gtkconv = GAIM_GTK_CONVERSATION(conv); - gtk_widget_hide(gtkconv->close); - gtk_widget_show_all(gtkconv->close); - } - } -#endif } static void @@ -4718,7 +4696,6 @@ gtk_misc_set_padding(GTK_MISC(gtkconv->tab_label), 4, 0); #endif - /* Pack it all together. */ gtk_box_pack_start(GTK_BOX(tabby), gtkconv->icon, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(menu_tabby), gtkconv->menu_icon, @@ -4744,9 +4721,7 @@ gaim_gtkconv_update_buddy_icon(conv); /* Add this pane to the conversation's notebook. */ - gtk_notebook_append_page(GTK_NOTEBOOK(gtkwin->notebook), tab_cont, tabby); - gtk_notebook_set_menu_label(GTK_NOTEBOOK(gtkwin->notebook), - tab_cont, menu_tabby); + gtk_notebook_append_page_menu(GTK_NOTEBOOK(gtkwin->notebook), tab_cont, tabby, menu_tabby); gtk_widget_show(tab_cont);
--- a/src/gtkft.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/gtkft.c Wed Jul 28 00:07:02 2004 +0000 @@ -610,13 +610,8 @@ dialog->window = window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_role(GTK_WINDOW(window), "file transfer"); gtk_window_set_title(GTK_WINDOW(window), _("File Transfers")); -#if 0 - gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE); - gtk_window_set_default_size(GTK_WINDOW(window), 390, 400); -#endif gtk_window_set_resizable(GTK_WINDOW(window), FALSE); gtk_container_set_border_width(GTK_CONTAINER(window), 12); - gtk_widget_realize(window); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_win_cb), dialog);
--- a/src/gtkpounce.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/gtkpounce.c Wed Jul 28 00:07:02 2004 +0000 @@ -387,7 +387,6 @@ ? _("New Buddy Pounce") : _("Edit Buddy Pounce"))); gtk_container_set_border_width(GTK_CONTAINER(window), 12); - gtk_widget_realize(window); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_win_cb), dialog);
--- a/src/gtkprefs.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/gtkprefs.c Wed Jul 28 00:07:02 2004 +0000 @@ -2481,7 +2481,6 @@ /* Create the window */ prefs = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_role(GTK_WINDOW(prefs), "preferences"); - gtk_widget_realize(prefs); gtk_window_set_title(GTK_WINDOW(prefs), _("Preferences")); gtk_window_set_resizable (GTK_WINDOW(prefs), FALSE); gtk_container_set_border_width(GTK_CONTAINER(prefs), 12);
--- a/src/gtkprivacy.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/gtkprivacy.c Wed Jul 28 00:07:02 2004 +0000 @@ -388,8 +388,6 @@ g_signal_connect(G_OBJECT(dialog->win), "delete_event", G_CALLBACK(destroy_cb), dialog); - gtk_widget_realize(dialog->win); - /* Main vbox */ vbox = gtk_vbox_new(FALSE, 12); gtk_container_add(GTK_CONTAINER(dialog->win), vbox);
--- a/src/gtkroomlist.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/gtkroomlist.c Wed Jul 28 00:07:02 2004 +0000 @@ -330,7 +330,6 @@ gtk_window_set_title(GTK_WINDOW(window), _("Room List")); gtk_container_set_border_width(GTK_CONTAINER(window), 12); - gtk_widget_realize(window); g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_win_cb), dialog);
--- a/src/main.c Tue Jul 27 05:45:09 2004 +0000 +++ b/src/main.c Wed Jul 28 00:07:02 2004 +0000 @@ -230,8 +230,6 @@ gtk_window_set_role(GTK_WINDOW(mainwindow), "login"); gtk_window_set_resizable(GTK_WINDOW(mainwindow), FALSE); gtk_window_set_title(GTK_WINDOW(mainwindow), _("Login")); - gtk_widget_realize(mainwindow); - gdk_window_set_group(mainwindow->window, mainwindow->window); gtk_container_set_border_width(GTK_CONTAINER(mainwindow), 5); g_signal_connect(G_OBJECT(mainwindow), "delete_event", G_CALLBACK(login_window_closed), mainwindow);