Revert "Fixes: NB#275357 - [TASK] Low memory notification dialog"

RevBy: Pauli Lehtinen
Details: This reverts commit 8bf124e.

debian/changelog

@@ -7,6 +7,7 @@ system-ui (1.2.0~1) unstable; urgency=low
   * Fixes: NB#275357 - [TASK] Low memory notification dialog
   * Fixes: NB#262034 - Accessory connected sound played when disconnecting USB cable
   * Fixes: NB#277582 - While no operator name is displayed but WLAN is active there's a gap between the signal strength and network type indicator
+  * Fixes: NB#278885 - Disable low memory notification for PR1.1 & later
 
  -- Vesa Halttunen <[email protected]>  Thu, 04 Aug 2011 17:17:02 +0300
 

debian/control

@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5), doxygen (>=1.5.9), libmeegotouch-dev (>= 0.20.3
                libngf-dev, libxcomposite-dev, libxext-dev,
                libdbus-1-dev, libdbus-glib-1-dev, libglib2.0-dev,
                aegis-builder (>= 1.4), libduicontrolpanel-dev,
-               libqt4-meegographicssystemhelper-dev, libmemnotifyqt-dev
+               libqt4-meegographicssystemhelper-dev
 Standards-Version: 3.8.0
 
 Package: system-ui

debian/system-ui.install

@@ -3,5 +3,4 @@ usr/share/themes/base/meegotouch/sysuid/*.conf
 usr/share/themes/base/meegotouch/sysuid/style/*.css
 usr/share/meegotouch/notifications/eventtypes/*.conf
 etc/dbus-1/system.d/systemui.conf
-etc/memnotify/sysuid.mn
 usr/share/themes/base/meegotouch/sysuid/feedbacks

src/systemui/systemui.pro

@@ -43,8 +43,7 @@ HEADERS +=                              \
     applicationcontext.h                \
     x11wrapper.h                        \
     xeventlistener.h                    \
-    diskspacenotifier.h                 \
-    lowmemorynotifier.h
+    diskspacenotifier.h
 
 SOURCES +=                              \
     main.cpp                            \
@@ -58,8 +57,7 @@ SOURCES +=                              \
     contextframeworkcontext.cpp         \
     x11wrapper.cpp                      \
     xeventlistener.cpp                  \
-    diskspacenotifier.cpp               \
-    lowmemorynotifier.cpp
+    diskspacenotifier.cpp
 
 include(statusindicatormenu/statusindicatormenu.pri)
 include(statusarea/statusarea.pri)
@@ -86,21 +84,16 @@ contains(DEFINES, HAVE_LIBNGF) {
 PKGCONFIG += \
     dbus-1 \
     dbus-glib-1 \
-    xcomposite \
-    libmemnotifyqt
+    xcomposite
 
 dbus_policy.files += systemui.conf
 dbus_policy.path = $$(DEBIAN_DESTDIR)/etc/dbus-1/system.d
 
-memnotify_config.files += sysuid.mn
-memnotify_config.path = $$(DEBIAN_DESTDIR)/etc/memnotify
-
 headers.path = /usr/include/system-ui
 headers.files += \
     volumeextensioninterface.h \
     VolumeExtensionInterface
 
 INSTALLS += target \
             dbus_policy \
-            memnotify_config \
             headers

src/systemui/sysuid.cpp

@@ -41,7 +41,6 @@
 #include "notificationstatusindicatorsink.h"
 #include "closeeventeater.h"
 #include "diskspacenotifier.h"
-#include "lowmemorynotifier.h"
 #include <QX11Info>
 
 Sysuid* Sysuid::instance_ = NULL;
@@ -151,9 +150,7 @@ Sysuid::Sysuid(QObject* parent) : QObject(parent)
 
     usbUi = new UsbUi(this);
 
-    // Create the notifiers
     new DiskSpaceNotifier(this);
-    new LowMemoryNotifier(this);
 
     // Unlock the touch screen lock when displaying the USB dialog
     connect(usbUi, SIGNAL(dialogShown()), screenLockBusinessLogic, SLOT(unlockScreen()));