From: Heikki Holstila <heikki.holstila@gmail.com>
Date: Sun, 13 Mar 2011 15:30:00 +0000 (+0200)
Subject: 0.7.1
X-Git-Url: https://vcs.maemo.org/git/?p=fapman;a=commitdiff_plain

0.7.1
---

diff --git a/Makefile b/Makefile
index b34a1e4..d3ecc20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: fapman
-# Generated by qmake (2.01a) (Qt 4.7.0) on: Sun Jan 9 14:26:44 2011
+# Generated by qmake (2.01a) (Qt 4.7.0) on: Sun Mar 13 17:28:55 2011
 # Project:  fapman.pro
 # Template: app
 # Command: /usr/bin/qmake -o Makefile fapman.pro
diff --git a/TODO.txt b/TODO.txt
index d4828bc..b8930e4 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,7 +5,7 @@
 -------------------------------------------------------------------------------------
 
 
-0.7.1:
+0.7.x:
 - support loading .install files (partially done)
 
 
@@ -31,5 +31,5 @@ known bugs/shortcomings:
 - does not warn about system upgrade?
 - date fetching is quite slow with qt4.7
 - no way to edit the blacklist status of packages that are currently unknown
-- crash in QNetworkManager with dummy APN (Qt bug)
+- crash in QNetworkManager with dummy APN (Qt bug?)
 
diff --git a/debian/changelog b/debian/changelog
index ca5bea2..b265bf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fapman (0.7.1-1) unstable; urgency=low
+
+  * Workaround for #6803 (Trolltech.conf ownership)
+
+ -- Heikki Holstila <heikki.holstila@gmail.com>  Sun, 13 Mar 2011 17:00:19 +0200
+
 fapman (0.7-2) unstable; urgency=low
 
   * fixed icon size and installation of helper scripts
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 24a61a5..f44c9e7 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -19,7 +19,8 @@ extern "C"
 
 extern "C"
 {
-    #include <sys/vfs.h>
+#include <sys/vfs.h>
+#include <unistd.h>
 }
 
 #include "mainwindow.h"
@@ -120,6 +121,16 @@ MainWindow::MainWindow(QWidget *parent) :
         }
     }
 
+    // workaround for Trolltech.conf getting owned by root..
+#ifdef Q_WS_MAEMO_5
+    QFileInfo trollConf("/home/user/.config/Trolltech.conf");
+    if( trollConf.exists() && trollConf.ownerId() == 0 )
+    {
+        uint uid = 29999; // "user" (maemo5)
+        uint gid = 29999; // "users" (maemo5)
+        chown(trollConf.absoluteFilePath().toAscii(), uid, gid);
+    }
+#endif
 
     iMediaObject = new Phonon::MediaObject(this);
     Phonon::AudioOutput* aout = new Phonon::AudioOutput(Phonon::NotificationCategory, this);
diff --git a/version.h b/version.h
index 6682b2f..aa8eba7 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-const QString PROGRAM_VERSION="0.7";
+const QString PROGRAM_VERSION="0.7.1";