From 155ff3c77260eaf89c600d2de9fda17c57698b4d Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sat, 10 Jun 2006 15:45:42 +0000 Subject: [PATCH] * ModestTnyStoreAction doesn't have to be a GObject, because it's stateless pmo-trunk-r221 --- src/gtk-glade/modest-ui.c | 47 +++++++---------- src/modest-tny-store-actions.c | 110 ++++------------------------------------ src/modest-tny-store-actions.h | 32 +----------- 3 files changed, 29 insertions(+), 160 deletions(-) diff --git a/src/gtk-glade/modest-ui.c b/src/gtk-glade/modest-ui.c index 7d0a2c8..cfbbc63 100644 --- a/src/gtk-glade/modest-ui.c +++ b/src/gtk-glade/modest-ui.c @@ -280,7 +280,6 @@ modest_ui_show_main_window (ModestUI *modest_ui) GtkWidget *folder_view, *header_view; GtkWidget *message_view; GtkWidget *account_settings_item; - GtkWidget *new_account_item; GtkWidget *delete_item; GtkWidget *view_attachments_item; @@ -348,17 +347,17 @@ modest_ui_show_main_window (ModestUI *modest_ui) modest_ui); */ - new_account_item = glade_xml_get_widget (priv->glade_xml, "NewAccountWizardMenuItem"); - if (!new_account_item) - { - g_warning ("The new account item isn't available!\n"); - return FALSE; - } - - g_signal_connect (new_account_item, "activate", - G_CALLBACK(new_wizard_account), - modest_ui); - +// new_account_item = glade_xml_get_widget (priv->glade_xml, "NewAccountWizardMenuItem"); +// if (!new_account_item) +// { +// g_warning ("The new account item isn't available!\n"); +// return FALSE; +// } + +// g_signal_connect (new_account_item, "activate", +// G_CALLBACK(new_wizard_account), +// modest_ui); +// delete_item = glade_xml_get_widget (priv->glade_xml, "delete1"); if (!delete_item) { @@ -853,9 +852,8 @@ on_folder_clicked (ModestTnyFolderTreeView *folder_tree, win = glade_xml_get_widget (priv->glade_xml, "main"); gtk_window_set_title (GTK_WINDOW(win), tny_msg_folder_iface_get_name(folder)); - - modest_tny_header_tree_view_set_folder (tree_view, - folder); + + modest_tny_header_tree_view_set_folder (tree_view, folder); button = glade_xml_get_widget (priv->glade_xml, "toolb_reply"); if (button) { @@ -893,7 +891,7 @@ on_message_clicked (ModestTnyFolderTreeView *folder_tree, ModestUIPrivate *priv; g_return_if_fail (data); - + priv = MODEST_UI_GET_PRIVATE(data); paned = glade_xml_get_widget (priv->glade_xml,"mail_paned"); msg_view = MODEST_TNY_MSG_VIEW(gtk_paned_get_child2 (GTK_PANED(paned))); @@ -976,7 +974,9 @@ modest_main_window_header_tree (TnyMsgFolderIface *folder) ModestTnyHeaderTreeViewColumn cols[] = { MODEST_TNY_HEADER_TREE_VIEW_COLUMN_MSGTYPE, MODEST_TNY_HEADER_TREE_VIEW_COLUMN_ATTACH, - MODEST_TNY_HEADER_TREE_VIEW_COLUMN_COMPACT_HEADER + MODEST_TNY_HEADER_TREE_VIEW_COLUMN_FROM, + MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SUBJECT, + MODEST_TNY_HEADER_TREE_VIEW_COLUMN_RECEIVED_DATE }; for (i = 0 ; i != sizeof(cols)/sizeof(ModestTnyHeaderTreeViewColumn); ++i) @@ -1470,26 +1470,17 @@ static void on_sendreceive_button_clicked (GtkWidget *widget, ModestUI *modest_ui) { ModestUIPrivate *priv; - ModestTnyStoreActions *store_actions; TnyAccountStoreIface *account_store; const GList *store_accounts; const GList *iter; g_return_if_fail (modest_ui); - - store_actions = MODEST_TNY_STORE_ACTIONS (modest_tny_store_actions_new ()); priv = MODEST_UI_GET_PRIVATE(modest_ui); account_store = priv->account_store; store_accounts = tny_account_store_iface_get_store_accounts (account_store); - + for (iter = store_accounts; iter; iter = iter->next) - { - modest_tny_store_actions_update_folders (store_actions, - TNY_STORE_ACCOUNT_IFACE (iter->data)); - - } - g_object_unref (store_actions); - + modest_tny_store_actions_update_folders (TNY_STORE_ACCOUNT_IFACE (iter->data)); } diff --git a/src/modest-tny-store-actions.c b/src/modest-tny-store-actions.c index 624b415..1b39abc 100644 --- a/src/modest-tny-store-actions.c +++ b/src/modest-tny-store-actions.c @@ -21,119 +21,27 @@ #include "modest-tny-store-actions.h" -/* 'private'/'protected' functions */ -static void modest_tny_store_actions_class_init (ModestTnyStoreActionsClass *klass); -static void modest_tny_store_actions_init (ModestTnyStoreActions *obj); -static void modest_tny_store_actions_finalize (GObject *obj); - -/* list my signals */ -enum { - /* MY_SIGNAL_1, */ - /* MY_SIGNAL_2, */ - LAST_SIGNAL -}; - -typedef struct _ModestTnyStoreActionsPrivate ModestTnyStoreActionsPrivate; - -struct _ModestTnyStoreActionsPrivate { - gboolean active; -}; - -#define MODEST_TNY_STORE_ACTIONS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ - MODEST_TYPE_TNY_STORE_ACTIONS, \ - ModestTnyStoreActionsPrivate)) -/* globals */ -static GObjectClass *parent_class = NULL; - -/* uncomment the following if you have defined any signals */ -/* static guint signals[LAST_SIGNAL] = {0}; */ - void -modest_tny_store_actions_update_folders (ModestTnyStoreActions *self, - TnyStoreAccountIface *storage_account) +modest_tny_store_actions_update_folders (TnyStoreAccountIface *storage_account) { const TnyListIface* folders; TnyIteratorIface* ifolders; - gpointer *cur_folder; + const TnyMsgFolderIface *cur_folder; folders = tny_store_account_iface_get_folders (storage_account, - TNY_STORE_ACCOUNT_FOLDER_TYPE_SUBSCRIBED); + TNY_STORE_ACCOUNT_FOLDER_TYPE_SUBSCRIBED); ifolders = tny_list_iface_create_iterator (folders); - for (cur_folder = tny_iterator_iface_first (ifolders); - tny_iterator_iface_has_next (ifolders); - tny_iterator_iface_next (ifolders)) - { - cur_folder = tny_iterator_iface_current (ifolders); + for (cur_folder = TNY_MSG_FOLDER_IFACE(tny_iterator_iface_first (ifolders)); + tny_iterator_iface_has_next (ifolders); + tny_iterator_iface_next (ifolders)) { + + cur_folder = TNY_MSG_FOLDER_IFACE(tny_iterator_iface_current (ifolders)); tny_msg_folder_iface_refresh (cur_folder); } - g_object_unref (ifolders); -} - - -GType -modest_tny_store_actions_get_type (void) -{ - static GType my_type = 0; - if (!my_type) { - static const GTypeInfo my_info = { - sizeof(ModestTnyStoreActionsClass), - NULL, /* base init */ - NULL, /* base finalize */ - (GClassInitFunc) modest_tny_store_actions_class_init, - NULL, /* class finalize */ - NULL, /* class data */ - sizeof(ModestTnyStoreActions), - 1, /* n_preallocs */ - (GInstanceInitFunc) modest_tny_store_actions_init, - }; - my_type = g_type_register_static (G_TYPE_OBJECT, - "ModestTnyStoreActions", - &my_info, 0); - } - return my_type; -} - -static void -modest_tny_store_actions_class_init (ModestTnyStoreActionsClass *klass) -{ - GObjectClass *gobject_class; - gobject_class = (GObjectClass*) klass; - - parent_class = g_type_class_peek_parent (klass); - gobject_class->finalize = modest_tny_store_actions_finalize; - - g_type_class_add_private (gobject_class, sizeof(ModestTnyStoreActionsPrivate)); - klass->update_folders = modest_tny_store_actions_update_folders; - /* signal definitions go here, e.g.: */ -/* signals[MY_SIGNAL_1] = */ -/* g_signal_new ("my_signal_1",....); */ -/* signals[MY_SIGNAL_2] = */ -/* g_signal_new ("my_signal_2",....); */ -/* etc. */ -} - -static void -modest_tny_store_actions_init (ModestTnyStoreActions *obj) -{ -/* uncomment the following if you init any of the private data */ -/* ModestTnyStoreActionsPrivate *priv = MODEST_TNY_STORE_ACTIONS_GET_PRIVATE(obj); */ - -/* initialize this object, eg.: */ -/* priv->frobnicate_mode = FALSE; */ -} - -static void -modest_tny_store_actions_finalize (GObject *obj) -{ -/* free/unref instance resources here */ + g_object_unref (ifolders); } -GObject* -modest_tny_store_actions_new (void) -{ - return G_OBJECT(g_object_new(MODEST_TYPE_TNY_STORE_ACTIONS, NULL)); -} diff --git a/src/modest-tny-store-actions.h b/src/modest-tny-store-actions.h index 38b1973..27ea4f1 100644 --- a/src/modest-tny-store-actions.h +++ b/src/modest-tny-store-actions.h @@ -9,37 +9,7 @@ G_BEGIN_DECLS -/* standard convenience macros */ -#define MODEST_TYPE_TNY_STORE_ACTIONS (modest_tny_store_actions_get_type()) -#define MODEST_TNY_STORE_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_TNY_STORE_ACTIONS,ModestTnyStoreActions)) -#define MODEST_TNY_STORE_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_TNY_STORE_ACTIONS,ModestTnyStoreActionsClass)) -#define MODEST_IS_TNY_STORE_ACTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_TNY_STORE_ACTIONS)) -#define MODEST_IS_TNY_STORE_ACTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_TNY_STORE_ACTIONS)) -#define MODEST_TNY_STORE_ACTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_TNY_STORE_ACTIONS,ModestTnyStoreActionsClass)) - -typedef struct _ModestTnyStoreActions ModestTnyStoreActions; -typedef struct _ModestTnyStoreActionsClass ModestTnyStoreActionsClass; - -struct _ModestTnyStoreActions { - GObject parent; - /* insert public members, if any */ -}; - -struct _ModestTnyStoreActionsClass { - GObjectClass parent_class; - - void (* update_folders) (ModestTnyStoreActions *self, - TnyStoreAccountIface *storage_account); -}; - -/* member functions */ -GType modest_tny_store_actions_get_type (void) G_GNUC_CONST; - -GObject* modest_tny_store_actions_new (void); - -void modest_tny_store_actions_update_folders (ModestTnyStoreActions *self, - TnyStoreAccountIface *storage_account); - +void modest_tny_store_actions_update_folders (TnyStoreAccountIface *storage_account); G_END_DECLS -- 1.7.9.5