X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-widget-factory.h;h=7c0db2e5cbed3b956963671c45d8a2dbb6ea8a19;hp=07a3fe70a7fdcacdfe07b767e3c932aa03f6dd8c;hb=cebdc6df11ee006640d5e25233c20059f567e4fb;hpb=b514a9816530ec797b0f9b8b026d557695d4870d

diff --git a/src/modest-widget-factory.h b/src/modest-widget-factory.h
index 07a3fe7..7c0db2e 100644
--- a/src/modest-widget-factory.h
+++ b/src/modest-widget-factory.h
@@ -36,7 +36,6 @@
 #include "widgets/modest-folder-view.h"
 #include "widgets/modest-msg-view.h"
 #include "widgets/modest-account-view.h"
-#include "widgets/modest-toolbar.h"
 #include "widgets/modest-combo-box.h"
 
 G_BEGIN_DECLS
@@ -54,13 +53,10 @@ typedef struct _ModestWidgetFactoryClass ModestWidgetFactoryClass;
 
 struct _ModestWidgetFactory {
 	 GObject parent;
-	/* insert public members, if any */
 };
 
 struct _ModestWidgetFactoryClass {
 	GObjectClass parent_class;
-	/* insert signal callback declarations, eg. */
-	/* void (* my_event) (ModestWidgetFactory* obj); */
 };
 
 
@@ -69,7 +65,8 @@ typedef enum _ModestComboBoxType {
 	MODEST_COMBO_BOX_TYPE_TRANSPORT_PROTOS,
 	MODEST_COMBO_BOX_TYPE_SECURITY_PROTOS,
 	MODEST_COMBO_BOX_TYPE_AUTH_PROTOS,
-	MODEST_COMBO_BOX_TYPE_TRANSPORTS
+	MODEST_COMBO_BOX_TYPE_TRANSPORTS,
+	MODEST_COMBO_BOX_TYPE_REMOTE_STORES
 } ModestComboBoxType;
 
 
@@ -85,12 +82,15 @@ GType        modest_widget_factory_get_type    (void) G_GNUC_CONST;
 
 /**
  * modest_widget_factory_new
- *
+ * @account_store: a valid ModestTnyAccountStore instance
+ * 
  * instantiates a ModestWidgetFactory
  *
  * Returns: a new ModestWidgetFactory, or NULL in case of error
  */
-ModestWidgetFactory*      modest_widget_factory_new   (void);
+ModestWidgetFactory*      modest_widget_factory_new   (ModestTnyAccountStore *account_store);
+
+
 /**
  * modest_widget_factory_get_folder_view
  * @self: a ModestWidgetFactory instance
@@ -130,7 +130,7 @@ ModestHeaderView*    modest_widget_factory_get_header_view (ModestWidgetFactory
  *
  * Returns: a header tree view, or NULL in case of error
  */
-ModestMsgView*           modest_widget_factory_get_msg_preview (ModestWidgetFactory *self);
+ModestMsgView*        modest_widget_factory_get_msg_preview (ModestWidgetFactory *self);
 
 
 /**
@@ -195,58 +195,26 @@ GtkWidget*     modest_widget_factory_get_combo_box (ModestWidgetFactory *self,
 
 
 /**
- * modest_widget_factory_get_online_combo
+ * modest_widget_factory_get_online_toggle
  * @self: a ModestWidgetFactory instance
- * 
+ *
  * return a toggle which with one can see whether online/offline mode is active.
  * In case of auto-connect, this will automatically be sync'd with the
  * account_store / device
- *  
- * Returns: the combo box
+ *
+ * Returns: the toggle button
  */
 GtkWidget*  modest_widget_factory_get_online_toggle (ModestWidgetFactory *self);
 
-
-
-
 /**
  * modest_widget_factory_get_folder_info_label
  * @self: a ModestWidgetFactory instance
- * 
- * return a label with the number of items, unread items in the current folder
- *  
- * Returns: the label
- */
-GtkWidget* modest_widget_factory_get_folder_info_label (ModestWidgetFactory *self);
-
-
-/**
- * modest_widget_factory_get_main_toolbar
- * @self: a ModestWidgetFactory instance
- * @items: a list of ModestToolbarButtons (button_ids)
  *
- * returns the main toolbar widget; their enabled/disabled state synchronized with
- * the other widgets. Note that after the first calling, this function will
- * always return the same toolbar, regardless of the items
- *  
- * Returns: the toolbar
- */
-ModestToolbar *modest_widget_factory_get_main_toolbar (ModestWidgetFactory *self, 
-						       GSList *items);
-
-/**
- * modest_widget_factory_get_edit_toolbar
- * @self: a ModestWidgetFactory instance
- * @items: a list of ModestToolbarButtons (button_ids)
+ * return a label with the number of items, unread items in the current folder
  *
- * returns the toolbar widget for edit windows; the enabled/disabled
- * state synchronized with the other widgets.
- *  
- * Returns: the toolbar
+ * Returns: the label
  */
-ModestToolbar *modest_widget_factory_get_edit_toolbar (ModestWidgetFactory *self, 
-						       GSList *items);
-
+GtkWidget*  modest_widget_factory_get_folder_info_label (ModestWidgetFactory *self);
 
 G_END_DECLS