From d7e33ade95353b6a87387032584f39bee0cb7c9b Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 22 Jul 2007 11:53:46 +0000 Subject: [PATCH] 2007-07-22 [colin] 2.10.0cvs53 * src/main.c Maemo: Fix the strange "top_application" info at startup. We should do something when receiving such a message. --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/main.c | 8 ++++++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c57fe75b..d612a6fad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-22 [colin] 2.10.0cvs53 + + * src/main.c + Maemo: Fix the strange "top_application" info + at startup. We should do something when + receiving such a message. + 2007-07-20 [paul] 2.10.0cvs52 * src/news_gtk.c diff --git a/PATCHSETS b/PATCHSETS index d537a09b3..846c12c62 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2706,3 +2706,4 @@ ( cvs diff -u -r 1.83.2.111 -r 1.83.2.112 src/mimeview.c; cvs diff -u -r 1.25.2.43 -r 1.25.2.44 src/stock_pixmap.c; ) > 2.10.0cvs50.patchset ( cvs diff -u -r 1.213.2.150 -r 1.213.2.151 src/folder.c; cvs diff -u -r 1.87.2.44 -r 1.87.2.45 src/folder.h; cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/folder_item_prefs.c; cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/folder_item_prefs.h; cvs diff -u -r 1.207.2.168 -r 1.207.2.169 src/folderview.c; cvs diff -u -r 1.179.2.176 -r 1.179.2.177 src/imap.c; cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/imap_gtk.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/imap_gtk.h; cvs diff -u -r 1.101.2.39 -r 1.101.2.40 src/news.c; cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/news_gtk.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/news_gtk.h; cvs diff -u -r 1.52.2.41 -r 1.52.2.42 src/prefs_folder_item.c; cvs diff -u -r 1.43.2.77 -r 1.43.2.78 src/toolbar.c; cvs diff -u -r 1.19.2.20 -r 1.19.2.21 src/toolbar.h; cvs diff -u -r 1.12.2.22 -r 1.12.2.23 src/plugins/dillo_viewer/dillo_viewer.c; ) > 2.10.0cvs51.patchset ( cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/news_gtk.c; ) > 2.10.0cvs52.patchset +( cvs diff -u -r 1.115.2.160 -r 1.115.2.161 src/main.c; ) > 2.10.0cvs53.patchset diff --git a/configure.ac b/configure.ac index fa722cb28..fd3c60205 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=52 +EXTRA_VERSION=53 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/main.c b/src/main.c index 66835aa39..e3df50307 100644 --- a/src/main.c +++ b/src/main.c @@ -234,6 +234,10 @@ gint dbus_req_handler(const gchar * interface, const gchar * method, AppData *appdata; appdata = (AppData *) data; + if (!strcmp(method, "top_application")) { + osso_rpc_free_val(retval); + return OSSO_OK; + } osso_system_note_infoprint(appdata->osso_context, method, retval); osso_rpc_free_val(retval); @@ -1053,14 +1057,14 @@ int main(int argc, char *argv[]) } plugin_load_standard_plugins (); - + /* if not crashed, show window now */ if (!claws_crashed()) { /* apart if something told not to show */ if (show_at_startup) main_window_popup(mainwin); } - + if (!folder_have_mailbox()) { prefs_destroy_cache(); main_window_cursor_normal(mainwin); -- 2.25.1