diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2009-07-21 18:21:32 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2009-07-27 16:07:05 +0200 |
| commit | 6cd6353ff9c0ce93a63e43c4cb61188c6bc0b0f5 (patch) | |
| tree | 8ed1445cd302c6cf13716412a0ebdf8274c61f38 | |
| parent | 69f982cdade4050c89ab8ebfd97d43288e625179 (diff) | |
xconfig: Save the configuration properly in qconf
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/config/kconfig-to-buildroot2.patch | 20 | ||||
| -rw-r--r-- | package/config/qconf.cc | 2 |
2 files changed, 20 insertions, 2 deletions
diff --git a/package/config/kconfig-to-buildroot2.patch b/package/config/kconfig-to-buildroot2.patch index 5f5d8ee7f..3348b85a1 100644 --- a/package/config/kconfig-to-buildroot2.patch +++ b/package/config/kconfig-to-buildroot2.patch @@ -7,11 +7,11 @@ gconf.c | 4 - gconf.glade | 2 mconf.c | 39 +++++++++---------- - qconf.cc | 3 - + qconf.cc | 5 +- util.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++- zconf.tab.c_shipped | 2 zconf.y | 2 - 12 files changed, 239 insertions(+), 103 deletions(-) + 12 files changed, 241 insertions(+), 103 deletions(-) Index: config/Makefile =================================================================== @@ -741,6 +741,22 @@ Index: config/qconf.cc setCaption(title); width = configSettings->readNumEntry("/window width", d->width() - 64); +@@ -1612,6 +1611,7 @@ + { + if (!conf_get_changed()) { + e->accept(); ++ conf_write_autoconf(); + return; + } + QMessageBox mb("qconf", _("Save configuration?"), QMessageBox::Warning, +@@ -1622,6 +1622,7 @@ + switch (mb.exec()) { + case QMessageBox::Yes: + conf_write(NULL); ++ conf_write_autoconf(); + case QMessageBox::No: + e->accept(); + break; Index: config/util.c =================================================================== --- config.orig/util.c diff --git a/package/config/qconf.cc b/package/config/qconf.cc index 3e539c1c7..9af12a61a 100644 --- a/package/config/qconf.cc +++ b/package/config/qconf.cc @@ -1611,6 +1611,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e) { if (!conf_get_changed()) { e->accept(); + conf_write_autoconf(); return; } QMessageBox mb("qconf", _("Save configuration?"), QMessageBox::Warning, @@ -1621,6 +1622,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e) switch (mb.exec()) { case QMessageBox::Yes: conf_write(NULL); + conf_write_autoconf(); case QMessageBox::No: e->accept(); break; |