Merge branch 'modest-3-0' into part-to-stream-in-plugins

diff --git a/debian/changelog b/debian/changelog
index 5e4d9d1..717c8ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,53 @@
+modest (3.0.17-rc45) unstable; urgency=low
+
+  * Week 36, 2009 - fourth release
+  * 
+  * Fixes: NB#134700 Email application active, no sound after send & receive or timed retrieval 
+  *
+
+ -- Moises Martinez <moises.martinez@nokia.com>  Tue, 01 Sep 2009 10:43:13 +0300
+
+modest (3.0.17-rc44) unstable; urgency=low
+
+  * Week 36, 2009 - third release
+  *
+  * Fixes: NB#131351 Modest crash in ssl_Read () from /usr/lib/microb-engine/libssl3.so
+  * Fixes: NB#134642 Random crash in "on_header_view_model_destroyed"
+  * Fixes: NB#136024 Corematic: crash in " do_notify_in_idle_destroy " 
+
+ -- Moises Martinez <moises.martinez@nokia.com>  Mon, 31 Aug 2009 12:02:03 +0300
+
+modest (3.0.17-rc43) unstable; urgency=low
+
+  * Week 36, 2009 - second release
+  *
+  * Fixes: NB#101571  Modest crashes at 'on_attach_file_response' while selecting 
+  *    a file from MMC for attachment.
+  * Fixes: NB#131550  Send and Receive Email manually
+  * Fixes: NB#135191  Checking names in editor: if small letter is used then Contacts 
+  *    starting from this letter are not shown 
+
+ -- Moises Martinez <moises.martinez@nokia.com>  Fri, 28 Aug 2009 10:59:49 +0300
+
+modest (3.0.17-rc42) unstable; urgency=low
+
+  * Week 36, 2009 - first release
+  *
+  * Fixes: NB#135412 Message view background in header area should be grey
+  * Fixes: NB#114929 Mail on Ovi: username field in the Account setup wizard should be 
+  *    prefilled with @ovi.com 
+  * Fixes: NB#134700 Email application active, no sound after send & receive or timed retrieval
+
+ -- Moises Martinez <moises.martinez@nokia.com>  Thu, 27 Aug 2009 16:10:30 +0300
+
+modest (3.0.17-rc41) unstable; urgency=low
+
+  * Week 35, 2009 - sixth release
+  * 
+  * Fixes: NB#135054 Email Default update values should be changed
+
+ -- Moises Martinez <moises.martinez@nokia.com>  Wed, 26 Aug 2009 12:31:26 +0300
+
 modest (3.0.17-rc40) unstable; urgency=low
 
   * Week 35, 2009 - fifth release

diff --git a/src/hildon2/modest-clean.sh b/src/hildon2/modest-clean.sh
index 0d3cf79..66817b9 100755 (executable)
--- a/src/hildon2/modest-clean.sh
+++ b/src/hildon2/modest-clean.sh
@@ -7,4 +7,11 @@ PIDS=`pidof modest` && kill -15 $PIDS
 # Removing modest user data folder
 rm -rf /home/user/.modest
 
+# Restore the security modules settings
+if [ -f "/usr/bin/nsscfg" ] ; then
+nsscfg -c /home/user/.modest/cache   -m "Maemosec certificates" -l /usr/lib/libmaemosec_certman.so.0
+fi
+
+
+
 exit 0

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index 2ceee3d..76adeaa 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -88,6 +88,7 @@ struct _ModestHeaderWindowPrivate {
        GSList *sighandlers;
        gulong queue_change_handler;
        gulong sort_column_handler;
+       gulong notify_model;
 
        /* progress hint */
        gboolean progress_hint;
@@ -254,6 +255,7 @@ modest_header_window_init (ModestHeaderWindow *obj)
        priv->new_message_button = NULL;
        priv->x_coord = 0;
        priv->y_coord = 0;
+       priv->notify_model = 0;
 
        modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
                                            GTK_WINDOW(obj),
@@ -315,6 +317,11 @@ modest_header_window_disconnect_signals (ModestWindow *self)
 
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
 
+       if (g_signal_handler_is_connected ((GObject*) priv->header_view, priv->notify_model)) {
+               g_signal_handler_disconnect ((GObject*) priv->header_view, priv->notify_model);
+               priv->notify_model = 0;
+       }
+
        if (g_signal_handler_is_connected (G_OBJECT (modest_runtime_get_mail_operation_queue ()), 
                                           priv->queue_change_handler)) {
                g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), 
@@ -610,8 +617,9 @@ create_header_view (ModestWindow *self, TnyFolder *folder)
        ModestHeaderWindowPrivate *priv;
 
        header_view  = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES);
-       g_signal_connect ((GObject*) header_view, "notify::model",
-                         G_CALLBACK (on_header_view_model_changed), self);
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+       priv->notify_model = g_signal_connect ((GObject*) header_view, "notify::model",
+                                              G_CALLBACK (on_header_view_model_changed), self);
 
        modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder,
                                       TRUE, self, folder_refreshed_cb, self);
@@ -621,7 +629,6 @@ create_header_view (ModestWindow *self, TnyFolder *folder)
                                      MODEST_CONF_HEADER_VIEW_KEY);
 
        /* Create CSM menu */
-       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
        priv->csm_menu = gtk_menu_new ();
        delete_item = gtk_menu_item_new_with_label (_HL("wdgt_bd_delete"));
        mark_read_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_read"));

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index e857ca9..f8554c1 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -111,6 +111,7 @@
 #define MODEST_ALARMD_APPID PACKAGE_NAME
 
 static ca_context *ca_con = NULL;
+static gboolean ca_con_opened = FALSE;
 
 
 static void modest_platform_play_email_tone (void);
@@ -2663,9 +2664,13 @@ modest_platform_play_email_tone (void)
                        }
                }
 
-               if ((ret = ca_context_open(ca_con)) != CA_SUCCESS) {
-                       g_warning("ca_context_open: %s\n", ca_strerror(ret));
-                       return;
+               if (!ca_con_opened) {
+                       if ((ret = ca_context_open(ca_con)) != CA_SUCCESS) {
+                               g_warning("ca_context_open: %s\n", ca_strerror(ret));
+                               return;
+                       } else {
+                               ca_con_opened = TRUE;
+                       }
                }
 
                ca_proplist_create(&pl);

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index aa1d1cd..90d1943 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -1595,7 +1595,6 @@ update_account_get_msg_async_cb (TnyFolder *folder,
                /* Call the user callback and free */
                new_headers = tny_iterator_get_list (msg_info->more_msgs);
                update_account_notify_user_and_free (info, new_headers);
-               g_object_unref (new_headers);
 
                /* Delete the helper */
                g_object_unref (msg_info->more_msgs);