by CODeRUS

debian/control

@@ -1,7 +1,8 @@
 Source: system-ui
 Section: devel
 Priority: optional
-Maintainer: Vesa Halttunen <vesa.halttunen@nokia.com>
+Maintainer: coderus <coderusinbox@gmail.com>
+XSBC-Original-Maintainer: Vesa Halttunen <vesa.halttunen@nokia.com>
 Build-Depends: debhelper (>= 5), doxygen (>=1.5.9), libmeegotouch-dev (>= 0.22.12-1+0m6),
                libqmsystem2-dev (>= 1.2.0), libresourceqt-dev, libcontextsubscriber-dev,
                libngf-dev, libxcomposite-dev, libxfixes-dev, libxext-dev,
@@ -11,13 +12,12 @@ Build-Depends: debhelper (>= 5), doxygen (>=1.5.9), libmeegotouch-dev (>= 0.22.1
 Standards-Version: 3.8.0
 
 Package: system-ui
-Provides: duistatusindicatormenu, unrestricted-system-ui, system-ui-led-support
+Provides: duistatusindicatormenu, unrestricted-system-ui, system-ui-led-support, unrestricted-settings-support
 Conflicts: duistatusindicatormenu
 Replaces: duistatusindicatormenu, cellular-ui
 Architecture: any
 Recommends: pulseaudio-module-meego-mainvolume
-Depends: ${shlibs:Depends}, ${misc:Depends}, systemui-l10n-engineering-english, duicontrolpanel-privatemodeapplet, ui-fonts (>=5.6),
-         usb-moded [armel]
+Depends: libc6 (>= 2.4), libcontextsubscriber0 (>= 0.5.41+0m7), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2 (>= 0.71), libgcc1 (>= 1:4.1.1), libmeegotouchcore0, libmeegotouchextensions0, libmeegotouchviews0, libngf0 (>= 0.21+0m6), libnotificationsystem0, libqmsystem2, libqt4-dbus (>= 4.7.4~git20120202), libqt4-meegographicssystemhelper (>= 4.7.4~git20120202), libqtcore4 (>= 4.7.4~git20120202), libqtgui4 (>= 4.7.4~git20120202), libstdc++6 (>= 4.4.0), libx11-6 (>= 0), libxdamage1 (>= 1:1.1), libxfixes3 (>= 1:4.0.1), systemui-l10n-engineering-english, duicontrolpanel-privatemodeapplet, ui-fonts (>= 5.6), usb-moded
 Description: Various system user interfaces.
   System user interface package contains various user interfaces, e.g:
   - status area

debian/rules

@@ -92,25 +92,17 @@ binary-arch: build install
 	dh_installchangelogs $(EXCLUSIONS)
 	dh_installdocs $(EXCLUSIONS)
 	dh_install --sourcedir=debian/tmp $(EXCLUSIONS)
-	cp -v data/status-menu-items-order.conf debian/system-ui/etc/
-	# Sigh
-	mkdir -p debian/system-ui/usr/lib/meegotouch/applicationextensions
-	mkdir -p debian/system-ui/usr/share/meegotouch/applicationextensions
-	cp src/systemui/safemodeapplet/libstatusindicatormenu-safemode.so debian/system-ui/usr/lib/meegotouch/applicationextensions
-	cp src/systemui/safemodeapplet/statusindicatormenu-safemode.desktop debian/system-ui/usr/share/meegotouch/applicationextensions
 	dh_link $(EXCLUSIONS)
 	dh_strip --dbg-package=system-ui-dbg $(EXCLUSIONS)
 	dh_compress $(EXCLUSIONS)
 	dh_fixperms $(EXCLUSIONS)
 	dh_makeshlibs $(EXCLUSIONS)
 	dh_installdeb $(EXCLUSIONS)
-	dh_shlibdeps $(EXCLUSIONS)
+#	dh_shlibdeps $(EXCLUSIONS)
 	dh_gencontrol $(EXCLUSIONS)
 	dh_md5sums $(EXCLUSIONS)
 	dh_builddeb --destdir=$(DEBDIR) $(EXCLUSIONS)
 
-	aegis-deb-add -control debian/system-ui/DEBIAN/control .. debian/system-ui.aegis=_aegis
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
 

debian/system-ui.aegis

@@ -6,6 +6,31 @@
     <credential name="mce::LEDControl" />
     <credential match="xserver-security-policy::capture-drawables" />
     <credential match="xserver-security-policy::record-input" />
+
+<!-- Preload credentials, allowed only with com.nokia.maemo origin, or just preload for future installing applets w/o inception -->
+    <credential name="dsme::DeviceStateControl" />
+    <credential name="mce::DeviceModeControl" />
+    <credential name="GRP::video"/>
+    <credential name="GRP::pulse-access"/>
+    <credential name="Cellular"/>
+<!-- End preload -->
+
     <for path="/usr/bin/sysuid" />
   </request>
+  <request>
+    <credential name="UID::user" />
+    <credential name="GID::users" />
+    <credential name="GRP::users" />
+    <credential name="CAP::chown"/>
+    <for path="/usr/share/sysuid/setup.sh" />
+  </request>
+  <request>
+    <credential name="UID::root" />
+    <credential name="GID::root" />
+    <credential name="GRP::root" />
+    <for path="/usr/share/sysuid/root_helper.sh" />
+  </request>
+  <request context="INSTALL">
+    <credential name="CAP::chown"/>
+  </request>
 </aegis>

debian/system-ui.install

@@ -4,3 +4,7 @@ usr/share/themes/base/meegotouch/sysuid/style/*.css
 usr/share/meegotouch/notifications/eventtypes/*.conf
 etc/dbus-1/system.d/systemui.conf
 usr/share/themes/base/meegotouch/sysuid/feedbacks
+usr/share/sysuid/*.conf
+usr/share/sysuid/*.sh
+usr/lib/meegotouch/applicationextensions/libstatusindicatormenu-safemode.so
+usr/share/meegotouch/applicationextensions/statusindicatormenu-safemode.desktop

debian/system-ui.postinst

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+/usr/share/sysuid/setup.sh
+
 if [ -n "`initctl status xsession/sysuid | grep running`" ]
 then
   initctl restart xsession/sysuid

data/status-menu-items-order.conf → src/systemui/data/items-order.conf

@@ -4,4 +4,4 @@ statusindicatormenu-internetconnection.desktop
 statusindicatormenu-bluetooth.desktop
 statusindicatormenu-dlna.desktop
 statusindicatormenu-presence.desktop
-statusindicatormenu-transfer.desktop
+statusindicatormenu-transfer.desktop

src/systemui/data/pannable-order.conf

@@ -0,0 +1,5 @@
+statusindicatormenu-internetconnection.desktop
+statusindicatormenu-bluetooth.desktop
+statusindicatormenu-dlna.desktop
+statusindicatormenu-presence.desktop
+statusindicatormenu-transfer.desktop

src/systemui/data/top-order.conf

@@ -0,0 +1,2 @@
+statusindicatormenu-volume.desktop
+statusindicatormenu-call.desktop

src/systemui/notifications/lednotificationsink.cpp

@@ -96,6 +96,20 @@ bool LEDNotificationSink::checkIfAcceptable(const NotificationParameters &parame
         if (allowedNotifications.contains("organiser"))
             return true;
     }
+    // Wazapp events
+    else if (genericTextCatalogue.compare("wazapp") == 0) {
+        if (allowedNotifications.contains("wazapp"))
+            return true;    
+    }
+    // Rocket events
+    else if (genericTextCatalogue.compare("rocket") == 0) {
+        if (allowedNotifications.contains("rocket"))
+            return true;    
+    }
+    // Any other events with genericTextCatalogue listed in allowed
+    else if (allowedNotifications.contains(genericTextCatalogue)) {
+        return true;
+    }
 
     return false;
 }

src/systemui/safemodeapplet/safemodecontroller.cpp

@@ -1,6 +1,8 @@
 #include "safemodecontroller.h"
 #include "safemodeplugin.h"
 #include "../statusindicatormenu/statusindicatormenuverticalview.h"
+#include <QDBusInterface>
+#include <QDBusConnection>
 
 SafeModeController::SafeModeController(SafeModePlugin *safeModePlugin, QGraphicsItem *parent) :
     CustomListItem(parent)
@@ -27,8 +29,10 @@ void SafeModeController::onItemClicked()
         if (file.exists())
             file.remove();
 
-        // Ugly, but don't know any other way :/
-        system("killall sysuid");
+        QDBusInterface *unrestricted = new QDBusInterface("com.nokia.unrestricted", "/menuwindow", "com.nokia.unrestricted",
+                                                          QDBusConnection::sessionBus(), this);
+        unrestricted->call("resetMenuWidget");
+        delete unrestricted;
     } else if (result == QMessageBox::Help) {
         QDesktopServices::openUrl(QUrl("http://mohammadag.xceleo.org/system-ui-safe-mode-help.html"));
     }

src/systemui/scripts/root_helper.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+restart_sysuid()
+{
+		/sbin/initctl stop xsession/sysuid || echo "sysuid not running"
+		sleep 5
+		/sbin/initctl start xsession/sysuid
+}
+
+case "$1" in
+	"menu-modern")
+		sed -i -e "s/StatusIndicatorMenuVerticalView/StatusIndicatorMenuDropDownView/" /usr/share/themes/blanco/meegotouch/sysuid/sysuid.conf
+		restart_sysuid
+		;;
+	"menu-classic")
+		sed -i -e "s/StatusIndicatorMenuDropDownView/StatusIndicatorMenuVerticalView/" /usr/share/themes/blanco/meegotouch/sysuid/sysuid.conf
+		restart_sysuid
+		;;
+	*)
+		;;
+esac
+
+exit 0

src/systemui/scripts/setup.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if [ ! -d /home/user/.status-menu ]; then
+	"mkdir -p /home/user/.status-menu"
+fi
+if [ ! -f /home/user/.status-menu/items-order.conf ]; then
+	"cp -v /usr/share/sysuid/items-order.conf /home/user/.status-menu/"
+fi
+if [ ! -f /home/user/.status-menu/top-order.conf ]; then
+	"cp -v /usr/share/sysuid/top-order.conf /home/user/.status-menu/"
+fi
+if [ ! -f /home/user/.status-menu/pannable-order.conf ]; then
+	"cp -v /usr/share/sysuid/pannable-order.conf /home/user/.status-menu/"
+fi
+
+if [ -f /tmp/system-ui-crashed ]; then
+	rm /tmp/system-ui-crashed
+fi
+
+exit 0