X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=0204e871fdf08ab36149a52594fe058301ac68b2;hp=5b875cc55df059e1dea28c3e9dee9857efa75960;hb=886e3dc74b551f9d9f0b3e8f2c12f864d0265a77;hpb=4ac513636f01ba4adbe806e6250b1302c4077958 diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 5b875cc..0204e87 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -129,9 +129,17 @@ _on_msg_count_changed (ModestHeaderView *header_view, TnyFolderChange *change, ModestMainWindow *main_window); +static void +modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self); + static GtkWidget * create_empty_view (void); +static gchar * +translate_func (const gchar *msgid, + const gchar *domain_name); + + /* list my signals */ enum { /* MY_SIGNAL_1, */ @@ -181,6 +189,7 @@ struct _ModestMainWindowPrivate { /* Signal handler UIDs */ gint queue_changed_handler_uid; + GList *queue_err_signals; }; #define MODEST_MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_MAIN_WINDOW, \ @@ -281,6 +290,7 @@ modest_main_window_init (ModestMainWindow *obj) priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj); + priv->queue_err_signals = NULL; priv->msg_paned = NULL; priv->main_paned = NULL; priv->main_vbox = NULL; @@ -294,7 +304,7 @@ modest_main_window_init (ModestMainWindow *obj) priv->progress_bar = NULL; priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL; priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT; - priv->contents_style = MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS; + priv->contents_style = -1; /* invalid contents style. We need this to select it for the first time */ priv->merge_ids = NULL; priv->optimized_view = FALSE; priv->send_receive_in_progress = FALSE; @@ -309,6 +319,8 @@ modest_main_window_finalize (GObject *obj) priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj); + modest_main_window_cleanup_queue_error_signals ((ModestMainWindow *) obj); + g_slist_free (priv->progress_widgets); g_byte_array_free (priv->merge_ids, TRUE); @@ -364,12 +376,14 @@ restore_settings (ModestMainWindow *self, gboolean do_folder_view_too) modest_widget_memory_restore (conf, G_OBJECT(self), MODEST_CONF_MAIN_WINDOW_KEY); + modest_widget_memory_restore (conf, G_OBJECT(priv->header_view), MODEST_CONF_HEADER_VIEW_KEY); if (do_folder_view_too) modest_widget_memory_restore (conf, G_OBJECT(priv->folder_view), MODEST_CONF_FOLDER_VIEW_KEY); + modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned), MODEST_CONF_MAIN_PANED_KEY); @@ -393,8 +407,8 @@ save_state (ModestWindow *window) MODEST_CONF_MAIN_WINDOW_KEY); modest_widget_memory_save (conf, G_OBJECT(priv->main_paned), MODEST_CONF_MAIN_PANED_KEY); - modest_widget_memory_save (conf, G_OBJECT(priv->header_view), - MODEST_CONF_HEADER_VIEW_KEY); + // modest_widget_memory_save (conf, G_OBJECT(priv->header_view), + // MODEST_CONF_HEADER_VIEW_KEY); modest_widget_memory_save (conf, G_OBJECT(priv->folder_view), MODEST_CONF_FOLDER_VIEW_KEY); } @@ -418,10 +432,82 @@ on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) return FALSE; } +typedef struct +{ + ModestMainWindow *self; + TnySendQueue *queue; + TnyHeader *header; +} OnResponseInfo; + +static void +on_response (GtkDialog *dialog, gint arg1, gpointer user_data) +{ + OnResponseInfo *info = (OnResponseInfo *) user_data; + ModestMainWindow *self = info->self; + TnyHeader *header = info->header; + TnySendQueue *queue = info->queue; + + if (arg1 == GTK_RESPONSE_YES) { + TnyFolder *outbox = tny_send_queue_get_outbox (queue); + tny_folder_remove_msg (outbox, header, NULL); + tny_folder_sync (outbox, TRUE, NULL); + g_object_unref (outbox); + } + + g_object_unref (queue); + g_object_unref (header); + g_object_unref (self); + + gtk_widget_destroy (GTK_WIDGET (dialog)); + g_slice_free (OnResponseInfo, info); +} + + +static void +on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data) +{ + if (header) { + gchar *str = g_strdup_printf ("%s. Do you want to remove the message (%s)?", + err->message, tny_header_get_subject (header)); + OnResponseInfo *info = g_slice_new (OnResponseInfo); + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (user_data), 0, + GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, str); + g_free (str); + info->queue = g_object_ref (self); + info->self = g_object_ref (user_data); + info->header = g_object_ref (header); + g_signal_connect (G_OBJECT (dialog), "response", + G_CALLBACK (on_response), info); + gtk_widget_show_all (dialog); + } +} + +typedef struct { + TnySendQueue *queue; + guint signal; +} QueueErrorSignal; + +static void +modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self) +{ + ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); + + GList *oerrsignals = priv->queue_err_signals; + while (oerrsignals) { + QueueErrorSignal *esignal = (QueueErrorSignal *) oerrsignals->data; + g_signal_handler_disconnect (esignal->queue, esignal->signal); + g_slice_free (QueueErrorSignal, esignal); + oerrsignals = g_list_next (oerrsignals); + } + g_list_free (priv->queue_err_signals); + priv->queue_err_signals = NULL; +} static void on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self) { + ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); + /* When going online, do the equivalent of pressing the send/receive button, * as per the specification: * (without the check for >0 accounts, though that is not specified): */ @@ -447,6 +533,9 @@ on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow * /* TODO: Does this really destroy the TnySendQueues and their threads * We do not want 2 TnySendQueues to exist with the same underlying * outbox directory. */ + + modest_main_window_cleanup_queue_error_signals (self); + GSList *account_names = modest_account_mgr_account_names ( modest_runtime_get_account_mgr(), TRUE /* enabled accounts only */); @@ -458,17 +547,22 @@ on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow * modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(), account_name)); if (account) { + /* Q: Is this the first location where the send-queues are requested? */ + QueueErrorSignal *esignal = g_slice_new (QueueErrorSignal); printf ("debug: %s:\n Transport account for %s: %s\n", __FUNCTION__, account_name, tny_account_get_id(TNY_ACCOUNT(account))); - modest_runtime_get_send_queue (account); + esignal->queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (account)); + esignal->signal = g_signal_connect (G_OBJECT (esignal->queue), "error-happened", + G_CALLBACK (on_sendqueue_error_happened), self); + priv->queue_err_signals = g_list_prepend (priv->queue_err_signals, esignal); } } iter = g_slist_next (iter); } - - g_slist_free (account_names); - + + modest_account_mgr_free_account_names (account_names); + account_names = NULL; modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); } @@ -622,51 +716,57 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data) { GtkWidget *folder_win = (GtkWidget *) user_data; ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); - - priv->folder_view = MODEST_FOLDER_VIEW(modest_folder_view_new (NULL)); - if (!priv->folder_view) - g_printerr ("modest: cannot instantiate folder view\n"); + + priv->folder_view = MODEST_FOLDER_VIEW (modest_platform_create_folder_view (NULL)); + wrap_in_scrolled_window (folder_win, GTK_WIDGET(priv->folder_view)); +/* wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET(priv->header_view)); */ gtk_widget_show (GTK_WIDGET (priv->folder_view)); /* Connect signals */ connect_signals ((ModestMainWindow*)self); - modest_folder_view_set_style (priv->folder_view, - MODEST_FOLDER_VIEW_STYLE_SHOW_ONE); - - /* Set account store */ tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view), TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); + /* Load previous osso state, for instance if we are being restored from + * hibernation: */ + modest_osso_load_state (); + + /* Restore window & widget settings */ + + restore_settings (MODEST_MAIN_WINDOW(self), TRUE); /* Check if accounts exist and show the account wizard if not */ gboolean accounts_exist = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); - - if (!accounts_exist) - { + if (!accounts_exist) { /* This is necessary to have the main window shown behind the dialog It's an ugly hack... jschmid */ gtk_widget_show_all(GTK_WIDGET(self)); modest_ui_actions_on_accounts (NULL, MODEST_WINDOW(self)); } +} - wrap_in_scrolled_window (folder_win, GTK_WIDGET(priv->folder_view)); - wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET(priv->header_view)); - - /* Load previous osso state, for instance if we are being restored from - * hibernation: */ - modest_osso_load_state(); +/* Debugging */ +/* static void */ +/* on_window_destroy (ModestWindow *window, */ +/* ModestWindowMgr *self) */ +/* { */ +/* ModestMainWindow *mw = NULL; */ +/* ModestMainWindowPrivate *priv = NULL; */ - /* Restore window & widget settings */ +/* mw = MODEST_MAIN_WINDOW (window); */ +/* priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); */ - restore_settings (MODEST_MAIN_WINDOW(self), TRUE); -} +/* g_print ("\tMW: %d\n", ((GObject*)mw)->ref_count); */ +/* g_print ("\tHV: %d\n", ((GObject*)priv->header_view)->ref_count); */ +/* g_print ("\tFV: %d\n", ((GObject*)priv->folder_view)->ref_count); */ +/* } */ -ModestWindow* +ModestWindow * modest_main_window_new (void) { ModestMainWindow *self = NULL; @@ -690,6 +790,7 @@ modest_main_window_new (void) action_group = gtk_action_group_new ("ModestMainWindowActions"); gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); + gtk_action_group_set_translate_func (action_group, (GtkTranslateFunc) translate_func, GETTEXT_PACKAGE, g_free); menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules"); toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules"); @@ -769,11 +870,13 @@ modest_main_window_new (void) modest_maemo_utils_get_device_name (); /* header view */ - priv->header_view = - MODEST_HEADER_VIEW(modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_DETAILS)); + priv->header_view = + MODEST_HEADER_VIEW (modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_DETAILS)); if (!priv->header_view) g_printerr ("modest: cannot instantiate header view\n"); modest_header_view_set_style (priv->header_view, MODEST_HEADER_VIEW_STYLE_TWOLINES); + modest_widget_memory_restore (modest_runtime_get_conf (), G_OBJECT(priv->header_view), + MODEST_CONF_HEADER_VIEW_KEY); /* Empty view */ priv->empty_view = create_empty_view (); @@ -804,39 +907,23 @@ modest_main_window_new (void) window_icon = modest_platform_get_icon (MODEST_APP_ICON); gtk_window_set_icon (GTK_WINDOW (self), window_icon); - - - /* Do send & receive when we are idle */ - /* TODO: Enable this again. I have commented it out because, - * at least in scratchbox, this can cause us to start a second - * update (in response to a connection change) when we are already - * doing an update (started here, at startup). Tinymail doesn't like that. - * murrayc. - */ - /* g_idle_add ((GSourceFunc)sync_accounts_cb, self); */ - HildonProgram *app = hildon_program_get_instance (); hildon_program_add_window (app, HILDON_WINDOW (self)); - /* Register HildonProgram signal handlers: */ - /* These are apparently deprecated, according to the - * "HildonApp/HildonAppView to HildonProgram/HildonWindow migration guide", - * though the API reference does not mention that: - * - g_signal_connect (G_OBJECT(app), "topmost_status_lose", - G_CALLBACK (on_hildon_program_save_state), self); - g_signal_connect (G_OBJECT(app), "topmost_status_acquire", - G_CALLBACK (on_hildon_program_status_acquire), self); - */ g_signal_connect (G_OBJECT(app), "notify::is-topmost", G_CALLBACK (on_hildon_program_is_topmost_notify), self); g_signal_connect (G_OBJECT(self), "show", - G_CALLBACK (modest_main_window_on_show), folder_win); + G_CALLBACK (modest_main_window_on_show), folder_win); restore_settings (MODEST_MAIN_WINDOW(self), FALSE); +/* { */ +/* g_signal_connect (self, "destroy", */ +/* G_CALLBACK (on_window_destroy), self); */ +/* } */ + return MODEST_WINDOW(self); } @@ -1092,7 +1179,8 @@ on_account_update (TnyAccountStore *account_store, iter = iter->next; } - g_slist_free (account_names); + modest_account_mgr_free_account_names (account_names); + account_names = NULL; /* Order the list of accounts by its display name */ accounts = g_slist_sort (accounts, (GCompareFunc) compare_display_names); @@ -1449,6 +1537,7 @@ _on_msg_count_changed (ModestHeaderView *header_view, TnyFolderChange *change, ModestMainWindow *main_window) { + printf ("DEBUG: %s\n", __FUNCTION__); gboolean folder_empty = FALSE; TnyFolderChangeChanged changed; @@ -1464,6 +1553,8 @@ _on_msg_count_changed (ModestHeaderView *header_view, else folder_empty = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0); + printf ("DEBUG: %s: folder_empty=%d\n", __FUNCTION__, folder_empty); + /* Set contents style of headers view */ if (folder_empty) { modest_main_window_set_contents_style (main_window, @@ -1515,7 +1606,6 @@ modest_main_window_set_contents_style (ModestMainWindow *self, break; case MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS: { - /* TODO: show here account details */ TnyFolderStore *selected_folderstore = modest_folder_view_get_selected (priv->folder_view); if (TNY_IS_ACCOUNT (selected_folderstore)) { @@ -1525,6 +1615,7 @@ modest_main_window_set_contents_style (ModestMainWindow *self, wrap_in_scrolled_window (priv->contents_widget, priv->details_widget); } + g_object_unref (selected_folderstore); break; } case MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY: @@ -1538,6 +1629,18 @@ modest_main_window_set_contents_style (ModestMainWindow *self, gtk_widget_show_all (priv->contents_widget); } +ModestMainWindowContentsStyle +modest_main_window_get_contents_style (ModestMainWindow *self) +{ + ModestMainWindowPrivate *priv; + + g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), -1); + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + return priv->contents_style; +} + + static void on_configuration_key_changed (ModestConf* conf, const gchar *key, @@ -1580,6 +1683,7 @@ on_configuration_key_changed (ModestConf* conf, g_free (new_text); g_list_free (children); } + g_object_unref (account); } static gboolean @@ -1614,6 +1718,10 @@ set_toolbar_mode (ModestMainWindow *self, parent_priv = MODEST_WINDOW_GET_PRIVATE(self); priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + /* In case this was called before the toolbar exists: */ + if (!(parent_priv->toolbar)) + return; + g_return_if_fail (GTK_IS_TOOLBAR(parent_priv->toolbar)); sort_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSort"); @@ -1828,3 +1936,10 @@ on_send_receive_csm_activated (GtkMenuItem *item, { refresh_account ((const gchar*) user_data); } + +static gchar * +translate_func (const gchar *msgid, + const gchar *domain_name) +{ + return _(msgid); +}