#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-toolbar.h"
+#include "widgets/modest-combo-box.h"
G_BEGIN_DECLS
};
-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
+} ModestComboBoxType;
/**
*
* 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 (void);
/**
* modest_widget_factory_get_folder_view
* @self: a ModestWidgetFactory instance