Bug#365210: my config isn't saved

[Rafael Rodríguez]

tags 365210 patch
thanks

I've created a patch against the debianized source... hope you like it, would 
be my first patch in debian ;)

--------------------------

diff -pruN lastfm-1.1.90/src/settings.cpp 
lastfm-1.1.90-warning/src/settings.cpp
--- lastfm-1.1.90/src/settings.cpp      2006-04-28 22:55:42.000000000 +0200
+++ lastfm-1.1.90-warning/src/settings.cpp      2006-04-28 22:57:25.000000000 
+0200
@@ -397,7 +397,7 @@ Settings::stationItems()
 }
 
 
-void
+QSettings::Status
 Settings::save( bool restartConnection, bool restartAudio )
 {
     config->setValue( "Radio/version", VERSION );
@@ -408,6 +408,7 @@ Settings::save( bool restartConnection, 
 
     if ( restartAudio )
         emit resetAudio();
+       return config->status();
 }
 
 
diff -pruN lastfm-1.1.90/src/settingsdialog.cpp 
lastfm-1.1.90-warning/src/settingsdialog.cpp
--- lastfm-1.1.90/src/settingsdialog.cpp        2006-04-28 22:55:42.000000000 
+0200
+++ lastfm-1.1.90-warning/src/settingsdialog.cpp        2006-04-28 
22:57:25.000000000 
+0200
@@ -19,6 +19,8 @@
  ***************************************************************************/
 
 #include <QtGui>
+#include <QSettings>
+#include <QMessageBox>
 
 #ifdef WIN32
 #include <windows.h>
@@ -179,7 +181,13 @@ SettingsDialog::applyPressed()
     Settings::instance()->setSoundSystem( 
ui_system.systemBox->currentIndex() );
 //     Settings::instance()->setBrowser( ui.browserEdit->text() );
 
-    Settings::instance()->save();
+    if (Settings::instance()->save() != QSettings::NoError) {
+               QString errormsg = "Sorry, but the configuration couldn't be 
permanently 
saved. Check if ";
+               errormsg += QDir::homePath();
+               errormsg += "/.config is writable";
+               QMessageBox::warning(this, "Writing configuration failed", 
errormsg); 
+       }
+
     ui.applyButton->setEnabled( false );
 }
 
diff -pruN lastfm-1.1.90/src/settings.h lastfm-1.1.90-warning/src/settings.h
--- lastfm-1.1.90/src/settings.h        2006-02-20 17:54:47.000000000 +0100
+++ lastfm-1.1.90-warning/src/settings.h        2006-04-28 22:57:25.000000000 
+0200
@@ -102,7 +102,7 @@ class Settings : public QObject
         void startBrowser( QString url );
 
     public slots:
-        void save( bool restartConnection = false, bool restartAudio = 
false );
+        QSettings::Status save( bool restartConnection = false, bool 
restartAudio = false );
 
     signals:
         void reconnect();


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]