* Add script for automatic network connectivity.

pmo-trunk-r325

diff --git a/src/hildon/Makefile.am b/src/hildon/Makefile.am
index ac195b5..6338c09 100644 (file)
--- a/src/hildon/Makefile.am
+++ b/src/hildon/Makefile.am
@@ -43,7 +43,8 @@ LDADD = \
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS) \
        $(MODEST_LIBTINYMAIL_MAEMO_LIBS)
 
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS) \
        $(MODEST_LIBTINYMAIL_MAEMO_LIBS)
 

-EXTRA_DIST=pixmaps/* glade/* modest.glade modest.gladep
+modestnet_SCRIPTS = modest.sh
+modestnetdir = $(prefix)/bin

 
 gladedir = $(prefix)/share/modest/glade
 glade_DATA = $(GLADE_FILES)
 
 gladedir = $(prefix)/share/modest/glade
 glade_DATA = $(GLADE_FILES)

@@ -56,7 +57,9 @@ desktopdir = $(datadir)/applications/hildon
 desktop_in_files = modest.desktop.in
 
 servicedir = $(datadir)/dbus-1/services
 desktop_in_files = modest.desktop.in
 
 servicedir = $(datadir)/dbus-1/services

-service_in_files = hildon/com.nokia.modest.service.in
+service_in_files = com.nokia.modest.service.in

 
 pixmaps_extradir = $(datadir)/pixmaps
 pixmaps_extra_DATA = modest.png
 
 pixmaps_extradir = $(datadir)/pixmaps
 pixmaps_extra_DATA = modest.png

+
+EXTRA_DIST=pixmaps/* glade/* modest.glade modest.gladep modest.png com.nokia.modest.service.in.in modest.desktop.in

diff --git a/src/hildon/com.nokia.modest.service.in b/src/hildon/com.nokia.modest.service.in
index 7ab396c..f1fd241 100644 (file)
--- a/src/hildon/com.nokia.modest.service.in
+++ b/src/hildon/com.nokia.modest.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.nokia.modest
 [D-BUS Service]
 Name=com.nokia.modest

-Exec=@prefix@/bin/modest
+Exec=@prefix@/bin/modest.sh

diff --git a/src/hildon/modest.desktop.in.in b/src/hildon/modest.desktop.in.in
index 9cc3d65..0e6400d 100644 (file)
--- a/src/hildon/modest.desktop.in.in
+++ b/src/hildon/modest.desktop.in.in
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 _Name=Modest eMail
 _Comment=The modest email application
 Encoding=UTF-8
 _Name=Modest eMail
 _Comment=The modest email application

-Exec=@prefix@/bin/modest
+Exec=@prefix@/bin/modest.sh

 Terminal=false
 Type=Application
 Icon=modest
 Terminal=false
 Type=Application
 Icon=modest

diff --git a/src/hildon/modest.sh b/src/hildon/modest.sh
new file mode 100755 (executable)
index 0000000..55f69af
--- /dev/null
+++ b/src/hildon/modest.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+. /usr/bin/connectivity_preload.sh
+/usr/bin/modest