* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-/* modest-ui.c */
-
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <glib/gi18n.h>
#include "../modest-identity-mgr.h"
#include "../modest-tny-account-store.h"
-#include "../modest-tny-folder-tree-view.h"
-#include "../modest-tny-header-tree-view.h"
-#include "../modest-tny-msg-view.h"
+#include "../widgets/modest-folder-view.h"
+#include "../widgets/modest-header-view.h"
+#include "../widgets/modest-msg-view.h"
#include "../modest-tny-transport-actions.h"
#include "../modest-tny-store-actions.h"
static void modest_ui_class_init (ModestUIClass *klass);
static void modest_ui_init (ModestUI *obj);
static void modest_ui_finalize (GObject *obj);
-
-static void modest_ui_window_destroy (GtkWidget *win, GdkEvent *event, gpointer data);
static void modest_ui_last_window_closed (GObject *obj, gpointer data);
gchar *on_password_requested (TnyAccountIface *, const gchar *, gboolean *);
{
ModestUIPrivate *priv = user_data;
- g_return_if_fail (MODEST_IS_TNY_FOLDER_TREE_VIEW (priv->folder_view));
- g_return_if_fail (MODEST_IS_TNY_HEADER_TREE_VIEW (priv->header_view));
+ g_return_if_fail (MODEST_IS_FOLDER_VIEW (priv->folder_view));
+ g_return_if_fail (MODEST_IS_HEADER_VIEW (priv->header_view));
- modest_tny_header_tree_view_set_folder (priv->header_view, NULL);
+ modest_header_view_set_folder (MODEST_HEADER_VIEW(priv->header_view),
+ NULL);
- modest_tny_folder_tree_view_update_model(priv->folder_view, account_store);
+ // modest_folder_view_update_model(MODEST_FOLDER_VIEW(priv->folder_view),
+ // TNY_ACCOUNT_STORE_IFACE(account_store));
}
-GObject*
+ModestUI*
modest_ui_new (ModestConf *modest_conf)
{
GObject *obj;
ModestAccountMgr *modest_acc_mgr;
ModestIdentityMgr *modest_id_mgr;
TnyAccountStoreIface *account_store_iface;
- GSList *account_names_list;
+ GSList *account_names_list, *cursor;
GSList *identities_list;
g_return_val_if_fail (modest_conf, NULL);
return NULL;
}
- modest_tny_account_store_set_get_pass_func(MODEST_TNY_ACCOUNT_STORE(account_store_iface),
- on_password_requested);
+ //modest_tny_account_store_set_get_pass_func(MODEST_TNY_ACCOUNT_STORE(account_store_iface),
+ // on_password_requested);
g_signal_connect (account_store_iface, "accounts_reloaded",
G_CALLBACK(on_accounts_reloaded), priv);
G_CALLBACK(modest_ui_last_window_closed),
NULL);
- account_names_list = modest_account_mgr_server_account_names(modest_acc_mgr,
- NULL, MODEST_PROTO_TYPE_ANY, NULL, FALSE);
+ account_names_list = modest_account_mgr_search_server_accounts(modest_acc_mgr,
+ NULL, MODEST_PROTO_TYPE_ANY,
+ NULL);
identities_list = modest_identity_mgr_identity_names(modest_id_mgr, NULL);
if (!(account_names_list != NULL || identities_list != NULL))
wizard_account_dialog(MODEST_UI(obj));
+
+ cursor = account_names_list;
+ while (cursor) {
+ g_free (cursor->data);
+ cursor = cursor->next;
+ }
g_slist_free(account_names_list);
+
+
+ cursor = identities_list;
+ while (cursor) {
+ g_free (cursor->data);
+ cursor = cursor->next;
+ }
g_slist_free(identities_list);
- return obj;
+ return MODEST_UI(obj);
}