* restore gnome building (check for easysetup)

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

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index 6132053..a5a667d 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -64,11 +64,11 @@ modest_window_get_type (void)
                        (GInstanceInitFunc) modest_window_init,
                        NULL
                };
                        (GInstanceInitFunc) modest_window_init,
                        NULL
                };

-#if MODEST_PLATFORM_ID==1   /* gtk */
-               parent_type = GTK_TYPE_WINDOW;
-#elif MODEST_PLATFORM_ID==2   /* hildon (maemo) */
+#ifdef MODEST_PLATFORM_MAEMO

                parent_type = HILDON_TYPE_WINDOW;
                parent_type = HILDON_TYPE_WINDOW;

-#endif
+#else
+               parent_type = GTK_TYPE_WINDOW;
+#endif 

                my_type = g_type_register_static (parent_type,
                                                  "ModestWindow",
                                                  &my_info, 
                my_type = g_type_register_static (parent_type,
                                                  "ModestWindow",
                                                  &my_info, 

@@ -96,9 +96,11 @@ modest_window_init (ModestWindow *obj)
 
        priv = MODEST_WINDOW_GET_PRIVATE(obj);
 
 
        priv = MODEST_WINDOW_GET_PRIVATE(obj);
 

-       priv->ui_manager    = NULL;
-       priv->toolbar       = NULL;
-       priv->menubar       = NULL;
+       priv->ui_manager     = NULL;
+       priv->toolbar        = NULL;
+       priv->menubar        = NULL;
+
+       priv->active_account = NULL;

 }
 
 static void
 }
 
 static void

@@ -113,5 +115,32 @@ modest_window_finalize (GObject *obj)
                priv->ui_manager = NULL;
        }
 
                priv->ui_manager = NULL;
        }
 

+       g_free (priv->active_account);
+       

        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }

+
+
+
+const gchar*
+modest_window_get_active_account (ModestWindow *self)
+{
+       g_return_val_if_fail (self, NULL);
+
+       return MODEST_WINDOW_GET_PRIVATE(self)->active_account;
+}
+
+void
+modest_window_set_active_account (ModestWindow *self, const gchar *active_account)
+{
+       ModestWindowPrivate *priv;      
+
+       priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+       if (active_account == priv->active_account)
+               return;
+       else {
+               g_free (priv->active_account);
+               priv->active_account = g_strdup (active_account);
+       }
+}