[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.11-1-13-g7178fa8

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=ef5538e

The following commit has been merged in the master branch:
commit ef5538e8ae7616515280b06326db2495734e59fb
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Sep 21 16:17:28 2014 +0200

    New patch: check_if_SensorMgr
---
 debian/changelog                  |  1 +
 debian/patches/check_if_SensorMgr | 18 ++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7931bf7..6b17238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kde-workspace (4:4.11.12-1~) UNRELEASED; urgency=medium
 
   * New upstream release (4.11.12).
+  * New patch: check_if_SensorMgr
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Sep 2014 20:36:27 +0200
 
diff --git a/debian/patches/check_if_SensorMgr b/debian/patches/check_if_SensorMgr
new file mode 100644
index 0000000..ca35e4b
--- /dev/null
+++ b/debian/patches/check_if_SensorMgr
@@ -0,0 +1,18 @@
+Index: kde-workspace/libs/ksysguard/ksgrd/SensorAgent.cpp
+===================================================================
+--- kde-workspace.orig/libs/ksysguard/ksgrd/SensorAgent.cpp	2014-09-21 16:12:31.902565747 +0200
++++ kde-workspace/libs/ksysguard/ksgrd/SensorAgent.cpp	2014-09-21 16:42:38.510595463 +0200
+@@ -109,9 +109,10 @@
+           else {
+             /* We just received the end of an error message, so we
+              * can display it. */
+-            SensorMgr->notify( i18nc( "%1 is a host name", "Message from %1:
%2",
+-                               mHostName ,
+-                               error ) );
++            if (SensorMgr)
++              SensorMgr->notify( i18nc( "%1 is a host name", "Message from %1:
%2",
++                                        mHostName ,
++                                        error ) );
+           }
+           found = true;
+ 	  break;
diff --git a/debian/patches/series b/debian/patches/series
index b853cf8..31a6367 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ kubuntu_no_krandr.diff
 effect_gles_link_against_gles
 unlink_testsock
 kubuntu_avoid_zic_and_deep_copy_timezone_data.diff
+check_if_SensorMgr

-- 
KDE Base Workspace module packaging