X-Git-Url: https://vcs.maemo.org/git/?p=fapman;a=blobdiff_plain;f=mainwindow.cpp;h=a2f6c5c37521eb1ec80e6e93860ab0744535994f;hp=44215ce0b8149df54bc8364ff54d72eb042fdbce;hb=23b54f1b9c89080d87c3a51d28dcaabc86b6ab2b;hpb=ab39ad0cf5e313e7dc4a0db113e2d0664194281c

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 44215ce..a2f6c5c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -18,8 +18,11 @@
 */
 
 #ifdef MYDEF_GTK_EXISTS
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+extern "C"
+{
+	#include <gdk/gdk.h>
+	#include <gtk/gtk.h>
+}
 #endif
 
 #include <QtCore>
@@ -33,7 +36,10 @@
 #include <QtMaemo5>
 #endif
 
-#include <sys/vfs.h>
+extern "C"
+{
+	#include <sys/vfs.h>
+}
 
 #include "mainwindow.h"
 #include "version.h"
@@ -160,13 +166,14 @@ MainWindow::~MainWindow()
 	// save "need repo refresh" status
 	iSettings->qsettings()->setValue("need_repo_refresh", iAptInterface->needRepoRefresh());
 
-	delete iWinPackageView;
-	delete iWinRepoView;
-	delete iAptInterface;
-	delete iDpkgInterface;
-	delete iDimmer;
-	delete iSettings;
-    delete ui;
+	delete iWinPackageView; iWinPackageView=0;
+	delete iWinRepoView; iWinRepoView=0;
+	delete iAptInterface; iAptInterface=0;
+	delete iDpkgInterface; iDpkgInterface=0;
+	delete iDimmer; iDimmer=0;
+	delete iSettings; iSettings=0;
+	delete ui; ui=0;
+	//iMediaObject and aout automatically deleted by their parent
 }
 
 void MainWindow::changeEvent(QEvent *e)