# HG changeset patch # User Sean Egan # Date 1049246105 0 # Node ID aa273fba7b09e983df8ae4e49ce3da16a6800a21 # Parent 1255c1c4f7ab7db825fe7b60a5d5299ee5c65689 [gaim-migrate @ 5290] danke, Robot101 committer: Tailor Script diff -r 1255c1c4f7ab -r aa273fba7b09 pixmaps/Makefile.am --- a/pixmaps/Makefile.am Wed Apr 02 00:49:09 2003 +0000 +++ b/pixmaps/Makefile.am Wed Apr 02 01:15:05 2003 +0000 @@ -5,7 +5,6 @@ add.xpm \ arrow_down.xpm \ arrow_right.xpm \ - away.xpm \ away.png \ away_big.xpm \ block.xpm \ @@ -71,7 +70,7 @@ gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons -gaimbuttonpix_DATA = edit.png away.xpm accounts.png change-bgcolor-small.png change-fgcolor-small.png signon.png preferences.png insert-image-small.png text_bigger.png text_smaller.png insert-link-small.png insert-smiley-small.png text_normal.png +gaimbuttonpix_DATA = edit.png accounts.png change-bgcolor-small.png change-fgcolor-small.png signon.png preferences.png insert-image-small.png text_bigger.png text_smaller.png insert-link-small.png insert-smiley-small.png text_normal.png gaimdialogpixdir = $(datadir)/pixmaps/gaim/dialogs gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png gaim_cool.png gaim_auth.png diff -r 1255c1c4f7ab -r aa273fba7b09 src/buddy.c --- a/src/buddy.c Wed Apr 02 00:49:09 2003 +0000 +++ b/src/buddy.c Wed Apr 02 01:15:05 2003 +0000 @@ -1230,48 +1230,59 @@ gtk_container_add(GTK_CONTAINER(sw), gtkblist->treeview); gaim_gtk_blist_update_columns(); + /* set the Show Offline Buddies option. must be done + * after the treeview or faceprint gets mad. -Robot101 + */ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (ift, N_("/Edit/Show Offline Buddies"))), + blist_options & OPT_BLIST_SHOW_OFFLINE); + + /* OK... let's show this bad boy. */ + gaim_gtk_blist_refresh(list); + gaim_gtk_blist_restore_position(); + gtk_widget_show_all(gtkblist->window); + /**************************** Button Box **************************************/ + /* add this afterwards so it doesn't force up the width of the window */ sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); gtkblist->bbox = gtk_hbox_new(TRUE, 0); gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->bbox, FALSE, FALSE, 0); + gtk_widget_show(gtkblist->bbox); + button = gaim_pixbuf_button_from_stock(_("IM"), GAIM_STOCK_IM, GAIM_BUTTON_VERTICAL); gtk_box_pack_start(GTK_BOX(gtkblist->bbox), button, FALSE, FALSE, 0); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); gtk_size_group_add_widget(sg, button); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_im_cb), gtkblist->treeview); - + gtk_widget_show(button); + button = gaim_pixbuf_button_from_stock(_("Get Info"), GAIM_STOCK_INFO, GAIM_BUTTON_VERTICAL); gtk_box_pack_start(GTK_BOX(gtkblist->bbox), button, FALSE, FALSE, 0); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); gtk_size_group_add_widget(sg, button); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_info_cb), gtkblist->treeview); + gtk_widget_show(button); button = gaim_pixbuf_button_from_stock(_("Chat"), GAIM_STOCK_CHAT, GAIM_BUTTON_VERTICAL); gtk_box_pack_start(GTK_BOX(gtkblist->bbox), button, FALSE, FALSE, 0); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); gtk_size_group_add_widget(sg, button); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_chat_cb), NULL); + gtk_widget_show(button); button = gaim_pixbuf_button_from_stock(_("Away"), GAIM_STOCK_AWAY, GAIM_BUTTON_VERTICAL); gtk_box_pack_start(GTK_BOX(gtkblist->bbox), button, FALSE, FALSE, 0); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); gtk_size_group_add_widget(sg, button); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_away_cb), NULL); + gtk_widget_show(button); + /* this will show the right image/label widgets for us */ gaim_gtk_blist_update_toolbar(); - /* set the Show Offline Buddies option */ - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (ift, N_("/Edit/Show Offline Buddies"))), - blist_options & OPT_BLIST_SHOW_OFFLINE); - - /* OK... let's show this bad boy. */ - gaim_gtk_blist_restore_position(); - gtk_widget_show_all(gtkblist->window); - - gaim_gtk_blist_refresh(list); + /* start the refresh timer */ gtkblist->refresh_timer = g_timeout_add(30000, (GSourceFunc)gaim_gtk_blist_refresh_timer, list); } @@ -1357,8 +1368,8 @@ if (blist_options & OPT_BLIST_NO_BUTTON_TEXT && !(blist_options & OPT_BLIST_SHOW_BUTTON_XPM)) gtk_widget_hide(gtkblist->bbox); else { - gtk_widget_show_all(gtkblist->bbox); gtk_container_foreach(GTK_CONTAINER(gtkblist->bbox), gaim_gtk_blist_update_toolbar_icons, NULL); + gtk_widget_show(gtkblist->bbox); } } diff -r 1255c1c4f7ab -r aa273fba7b09 src/prefs.c --- a/src/prefs.c Wed Apr 02 00:49:09 2003 +0000 +++ b/src/prefs.c Wed Apr 02 01:15:05 2003 +0000 @@ -540,7 +540,7 @@ ret = gtk_vbox_new(FALSE, 18); gtk_container_set_border_width (GTK_CONTAINER (ret), 12); - vbox = make_frame (ret, _("Buttons")); + vbox = make_frame (ret, _("Buddy List Toolbar")); gaim_dropdown(vbox, _("Show _buttons as:"), &blist_options, OPT_BLIST_SHOW_BUTTON_XPM | OPT_BLIST_NO_BUTTON_TEXT, _("Pictures"), OPT_BLIST_SHOW_BUTTON_XPM | OPT_BLIST_NO_BUTTON_TEXT, _("Text"), 0, diff -r 1255c1c4f7ab -r aa273fba7b09 src/stock.c --- a/src/stock.c Wed Apr 02 00:49:09 2003 +0000 +++ b/src/stock.c Wed Apr 02 01:15:05 2003 +0000 @@ -59,7 +59,7 @@ { GAIM_STOCK_WARN, NULL, GTK_STOCK_DIALOG_WARNING }, { GAIM_STOCK_IM, NULL, GTK_STOCK_CONVERT }, { GAIM_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO }, - { GAIM_STOCK_AWAY, "buttons", "away.xpm" } + { GAIM_STOCK_AWAY, "gaim", "away.png" } }; static gint stock_icon_count = sizeof(stock_icons) / sizeof(*stock_icons);