diff options
| author | TingPing <tingping@tingping.se> | 2015-04-21 16:07:12 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2015-04-21 16:07:12 -0400 |
| commit | 7363bc03f2a8242a1fa3532a90f633e772b31084 (patch) | |
| tree | f994ea13d170e02104881a7edb106d9d70aed239 | |
| parent | 78e51a4f3f499d9a8f109abec5183b7c210b206b (diff) | |
Remove r from mode buttons
No network can agree on what mode r actually means so we can't have nice things. Closes #1287
| -rw-r--r-- | src/common/proto-irc.c | 1 | ||||
| -rw-r--r-- | src/fe-gtk/fe-gtk.h | 15 | ||||
| -rw-r--r-- | src/fe-gtk/maingui.c | 3 |
3 files changed, 8 insertions, 11 deletions
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c index cdab4c21..d8f15cb5 100644 --- a/src/common/proto-irc.c +++ b/src/common/proto-irc.c @@ -666,7 +666,6 @@ process_numeric (session * sess, int n, EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANMODES, sess, word[4], word_eol[5], NULL, NULL, 0, tags_data->timestamp); fe_update_mode_buttons (sess, 'c', '-'); - fe_update_mode_buttons (sess, 'r', '-'); fe_update_mode_buttons (sess, 't', '-'); fe_update_mode_buttons (sess, 'n', '-'); fe_update_mode_buttons (sess, 'i', '-'); diff --git a/src/fe-gtk/fe-gtk.h b/src/fe-gtk/fe-gtk.h index 2e31c494..ab776f63 100644 --- a/src/fe-gtk/fe-gtk.h +++ b/src/fe-gtk/fe-gtk.h @@ -39,14 +39,13 @@ #define flag_c flag_wid[0] #define flag_n flag_wid[1] -#define flag_r flag_wid[2] -#define flag_t flag_wid[3] -#define flag_i flag_wid[4] -#define flag_m flag_wid[5] -#define flag_l flag_wid[6] -#define flag_k flag_wid[7] -#define flag_b flag_wid[8] -#define NUM_FLAG_WIDS 9 +#define flag_t flag_wid[2] +#define flag_i flag_wid[3] +#define flag_m flag_wid[4] +#define flag_l flag_wid[5] +#define flag_k flag_wid[6] +#define flag_b flag_wid[7] +#define NUM_FLAG_WIDS 8 #ifdef HAVE_GTK_MAC extern GtkosxApplication *osx_app; diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 11b88ad9..54696bed 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -78,7 +78,7 @@ static void mg_link_irctab (session *sess, int focus); static session_gui static_mg_gui; static session_gui *mg_gui = NULL; /* the shared irc tab */ static int ignore_chanmode = FALSE; -static const char chan_flags[] = { 'c', 'n', 'r', 't', 'i', 'm', 'l', 'k' }; +static const char chan_flags[] = { 'c', 'n', 't', 'i', 'm', 'l', 'k' }; static chan *active_tab = NULL; /* active tab */ GtkWidget *parent_window = NULL; /* the master window */ @@ -2075,7 +2075,6 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box) { gui->flag_c = mg_create_flagbutton (_("Filter Colors"), box, "c"); gui->flag_n = mg_create_flagbutton (_("No outside messages"), box, "n"); - gui->flag_r = mg_create_flagbutton (_("Registered Only"), box, "r"); gui->flag_t = mg_create_flagbutton (_("Topic Protection"), box, "t"); gui->flag_i = mg_create_flagbutton (_("Invite Only"), box, "i"); gui->flag_m = mg_create_flagbutton (_("Moderated"), box, "m"); |