fix crash on kernels without swap support. patch courtesy Seneca Cunningham

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f2c8b4c..d2c386c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,23 +1,24 @@
 2005-??-??	Opie 1.2.1
 	
 	
 	New Features
 	------------
-	* OpieStumbler: New application (skyhusker)
+	* OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
 
 	Fixed Bugs
 	----------
 	* #1535	- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
 	* #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
 	* #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
 	* n.a.	- always show volume and wireless applet popups inside visible screen (deller)
 	* n.a.  - scale O-Menu-Applets appropriately (mickeyl)
 	* n.a.	- libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
 	* n.a.	- Wellenreiter: relax WE version matching test a bit (mickeyl)
 	* n.a.	- scale BluezApplet appropriately (mickeyl)
+	* n.a.	- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
 
 	Internal
 	--------
 	* make BluezApplet use OTaskbarApplet (mickeyl)
 
 2005-03-25	Opie 1.2.0
diff --git a/noncore/applets/memoryapplet/swapfile.cpp b/noncore/applets/memoryapplet/swapfile.cpp
index 4609c13..50c173b 100644
--- a/noncore/applets/memoryapplet/swapfile.cpp
+++ b/noncore/applets/memoryapplet/swapfile.cpp
@@ -1,10 +1,11 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2002-2005 the Opie Team <opie-devel@handhelds.org>
 **
-** This file is part of Qtopia Environment.
+** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
@@ -53,12 +54,17 @@ using namespace Opie::Core;
 #include <unistd.h>
 #include <sys/types.h>
 
 Swapfile::Swapfile( QWidget *parent, const char *name, WFlags f )
     : QWidget( parent, name, f )
 {
+	if ( !QFile::exists( "/proc/swaps" ) )
+	{
+		QLabel *text = new QLabel( tr( "Swap disabled in kernel" ), this );
+		return;
+	}
 	// are we running as root?
 	isRoot = geteuid() == 0;
 
 	QVBoxLayout* vb = new QVBoxLayout(this, 5);
 
 	QHButtonGroup* cfsdRBG = new QHButtonGroup(tr("Swapfile location"), this);