* Migrated both the Folder and Message details dialog to Fremantle UI, now they...

[modest] / src / widgets / modest-details-dialog.c

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index 2aeff6b..9a14c10 100644 (file)
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -113,6 +113,9 @@ modest_details_dialog_new_with_header (GtkWindow *parent,
 
        MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header);
 
+       /* Add close button */
+       gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
+
        return GTK_WIDGET (dialog);
 }
 
@@ -131,6 +134,9 @@ modest_details_dialog_new_with_folder  (GtkWindow *parent,
 
        MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_folder_func (dialog, folder);
 
+       /* Add close button */
+       gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
+
        return GTK_WIDGET (dialog);
 }
 
@@ -196,9 +202,8 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
 #define DATE_TIME_BUFFER_SIZE 128
        gchar date_time_buffer [DATE_TIME_BUFFER_SIZE];
        
-       /* Set window title & Add close button */
+       /* Set window title */
        gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_message_properties"));
-       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
 
        folder = tny_header_get_folder (header);
        folder_type = modest_tny_folder_guess_folder_type (folder);
@@ -294,16 +299,10 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
        
        /* Set window title */
        gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_folder_properties"));
-       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
 
        /* Get data. We use our function because it's recursive */
-       if (TNY_IS_FOLDER (folder)) {
-               count = tny_folder_get_all_count (TNY_FOLDER (folder));
-               size = tny_folder_get_local_size (TNY_FOLDER (folder));
-       } else {
-               count = modest_tny_folder_store_get_message_count (TNY_FOLDER_STORE (folder));
-               size = modest_tny_folder_store_get_local_size (TNY_FOLDER_STORE (folder));
-       }
+       count = tny_folder_get_all_count (TNY_FOLDER (folder));
+       size = tny_folder_get_local_size (TNY_FOLDER (folder));
 
        /* Format count and size */
        count_s = g_strdup_printf ("%d", count);
@@ -358,6 +357,7 @@ on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata)
                vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (focused));
                switch (event->keyval) {
                case GDK_Up:
+               case GDK_KP_Up:
                        if (vadj->value > 0.0) {
                                g_signal_emit_by_name (G_OBJECT (focused), "scroll-child", GTK_SCROLL_STEP_UP, FALSE, 
                                                       &return_value);
@@ -365,6 +365,7 @@ on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata)
                        }
                        break;
                case GDK_Down:
+               case GDK_KP_Down:
                        if (vadj->value < vadj->upper - vadj->page_size) {
                                g_signal_emit_by_name (G_OBJECT (focused), "scroll-child", GTK_SCROLL_STEP_DOWN, FALSE, 
                                                       &return_value);