# HG changeset patch # User Sean Egan # Date 1049391668 0 # Node ID 0885664956177817495693e747c4219bac43593b # Parent b5e52f7e5302b6b965d69a936266ff18a0cc08b5 [gaim-migrate @ 5320] Removed a pair of options ("remember buddy list size and position" and "ignore new messages when away") and made "Show warning levels" and "show idle times" depend on "show buddy icons". Also, brought back the old offline.png status emblem. committer: Tailor Script diff -r b5e52f7e5302 -r 088566495617 pixmaps/status/default/offline.png Binary file pixmaps/status/default/offline.png has changed diff -r b5e52f7e5302 -r 088566495617 src/buddy.c --- a/src/buddy.c Thu Apr 03 17:08:34 2003 +0000 +++ b/src/buddy.c Thu Apr 03 17:41:08 2003 +0000 @@ -1045,7 +1045,6 @@ /* if the window exists, is hidden, we're saving positions, and the position is sane... */ if(gtkblist && gtkblist->window && !GTK_WIDGET_VISIBLE(gtkblist->window) && - blist_options & OPT_BLIST_SAVED_WINDOWS && blist_pos.width != 0) { /* ...check position is on screen... */ if (blist_pos.x >= gdk_screen_width()) diff -r b5e52f7e5302 -r 088566495617 src/gaim.h --- a/src/gaim.h Thu Apr 03 17:08:34 2003 +0000 +++ b/src/gaim.h Thu Apr 03 17:41:08 2003 +0000 @@ -313,7 +313,6 @@ #define OPT_SOUND_CHAT_NICK 0x00040000 extern guint away_options; -#define OPT_AWAY_DISCARD 0x00000001 #define OPT_AWAY_BACK_ON_IM 0x00000002 /* #define OPT_AWAY_TIK_HACK 0x00000004 */ #define OPT_AWAY_AUTO 0x00000008 diff -r b5e52f7e5302 -r 088566495617 src/gaimrc.c --- a/src/gaimrc.c Thu Apr 03 17:08:34 2003 +0000 +++ b/src/gaimrc.c Thu Apr 03 17:41:08 2003 +0000 @@ -696,7 +696,6 @@ { /* OPT_GEN_DEBUG */ 0x00000100, &misc_options, OPT_MISC_DEBUG }, { /* OPT_GEN_BROWSER_POPUP */ 0x00000800, &misc_options, OPT_MISC_BROWSER_POPUP }, { /* OPT_GEN_SAVED_WINDOWS */ 0x00001000, &blist_options, OPT_BLIST_SAVED_WINDOWS }, -{ /* OPT_GEN_DISCARD_WHEN_AWAY */ 0x00002000, &away_options, OPT_AWAY_DISCARD }, { /* OPT_GEN_NEAR_APPLET */ 0x00004000, &blist_options, OPT_BLIST_NEAR_APPLET }, { /* OPT_GEN_CHECK_SPELLING */ 0x00008000, &convo_options, OPT_CONVO_CHECK_SPELLING }, { /* OPT_GEN_POPUP_CHAT */ 0x00010000, &chat_options, OPT_CHAT_POPUP }, diff -r b5e52f7e5302 -r 088566495617 src/prefs.c --- a/src/prefs.c Thu Apr 03 17:08:34 2003 +0000 +++ b/src/prefs.c Thu Apr 03 17:41:08 2003 +0000 @@ -537,6 +537,7 @@ GtkWidget *list_page() { GtkWidget *ret; GtkWidget *vbox; + GtkWidget *button, *b2; ret = gtk_vbox_new(FALSE, 18); gtk_container_set_border_width (GTK_CONTAINER (ret), 12); @@ -548,7 +549,6 @@ _("None"), OPT_BLIST_NO_BUTTON_TEXT, NULL); vbox = make_frame (ret, _("Buddy List Window")); - gaim_button(_("_Save window size/position"), &blist_options, OPT_BLIST_SAVED_WINDOWS, vbox); gaim_button(_("_Raise window on events"), &blist_options, OPT_BLIST_POPUP, vbox); vbox = make_frame (ret, _("Group Display")); @@ -556,10 +556,17 @@ gaim_button(_("Show _numbers in groups"), &blist_options, OPT_BLIST_SHOW_GRPNUM, vbox); vbox = make_frame (ret, _("Buddy Display")); - gaim_button(_("Show buddy _icons"), &blist_options, OPT_BLIST_SHOW_ICONS, vbox); - /* gaim_button(_("Show buddy t_ype icons"), &blist_options, OPT_BLIST_SHOW_PIXMAPS, vbox); */ - gaim_button(_("Show _warning levels"), &blist_options, OPT_BLIST_SHOW_WARN, vbox); - gaim_button(_("Show idle _times"), &blist_options, OPT_BLIST_SHOW_IDLETIME, vbox); + button = gaim_button(_("Show buddy _icons"), &blist_options, OPT_BLIST_SHOW_ICONS, vbox); + b2 = gaim_button(_("Show _warning levels"), &blist_options, OPT_BLIST_SHOW_WARN, vbox); + if (blist_options & OPT_BLIST_SHOW_ICONS) + gtk_widget_set_sensitive(GTK_WIDGET(b2), FALSE); + g_signal_connect(GTK_OBJECT(button), "clicked", + G_CALLBACK(gaim_gtk_toggle_sensitive), b2); + b2 = gaim_button(_("Show idle _times"), &blist_options, OPT_BLIST_SHOW_IDLETIME, vbox); + if (blist_options & OPT_BLIST_SHOW_ICONS) + gtk_widget_set_sensitive(GTK_WIDGET(b2), FALSE); + g_signal_connect(GTK_OBJECT(button), "clicked", + G_CALLBACK(gaim_gtk_toggle_sensitive), b2); gaim_button(_("Dim i_dle buddies"), &blist_options, OPT_BLIST_GREY_IDLERS, vbox); gtk_widget_show_all(ret); @@ -1028,7 +1035,6 @@ vbox = make_frame (ret, _("Away")); gaim_button(_("_Sending messages removes away status"), &away_options, OPT_AWAY_BACK_ON_IM, vbox); gaim_button(_("_Queue new messages when away"), &away_options, OPT_AWAY_QUEUE, vbox); - gaim_button(_("_Ignore new conversations when away"), &away_options, OPT_AWAY_DISCARD, vbox); vbox = make_frame (ret, _("Auto-response")); hbox = gtk_hbox_new(FALSE, 0); diff -r b5e52f7e5302 -r 088566495617 src/server.c --- a/src/server.c Thu Apr 03 17:08:34 2003 +0000 +++ b/src/server.c Thu Apr 03 17:41:08 2003 +0000 @@ -722,19 +722,7 @@ } } else { /* - * Ok, so we're not queuing it. Well then, we'll try to handle - * it normally. Some people think that ignoring it is a perfectly - * acceptible way to handle it. I think they're on crack, but - * hey, that's why it's optional. - */ - if (away_options & OPT_AWAY_DISCARD) { - g_free(name); - g_free(message); - return; - } - - /* - * Ok, so we're not ignoring it. Make sure the conversation + * Make sure the conversation * exists and is updated (partly handled above already), play * the receive sound (sound.c will take care of not playing * while away), and then write it to the convo window.