X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=1138e6e6f3df262f402e1eccce9ef50a5de80d27;hp=9f8395aeedb71574563a87490162e1e4e3ddefe3;hb=e45958deaf9701399c552ea0d84c2447efacd4ca;hpb=564a7388a2f74368147b0a241ca4a0b65c68167f

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 9f8395a..1138e6e 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -48,6 +48,9 @@
 #include <tny-camel-folder.h>
 #include <tny-camel-imap-folder.h>
 #include <tny-camel-pop-folder.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-pannable-area.h>
+#endif
 
 #ifdef MODEST_PLATFORM_MAEMO
 #include "maemo/modest-osso-state-saving.h"
@@ -447,6 +450,8 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
 		if (header) {
 			gchar *subject;
 			subject = tny_header_dup_subject (header);
+			if (!subject)
+				subject = g_strdup (_("mail_va_no_subject"));
 			desc = g_strdup_printf ("%s", subject); 
 			g_free (subject);
 			g_object_unref (header);
@@ -528,11 +533,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
 			}
 
 			/* Free */
-			if (next_row_reference != NULL) 
+			if (gtk_tree_row_reference_valid (next_row_reference)) 
 				gtk_tree_row_reference_free (next_row_reference);
 			if (next_path != NULL) 
 				gtk_tree_path_free (next_path);				
-			if (prev_row_reference != NULL) 
+			if (gtk_tree_row_reference_valid (prev_row_reference)) 
 				gtk_tree_row_reference_free (prev_row_reference);
 			if (prev_path != NULL) 
 				gtk_tree_path_free (prev_path);
@@ -834,6 +839,8 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
 			      error->code == TNY_SERVICE_ERROR_MESSAGE_NOT_AVAILABLE)) {
 			gchar *subject, *msg;
 			subject = tny_header_dup_subject (header);
+			if (!subject)
+				subject = g_strdup (_("mail_va_no_subject"));;
 			msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"),
 					       subject);
 			modest_platform_run_information_dialog (NULL, msg, FALSE);
@@ -1232,7 +1239,8 @@ open_msgs_performer(gboolean canceled,
 
 		protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, proto);
 		error_msg = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, subject);
-		g_free (subject);
+		if (subject)
+			g_free (subject);
 		g_object_unref (header);
 		g_object_unref (iter);
 		
@@ -4612,7 +4620,12 @@ create_move_to_dialog (GtkWindow *win,
 		       GtkWidget *folder_view,
 		       GtkWidget **tree_view)
 {
-	GtkWidget *dialog, *scroll;
+	GtkWidget *dialog;
+#ifdef MODEST_TOOLKIT_HILDON2
+	GtkWidget *pannable;
+#else
+	GtkWidget *scroll;
+#endif
 	GtkWidget *new_button, *ok_button;
 
 	dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
@@ -4645,10 +4658,14 @@ create_move_to_dialog (GtkWindow *win,
 	g_object_set_data (G_OBJECT (dialog), MOVE_FOLDER_NEW_BUTTON, new_button);
 
 	/* Create scrolled window */
+#ifdef MODEST_TOOLKIT_HILDON2
+	pannable = hildon_pannable_area_new ();
+#else
 	scroll = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy  (GTK_SCROLLED_WINDOW (scroll),
 					 GTK_POLICY_AUTOMATIC,
 					 GTK_POLICY_AUTOMATIC);
+#endif
 
 #ifdef MODEST_TOOLKIT_GTK
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN);
@@ -4726,11 +4743,17 @@ create_move_to_dialog (GtkWindow *win,
 	/* Hide special folders */
 	modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (*tree_view), FALSE);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+	gtk_container_add (GTK_CONTAINER (pannable), *tree_view);
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), 
+			    pannable, TRUE, TRUE, 0);
+#else
 	gtk_container_add (GTK_CONTAINER (scroll), *tree_view);
-
 	/* Add scroll to dialog */
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), 
 			    scroll, TRUE, TRUE, 0);
+#endif
+
 
 	gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
 #ifndef MODEST_TOOLKIT_GTK
@@ -4815,8 +4838,10 @@ move_to_helper_destroyer (gpointer user_data)
 		gtk_widget_destroy (GTK_WIDGET (helper->banner));
 		g_object_unref (helper->banner);
 	}
-	if (helper->reference != NULL)
+	if (gtk_tree_row_reference_valid (helper->reference)) {
 		gtk_tree_row_reference_free (helper->reference);
+		helper->reference = NULL;
+	}
 	g_free (helper);
 }
 
@@ -4840,7 +4865,8 @@ move_to_cb (ModestMailOperation *mail_op,
 				/* No more messages to view, so close this window */
 				modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
 			}
-		} else if (MODEST_IS_MAIN_WINDOW (object) && helper->reference != NULL) {
+		} else if (MODEST_IS_MAIN_WINDOW (object) && 
+			   gtk_tree_row_reference_valid (helper->reference)) {
 			GtkWidget *header_view;
 			GtkTreePath *path;
 			GtkTreeSelection *sel;
@@ -6123,7 +6149,8 @@ modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win)
 
 	subject = tny_header_dup_subject (header);
 	msg = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, subject);
-	g_free (subject);
+	if (subject)
+		g_free (subject);
 	if (msg == NULL) {
 		msg = g_strdup_printf (_("mail_ni_ui_folder_get_msg_folder_error"));
 	}