Fixes NB#139637, coverity defects in modest

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

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index 280eeda..ea9c1dd 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -35,13 +35,15 @@
 #include "modest-window-mgr.h"
 #include "modest-defs.h"
 #include <string.h> /* for strcmp */
-#include <hildon/hildon-defines.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>
 #include <X11/XKBlib.h>
 #include <X11/Xdmcp.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-defines.h>
+#endif
 
 /* 'private'/'protected' functions */
 static void modest_window_class_init (ModestWindowClass *klass);
@@ -182,7 +184,7 @@ modest_window_finalize (GObject *obj)
 static void
 modest_window_dispose (GObject *obj)
 {
-       ModestWindowPrivate *priv;      
+       ModestWindowPrivate *priv;
 
        priv = MODEST_WINDOW_GET_PRIVATE(obj);
 
@@ -197,6 +199,7 @@ modest_window_dispose (GObject *obj)
                g_object_unref (G_OBJECT(priv->ui_dimming_manager));
                priv->ui_dimming_manager = NULL;
        }
+
        G_OBJECT_CLASS(parent_class)->dispose (obj);
 }