X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=9a14c10dc8b3ab706eac04b06dc03be2dff4075c;hb=b938ec55561112715fe43ff2a67661252906c9c5;hp=ebc795948273e7ffebc7dca1a20af1a103448d6e;hpb=5b68f7c4a513a7a6f45549e7bf40838ce754db27;p=modest

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index ebc7959..9a14c10 100644
--- 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);
@@ -240,10 +245,8 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self,
 						date_time_buffer);
 	}
 
-	/* for outbox, drafts: Modified: (_created) */
-	if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) ||
-	    (folder_type == TNY_FOLDER_TYPE_OUTBOX) ||
-	    (folder_type == TNY_FOLDER_TYPE_SENT)) {
+	/* for drafts (created) */
+	if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
  		modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X",
 					    received);
 		modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"),
@@ -296,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);
@@ -315,14 +312,19 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 		size_s = modest_text_utils_get_display_size (size);
 
 	/* Different names for the local folders */
-	if (modest_tny_folder_is_local_folder (folder)) {
+	if (modest_tny_folder_is_local_folder (folder) ||
+	    modest_tny_folder_is_memory_card_folder (folder)) {
 		gint type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
 		if (type != TNY_FOLDER_TYPE_UNKNOWN)
 			name = g_strdup(modest_local_folder_info_get_type_display_name (type));
-	} 
+	}
 
-	if (!name)	
-		name = g_strdup (tny_folder_get_name (folder));
+	if (!name) {
+		if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX)
+			name = g_strdup (_("mcen_me_folder_inbox"));
+		else
+			name = g_strdup (tny_folder_get_name (folder));
+	}
 
 	tmp = g_strconcat (_("mcen_fi_folder_properties_foldername"), ":", NULL);
 	modest_details_dialog_add_data (self, tmp, name);
@@ -355,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);
@@ -362,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);