* restore gnome building (check for easysetup)

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

diff --git a/src/widgets/modest-window.h b/src/widgets/modest-window.h
index fa574fe..8902355 100644 (file)
--- a/src/widgets/modest-window.h
+++ b/src/widgets/modest-window.h
@@ -32,7 +32,6 @@
 
 #include <glib-object.h>
 #include <tny-account-store.h>
 
 #include <glib-object.h>
 #include <tny-account-store.h>

-#include "modest-widget-factory.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

@@ -44,15 +43,17 @@ G_BEGIN_DECLS
  * admittedly, the ifdefs for gtk and maemo are rather ugly; still
  * this way is probably the easiest to maintain
  */
  * admittedly, the ifdefs for gtk and maemo are rather ugly; still
  * this way is probably the easiest to maintain
  */

-#if MODEST_PLATFORM_ID==1   /* gtk */
+#ifdef MODEST_PLATFORM_GNOME

 #include <gtk/gtkwindow.h>
 typedef GtkWindow      ModestWindowParent;
 typedef GtkWindowClass ModestWindowParentClass;
 #include <gtk/gtkwindow.h>
 typedef GtkWindow      ModestWindowParent;
 typedef GtkWindowClass ModestWindowParentClass;

-#elif MODEST_PLATFORM_ID==2   /* hildon (maemo) */
+#endif /* MODEST_PLATFORM_GNOME */
+
+#ifdef MODEST_PLATFORM_MAEMO

 #include <hildon-widgets/hildon-window.h>
 typedef HildonWindow      ModestWindowParent;
 typedef HildonWindowClass ModestWindowParentClass;
 #include <hildon-widgets/hildon-window.h>
 typedef HildonWindow      ModestWindowParent;
 typedef HildonWindowClass ModestWindowParentClass;

-#endif /*MODEST_PLATFORM_ID*/
+#endif /*MODEST_PLATFORM_MAEMO */

 
 /* convenience macros */
 #define MODEST_TYPE_WINDOW             (modest_window_get_type())
 
 /* convenience macros */
 #define MODEST_TYPE_WINDOW             (modest_window_get_type())

@@ -73,30 +74,37 @@ struct _ModestWindowClass {
        ModestWindowParentClass parent_class;
 };
 
        ModestWindowParentClass parent_class;
 };
 

-/* member functions */
+/**
+ * modest_window_get_type:
+ *
+ * get the #GType for #ModestWindow
+ * 
+ * Returns: the type
+ */    

 GType        modest_window_get_type    (void) G_GNUC_CONST;
 
 GType        modest_window_get_type    (void) G_GNUC_CONST;
 

+

 /**
 /**

- * modest_window_get_account_store:
- * @window: a #ModestWindow
+ * modest_window_get_active_account:
+ * @self: a modest window instance

  * 
  * 

- * gets a new reference to the account store associated with the main
- * window. The caller must free the returned instance
+ * get the name of the active account

  * 
  * 

- * Returns: the account store
- **/
-TnyAccountStore*        modest_window_get_account_store     (ModestWindow *window);
+ * Returns: the active account name as a constant string
+ */    
+const gchar* modest_window_get_active_account (ModestWindow *self);
+
+

 
 /**
 
 /**

- * modest_window_get_widget_factory:
- * @window: a #ModestWindow
+ * modest_window_set_active_account:
+ * @self: a modest window instance
+ * @active_account: a new active account name for this window

  * 
  * 

- * gets a reference to the #ModestWidgetFactory associated with the
- * Modest Window. The caller must free the returned instance
+ * set the active account for this window

  * 
  * 

- * Returns: the widget factory
- **/
-ModestWidgetFactory*    modest_window_get_widget_factory    (ModestWindow *window);
+ */    
+void modest_window_set_active_account (ModestWindow *self, const gchar *active_account);

 
 
 G_END_DECLS
 
 
 G_END_DECLS