* modest-tny-folder-tree-view.c:

  - update for latest tinymail. We don't need to implement TnyMsgSummaryIface
* modest-tny-account-store.c:
  - provide the account name to through the AccountStoreIface*. Now this name will be shown
    the UI as well

pmo-trunk-r117

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 5373c30..d929607 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -339,7 +339,8 @@ tny_account_from_key (ModestTnyAccountStore *self, const gchar *key,
                                             TNY_ACCOUNT_STORE_IFACE(self));
        /* id */
        tny_account_iface_set_id (tny_account, key);
-
+       tny_account_iface_set_name (tny_account, key);
+       
        /* proto */
        val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
                                                            MODEST_ACCOUNT_PROTO, NULL);
@@ -352,7 +353,6 @@ tny_account_from_key (ModestTnyAccountStore *self, const gchar *key,
                return NULL;
        }
 
-
        /* hostname */
        val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
                                                            MODEST_ACCOUNT_HOSTNAME,

diff --git a/src/modest-tny-folder-tree-view.c b/src/modest-tny-folder-tree-view.c
index 8dcf893..6fee025 100644 (file)
--- a/src/modest-tny-folder-tree-view.c
+++ b/src/modest-tny-folder-tree-view.c
@@ -16,7 +16,7 @@ static void modest_tny_folder_tree_view_class_init  (ModestTnyFolderTreeViewClas
 static void modest_tny_folder_tree_view_init        (ModestTnyFolderTreeView *obj);
 static void modest_tny_folder_tree_view_finalize    (GObject *obj);
 
-static void modest_tny_folder_tree_view_iface_init   (gpointer iface, gpointer data);
+//static void modest_tny_folder_tree_view_iface_init   (gpointer iface, gpointer data);
 static void modest_tny_folder_tree_view_set_account_store (TnySummaryWindowIface *self,
                                                           TnyAccountStoreIface *account_store);
 static gboolean update_model (ModestTnyFolderTreeView *self,TnyAccountStoreIface *iface);
@@ -60,19 +60,10 @@ modest_tny_folder_tree_view_get_type (void)
                        1,              /* n_preallocs */
                        (GInstanceInitFunc) modest_tny_folder_tree_view_init,
                };
-               
-               static const GInterfaceInfo iface_info = {
-                       (GInterfaceInitFunc) modest_tny_folder_tree_view_iface_init,
-                       NULL, /* finalize */
-                       NULL /* data */
-               };
-               
+                               
                my_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
                                                  "ModestTnyFolderTreeView",
-                                                 &my_info, 0);
-               g_type_add_interface_static (my_type, TNY_TYPE_SUMMARY_WINDOW_IFACE,
-                                            &iface_info);
-               
+                                                 &my_info, 0);         
        }
        return my_type;
 }
@@ -111,22 +102,6 @@ modest_tny_folder_tree_view_init (ModestTnyFolderTreeView *obj)
 
 
 static void
-modest_tny_folder_tree_view_iface_init (gpointer iface, gpointer data)
-{
-       TnySummaryWindowIfaceClass *klass;
-
-       g_return_if_fail (iface);
-       
-       klass = (TnySummaryWindowIfaceClass*) iface;
-               
-       klass->set_account_store_func =
-               modest_tny_folder_tree_view_set_account_store;
-}
-
-
-
-
-static void
 modest_tny_folder_tree_view_finalize (GObject *obj)
 {
        ModestTnyFolderTreeViewPrivate *priv;