summaryrefslogtreecommitdiffstats
path: root/source/kde/patch/kde-workspace
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/patch/kde-workspace')
-rw-r--r--source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff16
-rw-r--r--source/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff14
2 files changed, 30 insertions, 0 deletions
diff --git a/source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff b/source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff
new file mode 100644
index 000000000..ef899e83f
--- /dev/null
+++ b/source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff
@@ -0,0 +1,16 @@
+diff -ur kdebase-workspace-4.5.80/plasma/generic/applets/battery/battery.cpp kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime/plasma/generic/applets/battery/battery.cpp
+--- kdebase-workspace-4.5.80/plasma/generic/applets/battery/battery.cpp 2010-11-19 11:51:21.000000000 +0100
++++ kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime/plasma/generic/applets/battery/battery.cpp 2010-11-20 20:39:11.000000000 +0100
+@@ -712,7 +712,11 @@
+ m_acInfoLabel->setText(i18n("<b>Not plugged in</b>"));
+ }
+
+- if (batteryCount && showRemainingTime && m_remainingMSecs > 0) {
++ // Always show the remaining time in the popup.
++ // We don't just set m_showRemainingTime to true by default because
++ // that'd try to use the time also for the icon. That won't fit on
++ // small panels.
++ if (batteryCount && m_remainingMSecs > 0) {
+ m_remainingTimeLabel->show();
+ m_remainingInfoLabel->show();
+ // we don't have too much accuracy so only give hours and minutes
diff --git a/source/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff b/source/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff
new file mode 100644
index 000000000..4dd98484d
--- /dev/null
+++ b/source/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff
@@ -0,0 +1,14 @@
+--- ./kdm/config.def.orig 2010-09-30 16:20:21.000000000 -0500
++++ ./kdm/config.def 2010-12-01 19:13:02.356002453 -0600
+@@ -1343,9 +1343,9 @@
+
+ Key: ServerTimeout
+ Type: int
+-Default: 30
++Default: 45
+ User: core
+-Instance: #:*/
++Instance: :*/
+ Comment:
+ How long to wait for a local &X-Server; to come up.
+ Description: