File plasma-disable-networkmanager.diff of Package kdebase4-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File plasma-disable-networkmanager.diff of Package kdebase4-workspace (Revision dd6841cd9f8487f488d81a65befd45e9)

Currently displaying revision dd6841cd9f8487f488d81a65befd45e9 , Show latest

commit dda8f95f9d810cf3f14f7be410bb612b1c6c0744
Author: Stephan Kulow <coolo@suse.de>
Date:   Thu Oct 13 15:36:58 2011 +0200

openSUSE has NetworkManager installed on all installations, but doesn't
    necessarly run it. While checking for some dbus interface might be
    the better solution, it's also the more fragile one because NM might
    still startup or be down just the second we check the default applets.
    
    So simply make it possible to disable it on KDE start depending on sysconfig
    and if the system changes, the user is expected to reconfigure plasma too

diff --git a/plasma/generic/applets/systemtray/ui/applet.cpp b/plasma/generic/applets/systemtray/ui/applet.cpp
index bf983e1..f9cf13f 100644
--- a/plasma/generic/applets/systemtray/ui/applet.cpp
+++ b/plasma/generic/applets/systemtray/ui/applet.cpp
@@ -729,7 +729,7 @@ void Applet::checkDefaultApplets()
 
 
     QStringList applets = s_manager->applets(this);
-    if (!applets.contains("org.kde.networkmanagement")) {
+    if (!applets.contains("org.kde.networkmanagement") && !getenv("KDE_NETWORKMANAGER_DISABLED")) {
         s_manager->addApplet("org.kde.networkmanagement", this);
     }

Places

File plasma-disable-networkmanager.diff of Package kdebase4-workspace (Revision dd6841cd9f8487f488d81a65befd45e9)

Places