Add support for cud scripts in maemo and hildon2 (fixes NB#87448)

pmo-trunk-r7157

diff --git a/configure.ac b/configure.ac
index 335b527..e1a3700 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -501,6 +501,7 @@ if test "x$with_platform" == "xmaemo"; then
    serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services
    localedir=`$PKG_CONFIG osso-af-settings --variable=localedir`
    backupsettingsdir=/etc/osso-backup/applications
    serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services
    localedir=`$PKG_CONFIG osso-af-settings --variable=localedir`
    backupsettingsdir=/etc/osso-backup/applications

+   ossocudscriptsdir=/etc/osso-cud-scripts

    pixmapdir=`$PKG_CONFIG osso-af-settings --variable=hildonpixmapdir`
    icon_26x26dir=$datadir/icons/hicolor/26x26/hildon
    icon_34x34dir=$datadir/icons/hicolor/34x34/hildon
    pixmapdir=`$PKG_CONFIG osso-af-settings --variable=hildonpixmapdir`
    icon_26x26dir=$datadir/icons/hicolor/26x26/hildon
    icon_34x34dir=$datadir/icons/hicolor/34x34/hildon

@@ -517,6 +518,7 @@ if test "x$with_platform" == "xmaemo"; then
    AC_SUBST(desktopentrydir)
    AC_SUBST(serviceentrydir)
    AC_SUBST(backupsettingsdir)
    AC_SUBST(desktopentrydir)
    AC_SUBST(serviceentrydir)
    AC_SUBST(backupsettingsdir)

+   AC_SUBST(ossocudscriptsdir)

    AC_SUBST(localedir)
    AC_SUBST(pixmapdir)
    AC_SUBST(icon_26x26dir)
    AC_SUBST(localedir)
    AC_SUBST(pixmapdir)
    AC_SUBST(icon_26x26dir)

diff --git a/debian/modest.install b/debian/modest.install
index 958a75c..65d5472 100644 (file)
--- a/debian/modest.install
+++ b/debian/modest.install
@@ -8,3 +8,4 @@ usr/share/modest/ui/*
 usr/share/modest/provider-data/*
 usr/share/pixmaps/modest/*
 etc/osso-backup/applications/modest.conf
 usr/share/modest/provider-data/*
 usr/share/pixmaps/modest/*
 etc/osso-backup/applications/modest.conf

+etc/osso-cud-scripts/modest-clean.sh

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index 580c554..baffdb8 100644 (file)
--- a/src/hildon2/Makefile.am
+++ b/src/hildon2/Makefile.am
@@ -129,6 +129,7 @@ ui_DATA = $(UI_FILES)
 serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
 serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf

+ossocudscripts_DATA = modest-clean.sh

 
 # mcc_mapping may be provided by the operator-wizard-settings package:
 # the one here is a copy, as that package is not available in chinook
 
 # mcc_mapping may be provided by the operator-wizard-settings package:
 # the one here is a copy, as that package is not available in chinook

@@ -146,5 +147,6 @@ EXTRA_DIST=\
        $(serviceentry_DATA) \
        $(desktopentry_DATA) \
        $(backupsettings_DATA) \
        $(serviceentry_DATA) \
        $(desktopentry_DATA) \
        $(backupsettings_DATA) \

+       $(ossocudscripts_DATA) \

        $(MMC_MAPPING_FILE)    \
        $(PROVIDER_DATA_FILE)
        $(MMC_MAPPING_FILE)    \
        $(PROVIDER_DATA_FILE)

diff --git a/src/hildon2/modest-clean.sh b/src/hildon2/modest-clean.sh
new file mode 100644 (file)
index 0000000..305650f
--- /dev/null
+++ b/src/hildon2/modest-clean.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+rm -rf /home/user/.modest
+
+return 0

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index fb3e01e..004fc45 100644 (file)
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -117,6 +117,7 @@ ui_DATA = $(UI_FILES)
 serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
 serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf

+ossocudscripts_DATA = modest-clean.sh

 
 icon_26x26_DATA     = pixmaps/modest-icon.png
 
 
 icon_26x26_DATA     = pixmaps/modest-icon.png
 

@@ -126,4 +127,5 @@ EXTRA_DIST=\
        $(serviceentry_DATA) \
        $(desktopentry_DATA) \
        $(backupsettings_DATA) \
        $(serviceentry_DATA) \
        $(desktopentry_DATA) \
        $(backupsettings_DATA) \

+       $(ossocudscripts_DATA) \

        $(icon_26x26_DATA)      
        $(icon_26x26_DATA)      

diff --git a/src/maemo/modest-clean.sh b/src/maemo/modest-clean.sh
new file mode 100644 (file)
index 0000000..305650f
--- /dev/null
+++ b/src/maemo/modest-clean.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+rm -rf /home/user/.modest
+
+return 0