* leak fix (modest-init)

* modest-main: sometimes, 'ui' was a not a valid gobject, which caused glib warnings

pmo-trunk-r2440

diff --git a/src/modest-init.c b/src/modest-init.c
index 706c0e4..b805bff 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -304,6 +304,7 @@ save_header_settings (ModestConf *conf, TnyFolderType type,
         * there was nothing before */
        if (!overwrite &&  modest_conf_key_exists(conf, key, NULL)) {
                g_free (key);
+               g_free (sort_key);
                return TRUE;
        }
 

diff --git a/src/modest-main.c b/src/modest-main.c
index 0682b88..82c4385 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -150,7 +150,7 @@ main (int argc, char *argv[])
                        GtkWidget *ui = NULL;
                        retval = start_ui (account_or_default,
                                           mailto, cc, bcc, subject, body, &ui);
-                       if (ui) 
+                       if (G_IS_OBJECT(ui))    
                                g_signal_connect (G_OBJECT (ui), "show", G_CALLBACK(on_show), NULL);
                }
        } else {