From f45abe6fadf11e9f307d78b572377adc3b0d384e Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Wed, 23 Nov 2011 11:58:39 +0100 Subject: Revert "add option to auto-open a new tab when sending /msg (openSUSE)", /query msg is already there for that This reverts commit 1e74680172e4ff43fb109557bea87d090d8376c2. --- src/common/cfgfiles.c | 1 - src/common/outbound.c | 6 ------ src/common/xchat.h | 1 - src/fe-gtk/setup.c | 1 - 4 files changed, 9 deletions(-) diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index c3dcb347..2aad854a 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -423,7 +423,6 @@ const struct prefs vars[] = { {"gui_auto_open_chat", P_OFFINT (autoopendccchatwindow), TYPE_BOOL}, {"gui_auto_open_dialog", P_OFFINT (autodialog), TYPE_BOOL}, - {"gui_auto_open_msg", P_OFFINT (gui_auto_open_msg), TYPE_BOOL}, {"gui_auto_open_recv", P_OFFINT (autoopendccrecvwindow), TYPE_BOOL}, {"gui_auto_open_send", P_OFFINT (autoopendccsendwindow), TYPE_BOOL}, {"gui_dialog_height", P_OFFINT (dialog_height), TYPE_INT}, diff --git a/src/common/outbound.c b/src/common/outbound.c index 8ae1bb55..55ea003f 100644 --- a/src/common/outbound.c +++ b/src/common/outbound.c @@ -2605,13 +2605,7 @@ cmd_msg (struct session *sess, char *tbuf, char *word[], char *word_eol[]) } newsess = find_dialog (sess->server, nick); if (!newsess) - { newsess = find_channel (sess->server, nick); - if (!newsess && prefs.gui_auto_open_msg) - { - newsess = new_ircwindow (sess->server, nick, SESS_DIALOG, 0); - } - } if (newsess) inbound_chanmsg (newsess->server, NULL, newsess->channel, newsess->server->nick, msg, TRUE, FALSE); diff --git a/src/common/xchat.h b/src/common/xchat.h index 3ec13e6b..6856d949 100644 --- a/src/common/xchat.h +++ b/src/common/xchat.h @@ -205,7 +205,6 @@ struct xchatprefs unsigned int perc_ascii; unsigned int autosave; unsigned int autodialog; - unsigned int gui_auto_open_msg; unsigned int autosave_url; unsigned int autoreconnect; unsigned int autoreconnectonfail; diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index a1a200a5..66e8349e 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -265,7 +265,6 @@ static const setting tabs_settings[] = {ST_TOGGLE, N_("Open an extra tab for server messages"), P_OFFINTNL(use_server_tab), 0, 0, 0}, {ST_TOGGLE, N_("Open an extra tab for server notices"), P_OFFINTNL(notices_tabs), 0, 0, 0}, {ST_TOGGLE, N_("Open a new tab when you receive a private message"), P_OFFINTNL(autodialog), 0, 0, 0}, - {ST_TOGGLE, N_("Open a new tab when you send a private message"), P_OFFINTNL(gui_auto_open_msg), 0, 0, 0}, {ST_TOGGLE, N_("Sort tabs in alphabetical order"), P_OFFINTNL(tab_sort), 0, 0, 0}, {ST_TOGGLE, N_("Smaller text"), P_OFFINTNL(tab_small), 0, 0, 0}, #if 0 -- cgit 1.4.1