X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-widget-factory.h;h=694f0ee879b6c4d12e51d3779e3c38386139dc53;hp=25810d024b6c4c07de4bd3cd990069d27d9ea3ca;hb=cd391684b9e177e208e90bcd53da83e871e06de5;hpb=9ad90e9053e1e0cc87885f714f513061ac734632

diff --git a/src/modest-widget-factory.h b/src/modest-widget-factory.h
index 25810d0..694f0ee 100644
--- a/src/modest-widget-factory.h
+++ b/src/modest-widget-factory.h
@@ -30,17 +30,14 @@
 #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 <widgets/modest-combo-box.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
 
@@ -67,14 +64,14 @@ struct _ModestWidgetFactoryClass {
 };
 
 
-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,
 	MODEST_COMBO_BOX_TYPE_TRANSPORTS
-};
-typedef enum _ModestComboBoxType ModestComboBoxType;
+} ModestComboBoxType;
+/* typedef enum _ModestComboBoxType ModestComboBoxType; */
 
 
 /**
@@ -97,9 +94,7 @@ GType        modest_widget_factory_get_type    (void) G_GNUC_CONST;
  *
  * 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