* tests:

[modest] / src / modest-widget-factory.h

diff --git a/src/modest-widget-factory.h b/src/modest-widget-factory.h
index 4c023f3..7c0db2e 100644 (file)
--- a/src/modest-widget-factory.h
+++ b/src/modest-widget-factory.h
@@ -30,16 +30,13 @@
 #ifndef __MODEST_WIDGET_FACTORY_H__
 #define __MODEST_WIDGET_FACTORY_H__
 
-#include <glib-object.h>
-#include <glib/gi18n.h>
-#include <modest-account-mgr.h>
-#include <modest-tny-account-store.h>
-
-#include <widgets/modest-header-view.h>
-#include <widgets/modest-folder-view.h>
-#include <widgets/modest-msg-view.h>
-#include <widgets/modest-account-view.h>
-#include <widgets/modest-toolbar.h>
+#include "modest-account-mgr.h"
+#include "modest-tny-account-store.h"
+#include "widgets/modest-header-view.h"
+#include "widgets/modest-folder-view.h"
+#include "widgets/modest-msg-view.h"
+#include "widgets/modest-account-view.h"
+#include "widgets/modest-combo-box.h"
 
 G_BEGIN_DECLS
 
@@ -56,23 +53,21 @@ 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); */
 };
 
 
-enum _ModestComboBoxType {
+typedef enum _ModestComboBoxType {
        MODEST_COMBO_BOX_TYPE_STORE_PROTOS,
        MODEST_COMBO_BOX_TYPE_TRANSPORT_PROTOS,
        MODEST_COMBO_BOX_TYPE_SECURITY_PROTOS,
        MODEST_COMBO_BOX_TYPE_AUTH_PROTOS,
-};
-typedef enum _ModestComboBoxType ModestComboBoxType;
+       MODEST_COMBO_BOX_TYPE_TRANSPORTS,
+       MODEST_COMBO_BOX_TYPE_REMOTE_STORES
+} ModestComboBoxType;
 
 
 /**
@@ -87,17 +82,15 @@ GType        modest_widget_factory_get_type    (void) G_GNUC_CONST;
 
 /**
  * modest_widget_factory_new
- * @conf: a modest conf instance
- * @acc_store: a modest account store instance
- * @acc_mgr: a modest account mgr instance
- *
+ * @account_store: a valid ModestTnyAccountStore instance
+ * 
  * instantiates a ModestWidgetFactory
  *
  * Returns: a new ModestWidgetFactory, or NULL in case of error
  */
-ModestWidgetFactory*      modest_widget_factory_new   (ModestConf *conf,
-                                                      ModestTnyAccountStore *acc_store,
-                                                      ModestAccountMgr *account_mgr);
+ModestWidgetFactory*      modest_widget_factory_new   (ModestTnyAccountStore *account_store);
+
+
 /**
  * modest_widget_factory_get_folder_view
  * @self: a ModestWidgetFactory instance
@@ -137,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);
 
 
 /**
@@ -202,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