Mailinglist Archive: opensuse-commit (1929 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kdebase4-workspace for 
openSUSE:Factory
checked in at Thu Oct 13 19:42:56 CEST 2011.



--------
--- openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes      
2011-10-13 12:30:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-workspace.changes  
2011-10-13 15:41:52.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Oct 13 13:40:54 UTC 2011 - coolo@xxxxxxxx
+
+- respect $KDE_NETWORKMANAGER_DISABLED before deciding if users
+  want an always red symbol in their plasma config
+  (plasma-disable-networkmanager.diff)
+
+-------------------------------------------------------------------
--- openSUSE:Factory/kdebase4-workspace/python-kdebase4.changes 2011-10-07 
16:07:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/python-kdebase4.changes     
2011-10-13 15:41:52.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Oct 13 13:40:54 UTC 2011 - coolo@xxxxxxxx
+
+- respect $KDE_NETWORKMANAGER_DISABLED before deciding if users
+  want an always red symbol in their plasma config
+  (plasma-disable-networkmanager.diff)
+
+-------------------------------------------------------------------
+Thu Oct 13 04:13:19 UTC 2011 - coolo@xxxxxxxx
+
+- fix branding requires for kwin and kdm
+
+-------------------------------------------------------------------
+Wed Oct 12 15:25:49 UTC 2011 - coolo@xxxxxxxx
+
+- take out the corona patch, it should be in branding-openSUSE
+- put plasma files in branding-upstream and require specific version
+  of it from branding packages
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  plasma-disable-networkmanager.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.fl5FaB/_old  2011-10-13 19:42:51.000000000 +0200
+++ /var/tmp/diff_new_pack.fl5FaB/_new  2011-10-13 19:42:51.000000000 +0200
@@ -101,6 +101,7 @@
 Patch124:       kdm-fix-labelcolors.diff
 Patch125:       pam-translate.diff
 Patch201:       plasma-notifications-kill-timer.diff
+Patch202:       plasma-disable-networkmanager.diff
 Patch211:       disable-python-support.diff
 Requires:       kde4-kgreeter-plugins = %version
 Requires:       kdebase4-workspace-liboxygenstyle = %version
@@ -174,6 +175,7 @@
 ###KDE47: rediff
 #%patch125
 %patch201 -p1
+%patch202 -p1
 %patch211
 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
 


++++++ plasma-disable-networkmanager.diff ++++++
commit dda8f95f9d810cf3f14f7be410bb612b1c6c0744
Author: Stephan Kulow <coolo@xxxxxxx>
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);
     }
 

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx