summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog3
-rw-r--r--noncore/applets/memoryapplet/swapfile.cpp8
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f2c8b4c..d2c386c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
3 3
4 New Features 4 New Features
5 ------------ 5 ------------
6 * OpieStumbler: New application (skyhusker) 6 * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
7 7
8 Fixed Bugs 8 Fixed Bugs
9 ---------- 9 ----------
@@ -15,6 +15,7 @@
15 * n.a.- libopienet: fix bugs in wireless scanning and setting SSID (skyhusker) 15 * n.a.- libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
16 * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl) 16 * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl)
17 * n.a.- scale BluezApplet appropriately (mickeyl) 17 * n.a.- scale BluezApplet appropriately (mickeyl)
18 * n.a.- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
18 19
19 Internal 20 Internal
20 -------- 21 --------
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,7 +1,8 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** Copyright (C) 2002-2005 the Opie Team <opie-devel@handhelds.org>
3** 4**
4** This file is part of Qtopia Environment. 5** This file is part of Opie Environment.
5** 6**
6** This file may be distributed and/or modified under the terms of the 7** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 8** GNU General Public License version 2 as published by the Free Software
@@ -56,6 +57,11 @@ using namespace Opie::Core;
56Swapfile::Swapfile( QWidget *parent, const char *name, WFlags f ) 57Swapfile::Swapfile( QWidget *parent, const char *name, WFlags f )
57 : QWidget( parent, name, f ) 58 : QWidget( parent, name, f )
58{ 59{
60 if ( !QFile::exists( "/proc/swaps" ) )
61 {
62 QLabel *text = new QLabel( tr( "Swap disabled in kernel" ), this );
63 return;
64 }
59 // are we running as root? 65 // are we running as root?
60 isRoot = geteuid() == 0; 66 isRoot = geteuid() == 0;
61 67