[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-9-133-g20bd1b6

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit db52aaa7007c71b117c23f4a8e27a57a9872b979
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun Apr 24 12:53:53 2011 +0200

    Update initialize_variables_crashfix.diff
---
 debian/changelog                                  |    3 +-
 debian/patches/initialize_variables_crashfix.diff |   87 +++++++--------------
 2 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7248fed..49c3293 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,8 +77,9 @@ kdebase-workspace (4:4.6.2-0r1) UNRELEASED; urgency=low
     - 29_backport_fix_krandr_support_in_startkde.diff - applied upstream
     - 99_solid_network_use_ntrack.diff - applied upstream
     - ftbfs_remove_notify.diff - applied upstream
-  * Refreshed patches:
+  * Refreshed/reworked patches:
     - 30_plasma_netbook_fix_autostart.diff
+    - initialize_variables_crashfix.diff
   * TODO:
     - 31_kdm_vt_switching_on_kfreebsd.diff - should be refreshed/reworked
   * Rename libweather-ion4a as libweather-ion6 due to soname bump.
diff --git a/debian/patches/initialize_variables_crashfix.diff b/debian/patches/initialize_variables_crashfix.diff
index 3dc8253..4a157f9 100644
--- a/debian/patches/initialize_variables_crashfix.diff
+++ b/debian/patches/initialize_variables_crashfix.diff
@@ -1,36 +1,39 @@
 From: José Manuel Santamaría Lema <panfaust at gmail.com>
 From: Modestas Vainius <modax at debian.org>
-Subject: initialize some primitive variables avoiding crashes with dbus 1.4.8
+Subject: initialize some primitive variables avoiding potential crashes with dbus 1.4.8
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623492
-Last-Update: 2011-04-22
-Forwarded: not-needed
+Last-Update: 2011-04-24
+Forwarded: no
 Origin: vendor
 
---- a/libs/kephal/outputs/backendoutputs.cpp
-+++ b/libs/kephal/outputs/backendoutputs.cpp
-@@ -26,7 +26,12 @@
- namespace Kephal {
+--- a/libs/kephal/service/xrandroutputs.cpp
++++ b/libs/kephal/service/xrandroutputs.cpp
+@@ -94,7 +94,15 @@
+     }
  
-     BackendOutput::BackendOutput(QObject * parent)
--        : Output(parent)
-+        : Output(parent),
-+        m_markedActive(false),
-+        m_markedRate(0),
-+        m_markedRotation(RotateNormal),
-+        m_markedReflectX(false),
-+        m_markedReflectY(false)
+     XRandROutput::XRandROutput(XRandROutputs * parent, RROutput rrId)
+-            : BackendOutput(parent), m_productId(-1), m_serialNumber(0)
++            : BackendOutput(parent),
++            m_productId(-1),
++            m_serialNumber(0),
++            m_previousConnected(false),
++            m_previousActivated(false),
++            m_previousRotation(RotateNormal),
++            m_previousRate(0),
++            m_previousReflectX(false),
++            m_previousReflectY(false)
      {
-     }
-     
---- a/libs/kephal/outputs/simpleoutput.cpp
-+++ b/libs/kephal/outputs/simpleoutput.cpp
+         m_outputs = parent;
+         m_rrId = rrId;
+--- a/libs/kephal/kephal/simpleoutput.cpp
++++ b/libs/kephal/kephal/simpleoutput.cpp
 @@ -24,7 +24,13 @@
  namespace Kephal {
  
      SimpleOutput::SimpleOutput(QObject * parent, QString id, QSize size, QPoint position, bool connected, bool activated)
 -        : Output(parent)
 +        : Output(parent),
-+        m_productId(0),
++        m_productId(-1),
 +        m_serialNumber(0),
 +        m_rotation(RotateNormal),
 +        m_reflectX(false),
@@ -39,13 +42,11 @@ Origin: vendor
      {
          m_id = id;
          m_size = size;
-@@ -39,12 +45,24 @@ namespace Kephal {
-         m_size(0, 0),
+@@ -39,11 +45,23 @@
          m_position(0, 0),
          m_connected(false),
--        m_activated(false)
-+        m_activated(false),
-+        m_productId(0),
+         m_activated(false)
++        m_productId(-1),
 +        m_serialNumber(0),
 +        m_rotation(RotateNormal),
 +        m_reflectX(false),
@@ -53,11 +54,11 @@ Origin: vendor
 +        m_rate(0)
      {
      }
-     
+ 
      SimpleOutput::SimpleOutput(QObject * parent, Output * output)
 -        : Output(parent)
 +        : Output(parent),
-+        m_productId(0),
++        m_productId(-1),
 +        m_serialNumber(0),
 +        m_rotation(RotateNormal),
 +        m_reflectX(false),
@@ -66,35 +67,3 @@ Origin: vendor
      {
          m_id = output->id();
          m_size = output->size();
---- a/libs/kephal/outputs/xrandr/xrandroutputs.cpp
-+++ b/libs/kephal/outputs/xrandr/xrandroutputs.cpp
-@@ -63,7 +63,15 @@ namespace Kephal {
-     }
-     
-     XRandROutput::XRandROutput(XRandROutputs * parent, RROutput rrId)
--            : BackendOutput(parent)
-+            : BackendOutput(parent),
-+            m_productId(0),
-+            m_serialNumber(0),
-+            m_previousConnected(false),
-+            m_previousActivated(false),
-+            m_previousRotation(RotateNormal),
-+            m_previousRate(0),
-+            m_previousReflectX(false),
-+            m_previousReflectY(false)
-     {
-         m_outputs = parent;
-         m_rrId = rrId;
---- a/powerdevil/daemon/PowerDevilDaemon.cpp
-+++ b/powerdevil/daemon/PowerDevilDaemon.cpp
-@@ -93,6 +93,10 @@ public:
-             : notifier(Solid::Control::PowerManager::notifier())
-             , currentConfig(0)
-             , status(PowerDevilDaemon::NoAction)
-+            , batteryPercent(0)
-+            , brightness(0)
-+            , isPlugged(false)
-+            , ckAvailable(false)
-             , ckSessionInterface(0) {}
- 
-     Solid::Control::PowerManager::Notifier *notifier;

-- 
KDE Base Workspace module packaging