static void connect_signals (ModestMainWindow *self);
-static void restore_settings (ModestMainWindow *self);
+static void restore_settings (ModestMainWindow *self, gboolean do_folder_view_too);
static void save_state (ModestWindow *self);
static void modest_main_window_show_toolbar (ModestWindow *window,
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, */
/* 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, \
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
+ priv->queue_err_signals = NULL;
priv->msg_paned = NULL;
priv->main_paned = NULL;
priv->main_vbox = NULL;
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;
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);
static void
-restore_settings (ModestMainWindow *self)
+restore_settings (ModestMainWindow *self, gboolean do_folder_view_too)
{
ModestConf *conf;
ModestMainWindowPrivate *priv;
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);
- modest_widget_memory_restore (conf, G_OBJECT(priv->folder_view),
+
+ 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);
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);
}
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): */
/* 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 */);
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));
}
}
+static void
+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_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);
-ModestWindow*
+ /* 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) {
+ /* 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));
+ }
+}
+
+/* Debugging */
+/* static void */
+/* on_window_destroy (ModestWindow *window, */
+/* ModestWindowMgr *self) */
+/* { */
+/* ModestMainWindow *mw = NULL; */
+/* ModestMainWindowPrivate *priv = NULL; */
+
+/* mw = MODEST_MAIN_WINDOW (window); */
+/* priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); */
+
+/* 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 *
modest_main_window_new (void)
{
ModestMainWindow *self = NULL;
ModestDimmingRulesGroup *toolbar_rules_group = NULL;
GtkActionGroup *action_group = NULL;
GError *error = NULL;
- TnyFolderStoreQuery *query = NULL;
GdkPixbuf *window_icon = NULL;
ModestConf *conf = NULL;
GtkAction *action = NULL;
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");
/* Get device name */
modest_maemo_utils_get_device_name ();
- /* folder view */
- query = NULL;
-
- /* tny_folder_store_query_new ();
-
- tny_folder_store_query_add_item (query, NULL,
- TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
- */
-
- priv->folder_view = MODEST_FOLDER_VIEW(modest_folder_view_new (query));
- if (!priv->folder_view)
- g_printerr ("modest: cannot instantiate folder view\n");
- /* g_object_unref (G_OBJECT (query)); */
-
- modest_folder_view_set_style (priv->folder_view,
- MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
-
/* 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 ();
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
- wrap_in_scrolled_window (folder_win, GTK_WIDGET(priv->folder_view));
- wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET(priv->header_view));
-
/* paned */
priv->main_paned = gtk_hpaned_new ();
gtk_paned_pack1 (GTK_PANED(priv->main_paned), folder_win, TRUE, TRUE);
window_icon = modest_platform_get_icon (MODEST_APP_ICON);
gtk_window_set_icon (GTK_WINDOW (self), window_icon);
- /* Connect signals */
- connect_signals (self);
-
- /* 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 ()));
-
- /* 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)
- {
- /* 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));
- }
-
- /* 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);
- /* 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));
+ restore_settings (MODEST_MAIN_WINDOW(self), FALSE);
+
+/* { */
+/* g_signal_connect (self, "destroy", */
+/* G_CALLBACK (on_window_destroy), self); */
+/* } */
return MODEST_WINDOW(self);
}
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);
action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");
gtk_action_set_sensitive (action, FALSE);
- action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu");
- gtk_action_set_sensitive (action, FALSE);
+/* action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu"); */
+/* gtk_action_set_sensitive (action, FALSE); */
widget = modest_window_get_action_widget (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions");
gtk_widget_set_sensitive (widget, FALSE);
}
action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");
gtk_action_set_sensitive (action, TRUE);
- action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu");
- gtk_action_set_sensitive (action, TRUE);
+/* action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu"); */
+/* gtk_action_set_sensitive (action, TRUE); */
widget = modest_window_get_action_widget (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions");
gtk_widget_set_sensitive (widget, TRUE);
}
TnyFolderChange *change,
ModestMainWindow *main_window)
{
+ printf ("DEBUG: %s\n", __FUNCTION__);
gboolean folder_empty = FALSE;
TnyFolderChangeChanged changed;
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,
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)) {
wrap_in_scrolled_window (priv->contents_widget,
priv->details_widget);
}
+ g_object_unref (selected_folderstore);
break;
}
case MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY:
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,
g_free (new_text);
g_list_free (children);
}
+ g_object_unref (account);
}
static gboolean
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");
{
refresh_account ((const gchar*) user_data);
}
+
+static gchar *
+translate_func (const gchar *msgid,
+ const gchar *domain_name)
+{
+ return _(msgid);
+}
projects / modest / blobdiff