diff options
Diffstat (limited to 'inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc')
| -rw-r--r-- | inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc b/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc index b872e5e217f..afe6c9f9a0d 100644 --- a/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc +++ b/inputmethod/mozc-server/patches/patch-gui_config__dialog_config__dialog.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.4 2014/01/19 01:18:50 ryoon Exp $ +$NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.5 2016/05/16 11:51:49 ryoon Exp $ ---- gui/config_dialog/config_dialog.cc.orig 2014-01-06 07:10:44.000000000 +0000 +--- gui/config_dialog/config_dialog.cc.orig 2016-05-15 08:11:11.000000000 +0000 +++ gui/config_dialog/config_dialog.cc -@@ -94,21 +94,21 @@ ConfigDialog::ConfigDialog() +@@ -100,21 +100,21 @@ ConfigDialog::ConfigDialog() setWindowTitle(tr("Mozc Preferences")); #endif // OS_MACOSX @@ -28,7 +28,7 @@ $NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.4 2014/01/19 01:18:50 ry #endif // NO_LOGGING #ifndef ENABLE_CLOUD_HANDWRITING -@@ -323,7 +323,7 @@ ConfigDialog::ConfigDialog() +@@ -324,7 +324,7 @@ ConfigDialog::ConfigDialog() dictionaryPreloadingAndUACLabel->setVisible(false); #endif // OS_WIN @@ -37,7 +37,7 @@ $NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.4 2014/01/19 01:18:50 ry // On Linux, disable all fields for UsageStats usageStatsLabel->setEnabled(false); usageStatsLabel->setVisible(false); -@@ -333,7 +333,7 @@ ConfigDialog::ConfigDialog() +@@ -334,7 +334,7 @@ ConfigDialog::ConfigDialog() usageStatsMessage->setVisible(false); usageStatsCheckBox->setEnabled(false); usageStatsCheckBox->setVisible(false); @@ -46,21 +46,3 @@ $NetBSD: patch-gui_config__dialog_config__dialog.cc,v 1.4 2014/01/19 01:18:50 ry Reload(); -@@ -409,7 +409,7 @@ bool ConfigDialog::Update() { - } - - --#if defined(OS_WIN) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_NETBSD) - if ((initial_preedit_method_ != - static_cast<int>(config.preedit_method())) || - (initial_use_keyboard_to_change_preedit_method_ != -@@ -421,7 +421,7 @@ bool ConfigDialog::Update() { - initial_use_keyboard_to_change_preedit_method_ = - config.use_keyboard_to_change_preedit_method(); - } --#endif // OS_WIN -+#endif // OS_WIN, OS_LINUX or OS_NETBSD - - #ifdef OS_WIN - if (initial_use_mode_indicator_ != config.use_mode_indicator()) { |