* make the startup banner / dbus invocation work. this fixes NB#55355

pmo-trunk-r1807

diff --git a/configure.ac b/configure.ac
index b75711f..bf889e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 

-AC_INIT([modest],[0.0.1],[http://maemo.org])
+AC_INIT([modest],[1.0],[http://maemo.org])

 AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_SRCDIR(src/modest-main.c)
 AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_SRCDIR(src/modest-main.c)

@@ -219,7 +219,7 @@ docs/reference/Makefile
 tests/Makefile
 tests/dbus_api/Makefile
 src/maemo/modest.desktop
 tests/Makefile
 tests/dbus_api/Makefile
 src/maemo/modest.desktop

-src/maemo/modest.service
+src/maemo/com.nokia.modest.service

 libmodest-dbus-client/Makefile
 libmodest-dbus-client/libmodest-dbus-client-1.0.pc
 ])
 libmodest-dbus-client/Makefile
 libmodest-dbus-client/libmodest-dbus-client-1.0.pc
 ])

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index eb0283b..f7d2a93 100644 (file)
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -96,7 +96,7 @@ UI_FILES=\
 uidir = $(datadir)/modest/ui
 ui_DATA = $(UI_FILES)
 
 uidir = $(datadir)/modest/ui
 ui_DATA = $(UI_FILES)
 

-serviceentry_DATA = modest.service
+serviceentry_DATA = com.nokia.modest.service

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

diff --git a/src/maemo/com.nokia.modest.service.in b/src/maemo/com.nokia.modest.service.in
new file mode 100644 (file)
index 0000000..7ab396c
--- /dev/null
+++ b/src/maemo/com.nokia.modest.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.nokia.modest
+Exec=@prefix@/bin/modest

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index d57b6f1..ee77522 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -51,10 +51,11 @@ static osso_context_t *osso_context = NULL;
        
 gboolean
 modest_platform_init (void)
        
 gboolean
 modest_platform_init (void)

-{      
+{
+       osso_hw_state_t hw_state = { 0 };       

        osso_context =
        osso_context =

-               osso_initialize(PACKAGE, PACKAGE_VERSION,
-                               TRUE, NULL);    
+               osso_initialize(PACKAGE,PACKAGE_VERSION,
+                               FALSE, NULL);   

        if (!osso_context) {
                g_printerr ("modest: failed to acquire osso context\n");
                return FALSE;
        if (!osso_context) {
                g_printerr ("modest: failed to acquire osso context\n");
                return FALSE;

@@ -83,7 +84,8 @@ modest_platform_init (void)
        */
 
        /* Register hardware event dbus callback: */
        */
 
        /* Register hardware event dbus callback: */

-    osso_hw_set_event_cb(osso_context, NULL, modest_osso_cb_hw_state_handler, NULL);
+       hw_state.shutdown_ind = TRUE;
+       osso_hw_set_event_cb(osso_context, NULL,/*&hw_state*/ modest_osso_cb_hw_state_handler, NULL);

 
        /* Register osso auto-save callbacks: */
        result = osso_application_set_autosave_cb (osso_context, 
 
        /* Register osso auto-save callbacks: */
        result = osso_application_set_autosave_cb (osso_context, 

diff --git a/src/maemo/modest.desktop.in b/src/maemo/modest.desktop.in
index fd0861d..2d66573 100644 (file)
--- a/src/maemo/modest.desktop.in
+++ b/src/maemo/modest.desktop.in
@@ -1,13 +1,12 @@
 [Desktop Entry]
 Encoding=UTF-8
 [Desktop Entry]
 Encoding=UTF-8

-Version=1.0
+Version=@PACKAGE_VERSION@

 Type=Application
 Name=mcen_ap_name
 Comment=mcen_ap_name_thumb
 Exec=@prefix@/bin/modest
 
 Type=Application
 Name=mcen_ap_name
 Comment=mcen_ap_name_thumb
 Exec=@prefix@/bin/modest
 

-#don't kill our app
-#X-Osso-Service=org.maemo.modest
+X-Osso-Service=com.nokia.modest

 X-Osso-Type=application/x-executable
 
 Icon=qgn_list_messagin
 X-Osso-Type=application/x-executable
 
 Icon=qgn_list_messagin

diff --git a/src/maemo/modest.service.in b/src/maemo/modest.service.in
deleted file mode 100644 (file)
index 609cebf..0000000
--- a/src/maemo/modest.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.maemo.modest
-Exec=@prefix@/bin/modest