From 21f540be4e247b4468d0e8adbf9e3a7575f8a085 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 13 Jan 2012 12:48:28 +0100 Subject: kconfig: sync with linux-3.0 And drop unused make-write-deps patch. Signed-off-by: Peter Korsgaard --- support/kconfig/qconf.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'support/kconfig/qconf.cc') diff --git a/support/kconfig/qconf.cc b/support/kconfig/qconf.cc index 06dd2e335..c2796b866 100644 --- a/support/kconfig/qconf.cc +++ b/support/kconfig/qconf.cc @@ -1489,8 +1489,7 @@ void ConfigMainWindow::saveConfigAs(void) QString s = Q3FileDialog::getSaveFileName(conf_get_configname(), NULL, this); if (s.isNull()) return; - if (conf_write(QFile::encodeName(s))) - QMessageBox::information(this, "qconf", _("Unable to save configuration!")); + saveConfig(); } void ConfigMainWindow::searchConfig(void) @@ -1643,7 +1642,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e) mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit")); switch (mb.exec()) { case QMessageBox::Yes: - conf_write(NULL); + saveConfig(); case QMessageBox::No: e->accept(); break; -- cgit v1.2.3