prevent kinfocenter from crashing on pcmcia

This commit is contained in:
espie 2006-02-18 14:17:23 +00:00
parent 7b9517e203
commit 310edcaf84
2 changed files with 5 additions and 8 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.37 2006/02/18 13:56:26 espie Exp $ # $OpenBSD: Makefile,v 1.38 2006/02/18 14:17:23 espie Exp $
COMMENT= "K Desktop Environment, utilities" COMMENT= "K Desktop Environment, utilities"
CATEGORIES= x11 x11/kde CATEGORIES= x11 x11/kde
VERSION= 3.5.1 VERSION= 3.5.1
DISTNAME= kdeutils-${VERSION} DISTNAME= kdeutils-${VERSION}
PKGNAME= ${DISTNAME}p0 PKGNAME= ${DISTNAME}p1
MODKDE_VERSION= 3.5 MODKDE_VERSION= 3.5
SHARED_LIBS= kcmlaptop 1.0 \ SHARED_LIBS= kcmlaptop 1.0 \
khexeditcommon 1.0 \ khexeditcommon 1.0 \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-klaptopdaemon_portable_cpp,v 1.6 2006/02/18 13:56:26 espie Exp $ $OpenBSD: patch-klaptopdaemon_portable_cpp,v 1.7 2006/02/18 14:17:23 espie Exp $
--- klaptopdaemon/portable.cpp.orig Thu Jan 19 17:49:17 2006 --- klaptopdaemon/portable.cpp.orig Thu Jan 19 17:49:17 2006
+++ klaptopdaemon/portable.cpp Sat Feb 18 14:52:52 2006 +++ klaptopdaemon/portable.cpp Sat Feb 18 15:15:11 2006
@@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
// Linux (#if __linux__) // Linux (#if __linux__)
// FreeBSD (#elif __FreeBSD__) // FreeBSD (#elif __FreeBSD__)
@ -9,7 +9,7 @@ $OpenBSD: patch-klaptopdaemon_portable_cpp,v 1.6 2006/02/18 13:56:26 espie Exp $
// generic nothing (#else) // generic nothing (#else)
// //
// //
@@ -2769,6 +2770,326 @@ laptop_portable::get_button(LaptopButton @@ -2769,6 +2770,323 @@ laptop_portable::get_button(LaptopButton
return(0); return(0);
} }
@ -196,10 +196,7 @@ $OpenBSD: patch-klaptopdaemon_portable_cpp,v 1.6 2006/02/18 13:56:26 espie Exp $
+// +//
+QLabel *laptop_portable::pcmcia_info(int x, QWidget *parent) +QLabel *laptop_portable::pcmcia_info(int x, QWidget *parent)
+{ +{
+ if (x == 0)
+ return(new QLabel(i18n("No PCMCIA controller detected"), parent)); + return(new QLabel(i18n("No PCMCIA controller detected"), parent));
+ else
+ return 0;
+} +}
+ +
+// puts the system into standby mode +// puts the system into standby mode