* added convenience functions

[modest] / src / hildon / modest-ui.c

diff --git a/src/hildon/modest-ui.c b/src/hildon/modest-ui.c
index c11e892..47599d9 100644 (file)
--- a/src/hildon/modest-ui.c
+++ b/src/hildon/modest-ui.c
@@ -1,6 +1,31 @@
-/* modest-ui.c */
-
-/* insert (c)/licensing information) */
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
@@ -41,7 +66,7 @@ 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_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 *);
@@ -109,6 +134,7 @@ modest_ui_init (ModestUI *obj)
        priv->header_view       = NULL;
        priv->message_view      = NULL;
        priv->current_folder    = NULL;
+       priv->program           = NULL;
 }
 
 
@@ -143,13 +169,15 @@ on_accounts_reloaded (ModestTnyAccountStore *account_store, gpointer 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));
 
-       modest_tny_header_tree_view_set_folder (priv->header_view, NULL);
+       modest_tny_header_tree_view_set_folder (MODEST_TNY_HEADER_TREE_VIEW(priv->header_view),
+                                               NULL);
 
-       modest_tny_folder_tree_view_update_model(priv->folder_view, account_store);
+       modest_tny_folder_tree_view_update_model(MODEST_TNY_FOLDER_TREE_VIEW(priv->folder_view),
+                                                TNY_ACCOUNT_STORE(account_store));
 }
 
 
-GObject*
+ModestUI*
 modest_ui_new (ModestConf *modest_conf)
 {
        GObject *obj;
@@ -215,15 +243,15 @@ modest_ui_new (ModestConf *modest_conf)
                          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, FALSE);
        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));
        g_slist_free(account_names_list);
        g_slist_free(identities_list);
 
-       return obj;
+       return MODEST_UI(obj);
 }
 
 
@@ -315,5 +343,3 @@ on_account_selector_selection_changed (GtkWidget *widget, gpointer user_data)
 
        free(account_name);
 }
-
-