summaryrefslogtreecommitdiffstats
path: root/mysql-workbench-5.2.45-noautocc.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-02-09 11:18:52 +0100
committerRemi Collet <fedora@famillecollet.com>2013-02-09 11:18:52 +0100
commit490abda00586c42b168602e4c2e5814d4fb232be (patch)
tree897085722f1f2b444c8c09c457358774d1ec9215 /mysql-workbench-5.2.45-noautocc.patch
parentb3f31a1569dde9cec0cee2f7974e556eab53f366 (diff)
mysql-workbench: 5.2.46
Diffstat (limited to 'mysql-workbench-5.2.45-noautocc.patch')
-rw-r--r--mysql-workbench-5.2.45-noautocc.patch94
1 files changed, 0 insertions, 94 deletions
diff --git a/mysql-workbench-5.2.45-noautocc.patch b/mysql-workbench-5.2.45-noautocc.patch
deleted file mode 100644
index 6e34261..0000000
--- a/mysql-workbench-5.2.45-noautocc.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -up mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.noautocc mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp
---- mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp.noautocc 2012-12-27 16:42:46.000000000 +0100
-+++ mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_context_sqlide.cpp 2012-12-29 11:39:01.080015839 +0100
-@@ -486,7 +486,11 @@ static bool validate_save_edits(wb::WBCo
-
- static bool validate_list_members(wb::WBContextSQLIDE *sqlide)
- {
-+#if 0
- return sqlide->get_grt_manager()->get_app_option_int("DbSqlEditor:CodeCompletionEnabled") != 0;
-+#else
-+ return false;
-+#endif
- }
-
- //--------------------------------------------------------------------------------------------------
-diff -up mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.noautocc mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp
---- mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.noautocc 2012-12-29 11:39:01.054015738 +0100
-+++ mysql-workbench-gpl-5.2.45-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp 2012-12-29 11:41:18.919436541 +0100
-@@ -889,6 +889,7 @@ grt::StringRef SqlEditorForm::do_connect
- err_ptr->password_expired = true;
- throw;
- }
-+#if 0
- if (_grtm->get_app_option_int("DbSqlEditor:CodeCompletionEnabled") == 1)
- {
- std::string cache_dir = _grtm->get_user_datadir() + "/cache/";
-@@ -908,6 +909,7 @@ grt::StringRef SqlEditorForm::do_connect
- }
- }
- else
-+#endif
- log_debug("Code completion is disabled, so no name cache is created\n");
-
- return grt::StringRef();
-diff -up mysql-workbench-gpl-5.2.45-src/backend/wbprivate/workbench/wb_context.cpp.noautocc mysql-workbench-gpl-5.2.45-src/backend/wbprivate/workbench/wb_context.cpp
---- mysql-workbench-gpl-5.2.45-src/backend/wbprivate/workbench/wb_context.cpp.noautocc 2012-12-27 16:43:01.000000000 +0100
-+++ mysql-workbench-gpl-5.2.45-src/backend/wbprivate/workbench/wb_context.cpp 2012-12-29 11:39:01.084015855 +0100
-@@ -1562,7 +1562,7 @@ void WBContext::set_default_options(grt:
- set_default(options, "SqlEditor::SyntaxCheck::MaxErrCount", 100);
-
- // DB SQL editor
-- options.gset("DbSqlEditor:CodeCompletionEnabled", 1);
-+ options.gset("DbSqlEditor:CodeCompletionEnabled", 0);
- options.gset("DbSqlEditor:AutoStartCodeCompletion", 0); // enable back when it works better
- options.gset("DbSqlEditor:ProgressStatusUpdateInterval", 500); // in ms
- options.gset("DbSqlEditor:KeepAliveInterval", 600); // in seconds
-diff -up mysql-workbench-gpl-5.2.45-src/backend/wbpublic/sqlide/sql_editor_be.cpp.noautocc mysql-workbench-gpl-5.2.45-src/backend/wbpublic/sqlide/sql_editor_be.cpp
---- mysql-workbench-gpl-5.2.45-src/backend/wbpublic/sqlide/sql_editor_be.cpp.noautocc 2012-12-27 16:42:46.000000000 +0100
-+++ mysql-workbench-gpl-5.2.45-src/backend/wbpublic/sqlide/sql_editor_be.cpp 2012-12-29 11:39:01.085015859 +0100
-@@ -912,14 +912,22 @@ void Sql_editor::set_sql_check_enabled(b
-
- bool Sql_editor::code_completion_enabled()
- {
-+#if 0
- return d->_grtm->get_app_option_int("DbSqlEditor:CodeCompletionEnabled") == 1;
-+#else
-+ return false;
-+#endif
- }
-
- //--------------------------------------------------------------------------------------------------
-
- bool Sql_editor::auto_start_code_completion()
- {
-+#if 0
- return d->_grtm->get_app_option_int("DbSqlEditor:AutoStartCodeCompletion") == 1;
-+#else
-+ return false;
-+#endif
- }
-
- //--------------------------------------------------------------------------------------------------
-diff -up mysql-workbench-gpl-5.2.45-src/frontend/common/preferences_form.cpp.noautocc mysql-workbench-gpl-5.2.45-src/frontend/common/preferences_form.cpp
---- mysql-workbench-gpl-5.2.45-src/frontend/common/preferences_form.cpp.noautocc 2012-12-27 16:42:54.000000000 +0100
-+++ mysql-workbench-gpl-5.2.45-src/frontend/common/preferences_form.cpp 2012-12-29 11:39:01.086015863 +0100
-@@ -622,6 +622,10 @@ void PreferencesForm::create_sqlide_page
-
- // Code completion settings is a horizontal box with two check boxes.
- {
-+ // Hack: force value to 0
-+ _wbui->set_wb_options_value(_model.is_valid() ? _model.id() : "", "DbSqlEditor:CodeCompletionEnabled", "0", grt::IntegerType);
-+ _wbui->set_wb_options_value(_model.is_valid() ? _model.id() : "", "DbSqlEditor:AutoStartCodeCompletion", "0", grt::IntegerType);
-+
- mforms::Box *cc_box = mforms::manage(new mforms::Box(true));
- vbox->add(cc_box, false);
- mforms::CheckBox *auto_start_check = new_checkbox_option("DbSqlEditor:AutoStartCodeCompletion");
-@@ -633,6 +637,7 @@ void PreferencesForm::create_sqlide_page
- check->set_text(_("Enable Code Completion in Editors"));
- check->set_tooltip(_(
- "If enabled SQL editors display a code completion list when pressing the defined hotkey"));
-+ check->set_enabled(false); // Hack disable this checkbox
- cc_box->add(check, false);
-
- // Set initial enabled state of the auto-cc checkbox depending on whether