From 02f3baa09d11547e1be4a950d279dd55371a3fcc Mon Sep 17 00:00:00 2001 From: Siarzhuk Zharski Date: Sat, 26 Jan 2013 22:40:06 +0100 Subject: [PATCH] Cleanup:Remove unused pref entries and fix typo * PREF_SHELL is not used anymore, corresponding entry in /etc/passwd should be used instead; * PREF_GUI_LANGUAGE is not actual anymore - we have system-wide UI localization support; * Fix typo in the name of MSG_SET_TERMNAL_TITLE constant. --- src/apps/terminal/PrefHandler.cpp | 2 -- src/apps/terminal/TermConst.h | 4 +--- src/apps/terminal/TermView.cpp | 2 +- src/apps/terminal/TerminalBuffer.cpp | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/apps/terminal/PrefHandler.cpp b/src/apps/terminal/PrefHandler.cpp index cf4f469b26..8be5171b77 100644 --- a/src/apps/terminal/PrefHandler.cpp +++ b/src/apps/terminal/PrefHandler.cpp @@ -53,12 +53,10 @@ static const pref_defaults kTermDefaults[] = { { PREF_IM_BACK_COLOR, "152, 203, 255" }, { PREF_IM_SELECT_COLOR, "255, 152, 152" }, - { PREF_SHELL, "/bin/sh -login" }, { PREF_HISTORY_SIZE, "10000" }, { PREF_TEXT_ENCODING, "UTF-8" }, - { PREF_GUI_LANGUAGE, "English"}, { PREF_IM_AWARE, "0"}, { PREF_TAB_TITLE, "%1d: %p" }, diff --git a/src/apps/terminal/TermConst.h b/src/apps/terminal/TermConst.h index c40872de54..40de9c2045 100644 --- a/src/apps/terminal/TermConst.h +++ b/src/apps/terminal/TermConst.h @@ -87,7 +87,7 @@ static const uint32 SAVE_AS_DEFAULT = 'sadf'; static const uint32 MSG_CHECK_CHILDREN = 'ckch'; static const uint32 MSG_REMOVE_RESIZE_VIEW_IF_NEEDED = 'rmrv'; static const uint32 MSG_TERMINAL_BUFFER_CHANGED = 'bufc'; -static const uint32 MSG_SET_TERMNAL_TITLE = 'sett'; +static const uint32 MSG_SET_TERMINAL_TITLE = 'sett'; static const uint32 MSG_QUIT_TERMNAL = 'qutt'; static const uint32 MSG_REPORT_MOUSE_EVENT = 'mous'; static const uint32 MSG_SAVE_WINDOW_POSITION = 'swps'; @@ -128,10 +128,8 @@ static const char* const PREF_IM_AWARE = "Input method aware"; static const char* const PREF_COLS = "Cols"; static const char* const PREF_ROWS = "Rows"; -static const char* const PREF_SHELL = "Shell"; static const char* const PREF_TEXT_ENCODING = "Text encoding"; -static const char* const PREF_GUI_LANGUAGE = "Language"; static const char* const PREF_BLINK_CURSOR = "Blinking cursor"; static const char* const PREF_WARN_ON_EXIT = "Warn on exit"; diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp index 8da3c92dc7..0a1044f306 100644 --- a/src/apps/terminal/TermView.cpp +++ b/src/apps/terminal/TermView.cpp @@ -2002,7 +2002,7 @@ TermView::MessageReceived(BMessage *msg) _SynchronizeWithTextBuffer(0, -1); break; } - case MSG_SET_TERMNAL_TITLE: + case MSG_SET_TERMINAL_TITLE: { const char* title; if (msg->FindString("title", &title) == B_OK) { diff --git a/src/apps/terminal/TerminalBuffer.cpp b/src/apps/terminal/TerminalBuffer.cpp index 099f263eba..bc70256b6f 100644 --- a/src/apps/terminal/TerminalBuffer.cpp +++ b/src/apps/terminal/TerminalBuffer.cpp @@ -128,7 +128,7 @@ void TerminalBuffer::SetTitle(const char* title) { if (fListenerValid) { - BMessage message(MSG_SET_TERMNAL_TITLE); + BMessage message(MSG_SET_TERMINAL_TITLE); message.AddString("title", title); fListener.SendMessage(&message); }