* Fixes NB#90818, fixes a potential memory leak

[modest] / src / widgets / modest-window.c

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index c0e7830..cab203d 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -33,6 +33,7 @@
 #include "modest-tny-platform-factory.h"
 #include "modest-runtime.h"
 #include "modest-window-mgr.h"
+#include "modest-defs.h"
 #include <string.h> /* for strcmp */
 #include <gdk/gdkkeysyms.h>
 
@@ -87,8 +88,12 @@ modest_window_get_type (void)
                        (GInstanceInitFunc) modest_window_init,
                        NULL
                };
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
+               parent_type = HILDON_TYPE_STACKABLE_WINDOW;
+#else
                parent_type = HILDON_TYPE_WINDOW;
+#endif
 #else
                parent_type = GTK_TYPE_WINDOW;
 #endif 
@@ -156,6 +161,10 @@ modest_window_finalize (GObject *obj)
                g_object_unref (G_OBJECT(priv->ui_dimming_manager));
                priv->ui_dimming_manager = NULL;
        }
+       if (priv->dimming_state != NULL) {
+               g_slice_free (DimmedState, priv->dimming_state);
+               priv->dimming_state = NULL;
+       }
 
        g_free (priv->active_account);
        
@@ -424,7 +433,7 @@ on_key_pressed (GtkWidget *self,
        case GDK_Escape: 
                if (modest_window_mgr_get_fullscreen_mode (mgr))
                        modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
-               else if (MODEST_IS_MSG_VIEW_WINDOW (self)||MODEST_IS_MSG_EDIT_WINDOW (self))
+               else if (MODEST_IS_MSG_VIEW_WINDOW (self))
                        modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));
                break;
        }