* Uncomment flush call to tny_send_queue.

[modest] / src / maemo / modest-main-window.c

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 288b88c..d413712 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -248,7 +248,7 @@ static const GtkActionEntry modest_header_view_action_entries [] = {
        { "HeaderViewCSMCopy",          NULL,  N_("mcen_me_inbox_copy"),        "<CTRL>C", NULL, G_CALLBACK (modest_ui_actions_on_copy) },
        { "HeaderViewCSMPaste",         NULL,  N_("mcen_me_inbox_paste"),       "<CTRL>V", NULL, G_CALLBACK (modest_ui_actions_on_paste) },
        { "HeaderViewCSMDelete",        NULL,  N_("mcen_me_inbox_delete"),      NULL,      NULL, G_CALLBACK (modest_ui_actions_on_delete) },
-       { "HeaderViewCSMCancelSending", NULL,  N_("mcen_me_outbox_cancelsend"), NULL,      NULL, NULL },
+       { "HeaderViewCSMCancelSending", NULL,  N_("mcen_me_outbox_cancelsend"), NULL,      NULL, G_CALLBACK (modest_ui_actions_cancel_send) },
        { "HeaderViewCSMHelp",          NULL,  N_("mcen_me_inbox_help"),        NULL,      NULL, G_CALLBACK (modest_ui_actions_on_help) },
 };
 
@@ -442,12 +442,12 @@ wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget)
 }
 
 
-static gboolean
-on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self)
-{
-       modest_window_save_state (MODEST_WINDOW(self));
-       return FALSE;
-}
+/* static gboolean */
+/* on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self) */
+/* { */
+/*     modest_window_save_state (MODEST_WINDOW(self)); */
+/*     return FALSE; */
+/* } */
 
 typedef struct
 {
@@ -483,6 +483,10 @@ on_response (GtkDialog *dialog, gint arg1, gpointer user_data)
 static void
 on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data)
 {
+       if (err) {
+               printf ("DEBUG: %s: err->code=%d, err->message=%s\n", __FUNCTION__, err->code, err->message);
+       }
+
        if (header) {
                gchar *str = g_strdup_printf ("%s. Do you want to remove the message (%s)?",
                        err->message, tny_header_get_subject (header));
@@ -654,7 +658,7 @@ connect_signals (ModestMainWindow *self)
                          self);
        
        /* window */
-       g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
+/*     g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self); */
        g_signal_connect (G_OBJECT (self), "window-state-event",
                          G_CALLBACK (modest_main_window_window_state_event),
                          NULL);
@@ -807,8 +811,8 @@ modest_main_window_new (void)
        action_group = gtk_action_group_new ("ModestMainWindowActions");
        gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
 
-       menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules");
-       toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules");
+       menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE);
+       toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE);
 
        /* Add common actions */
        gtk_action_group_add_actions (action_group,
@@ -893,6 +897,11 @@ modest_main_window_new (void)
        modest_widget_memory_restore (modest_runtime_get_conf (), G_OBJECT(priv->header_view),
                                      MODEST_CONF_HEADER_VIEW_KEY);
 
+       /* Other style properties of header view */
+       g_object_set (G_OBJECT (priv->header_view), 
+                     "rules-hint", FALSE,
+                     NULL);
+
        /* Empty view */ 
        priv->empty_view = create_empty_view ();
                 
@@ -2074,6 +2083,14 @@ on_folder_view_focus_in (GtkWidget *widget,
                         GdkEventFocus *event,
                         gpointer userdata)
 {
+       ModestMainWindow *main_window = NULL;
+       
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (userdata), FALSE);
+       main_window = MODEST_MAIN_WINDOW (userdata);
+       
+       /* Update toolbar dimming state */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+
        return FALSE;
 }
 
@@ -2082,8 +2099,12 @@ on_header_view_focus_in (GtkWidget *widget,
                         GdkEventFocus *event,
                         gpointer userdata)
 {
-       ModestMainWindow *main_window = MODEST_MAIN_WINDOW (userdata);
-       ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
+       ModestMainWindow *main_window = NULL;
+       ModestMainWindowPrivate *priv = NULL;
+
+       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (userdata), FALSE);
+       main_window = MODEST_MAIN_WINDOW (userdata);
+       priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
 
        if (modest_header_view_has_selected_headers (MODEST_HEADER_VIEW (priv->header_view))) {
                TnyList *selection = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (priv->header_view));
@@ -2102,6 +2123,11 @@ on_header_view_focus_in (GtkWidget *widget,
                g_object_unref (iterator);
                g_object_unref (selection);
        }
+
+
+       /* Update toolbar dimming state */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+
        return FALSE;
 }