By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2110
Collapse All | Expand All

(-)kicker/kicker/ui/k_new_mnu.cpp.orig (-8 / +18 lines)
Lines 52-58 Link Here
52
#include <kdebug.h>
52
#include <kdebug.h>
53
#include <tdeglobal.h>
53
#include <tdeglobal.h>
54
#include <tdeglobalsettings.h>
54
#include <tdeglobalsettings.h>
55
#ifdef COMPILE_TDEHARDWAREBACKEND
55
#include <tdehardwaredevices.h>
56
#include <tdehardwaredevices.h>
57
#endif
56
#include <kiconloader.h>
58
#include <kiconloader.h>
57
#include <klineedit.h>
59
#include <klineedit.h>
58
#include <tdelocale.h>
60
#include <tdelocale.h>
Lines 93-99 Link Here
93
#include "flipscrollview.h"
95
#include "flipscrollview.h"
94
#include "itemview.h"
96
#include "itemview.h"
95
#include <dmctl.h>
97
#include <dmctl.h>
98
#ifdef __OpenBSD__
99
#include <sys/statvfs.h>
100
#include <sys/param.h>
101
#include <sys/mount.h>
102
#else
96
#include <sys/vfs.h>
103
#include <sys/vfs.h>
104
#endif
97
#include <mykickoffsearchinterface.h>
105
#include <mykickoffsearchinterface.h>
98
106
99
#include "media_watcher.h"
107
#include "media_watcher.h"
Lines 1359-1368 Link Here
1359
    }
1367
    }
1360
1368
1361
    bool maysd = false;
1369
    bool maysd = false;
1362
#ifdef COMPILE_HALBACKEND
1370
#if defined(COMPILE_HALBACKEND)
1363
    if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown())
1371
    if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown())
1364
        maysd = true;
1372
        maysd = true;
1365
#else
1373
#elif defined(COMPILE_TDEHARDWAREBACKEND)
1366
    TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
1374
    TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
1367
    if( rootDevice ) {
1375
    if( rootDevice ) {
1368
        maysd = rootDevice->canPowerOff();
1376
        maysd = rootDevice->canPowerOff();
Lines 3792-3798 Link Here
3792
    bool suspend_freeze = false;
3800
    bool suspend_freeze = false;
3793
    bool standby = false;
3801
    bool standby = false;
3794
    bool suspend_disk = false;
3802
    bool suspend_disk = false;
3795
#ifdef COMPILE_HALBACKEND
3803
#if defined(COMPILE_HALBACKEND)
3796
    suspend_ram = libhal_device_get_property_bool(m_halCtx,
3804
    suspend_ram = libhal_device_get_property_bool(m_halCtx,
3797
        "/org/freedesktop/Hal/devices/computer",
3805
        "/org/freedesktop/Hal/devices/computer",
3798
        "power_management.can_suspend",
3806
        "power_management.can_suspend",
Lines 3807-3813 Link Here
3807
        "/org/freedesktop/Hal/devices/computer",
3815
        "/org/freedesktop/Hal/devices/computer",
3808
        "power_management.can_hibernate",
3816
        "power_management.can_hibernate",
3809
        NULL);
3817
        NULL);
3810
#else // COMPILE_HALBACKEND
3818
#elif defined(COMPILE_TDEHARDWAREBACKEND) // COMPILE_HALBACKEND
3811
    TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
3819
    TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
3812
    if (rootDevice) {
3820
    if (rootDevice) {
3813
        suspend_ram = rootDevice->canSuspend();
3821
        suspend_ram = rootDevice->canSuspend();
Lines 3868-3874 Link Here
3868
        DCOPRef("kdesktop", "KScreensaverIface").call("lock()");
3876
        DCOPRef("kdesktop", "KScreensaverIface").call("lock()");
3869
    }
3877
    }
3870
3878
3871
#ifdef COMPILE_HALBACKEND
3879
#if defined(COMPILE_HALBACKEND)
3872
    DBusMessage* msg = NULL;
3880
    DBusMessage* msg = NULL;
3873
3881
3874
    if (m_dbusConn) {
3882
    if (m_dbusConn) {
Lines 3901-3907 Link Here
3901
        }
3909
        }
3902
        dbus_message_unref(msg);
3910
        dbus_message_unref(msg);
3903
    }
3911
    }
3904
#else // COMPILE_HALBACKEND
3912
#elif defined(COMPILE_TDEHARDWAREBACKEND) // COMPILE_HALBACKEND
3905
    TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
3913
    TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
3906
    if (rootDevice) {
3914
    if (rootDevice) {
3907
        if (id == 1) {
3915
        if (id == 1) {
Lines 3916-3925 Link Here
3916
            return;
3924
            return;
3917
        }
3925
        }
3918
    }
3926
    }
3927
#else
3928
    error = false;
3919
#endif
3929
#endif
3920
    if (error)
3930
    if (error) {
3921
        KMessageBox::error(this, i18n("Suspend failed"));
3931
        KMessageBox::error(this, i18n("Suspend failed"));
3922
3932
    }
3923
}
3933
}
3924
3934
3925
void KMenu::runUserCommand()
3935
void KMenu::runUserCommand()

Return to bug 2110