| author | mickeyl <mickeyl> | 2005-04-24 05:48:32 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2005-04-24 05:48:32 (UTC) |
| commit | ceaea9869115287b48781fabc938bd51cb67625c (patch) (side-by-side diff) | |
| tree | 4590e122439ac35ded56cad8b22f327d73e72844 | |
| parent | 07f375f59f19a001685db1b78e9ba9040c73bbeb (diff) | |
| download | opie-ceaea9869115287b48781fabc938bd51cb67625c.zip opie-ceaea9869115287b48781fabc938bd51cb67625c.tar.gz opie-ceaea9869115287b48781fabc938bd51cb67625c.tar.bz2 | |
fix crash on kernels without swap support. patch courtesy Seneca Cunningham
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | noncore/applets/memoryapplet/swapfile.cpp | 8 |
2 files changed, 9 insertions, 2 deletions
@@ -2,9 +2,9 @@ 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) @@ -14,8 +14,9 @@ * 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) 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,8 +1,9 @@ /********************************************************************** ** 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 @@ -55,8 +56,13 @@ using namespace Opie::Core; 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); |