X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=de5d03faa01dbdc3184bf9d8b7214186ef5b5eba;hb=87bae85f05ddc2249aed07193ca8ab73e814bd4f;hp=de893c7c050863e356528def2e7886d1b5013ed8;hpb=1ef983f3b70606e61341c447158a72da8b12a721;p=modest

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index de893c7..de5d03f 100644
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -475,9 +475,9 @@ modest_platform_show_uri_popup (const gchar *uri)
 		 * and/or might have security implications
 		 * we still allow to copy the url though
 		 */
-		if (!g_str_has_prefix (uri, "file:")) { 		
-		
-			GSList *node;			
+		if (!g_str_has_prefix (uri, "file:")) {
+
+			GSList *node;
 			popup_info->actions = actions_list;
 			popup_info->uri = g_strdup (uri);
 
@@ -489,6 +489,7 @@ modest_platform_show_uri_popup (const gchar *uri)
 				action_name = hildon_uri_action_get_name (action);
 				translation_domain = hildon_uri_action_get_translation_domain (action);
 				menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain, action_name));
+				hildon_gtk_widget_set_theme_size (menu_item, MODEST_EDITABLE_SIZE);
 				g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name);  /* hack */
 				g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),
 						  popup_info);
@@ -947,6 +948,7 @@ static GtkWidget *
 folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper)
 {
 	GtkWidget *button;
+	const gchar *acc_id = NULL;
 
 	button = hildon_button_new (MODEST_EDITABLE_SIZE,
 				    HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
@@ -954,7 +956,6 @@ folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper)
 	hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 1.0);
 
 	if (suggested) {
-		const gchar *acc_id = NULL;
 
 		folder_picker_set_store (GTK_BUTTON (button), suggested);
 
@@ -969,13 +970,14 @@ folder_picker_new (TnyFolderStore *suggested, FolderPickerHelper *helper)
 				g_object_unref (account);
 			}
 		}
+	}
 
-		if (!acc_id)
-			modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(helper->folder_view));
+	if (!acc_id)
+		acc_id = modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(helper->folder_view));
+
+	g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_ORIGINAL_ACCOUNT,
+				g_strdup (acc_id), (GDestroyNotify) g_free);
 
-		g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_ORIGINAL_ACCOUNT,
-					g_strdup (acc_id), (GDestroyNotify) g_free);
-	}
 
 	g_signal_connect (G_OBJECT (button), "clicked",
 			  G_CALLBACK (folder_picker_clicked),
@@ -1486,7 +1488,16 @@ modest_platform_set_update_interval (guint minutes)
 	ModestConf *conf = modest_runtime_get_conf ();
 	if (!conf)
 		return FALSE;
-		
+
+	if (minutes > 0) {
+		GSList *acc_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE);
+		if (!acc_names) {
+			minutes = 0;
+		} else {
+			modest_account_mgr_free_account_names (acc_names);
+		}
+	}
+
 	cookie_t alarm_cookie = modest_conf_get_int (conf, MODEST_CONF_ALARM_ID, NULL);
 
 	/* Delete any existing alarm,
@@ -1638,6 +1649,10 @@ modest_platform_on_new_headers_received (GList *URI_list,
 					    -1);
 
 	/* Set the led pattern */
+	if (data->time)
+		notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification),
+						    "time", data->time);
+
 	notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (notification),
 					    "dialog-type", 4);
 	notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
@@ -2059,14 +2074,17 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
 	   example. With GTK_RESPONSE_HELP the view button is aligned
 	   to the left while the other two to the right */
 	note = hildon_note_new_confirmation_add_buttons  (
-		NULL,
+		(GtkWindow *) win,
 		question,
 		_HL("wdgt_bd_yes"),     GTK_RESPONSE_OK,
 		_HL("wdgt_bd_view"),          GTK_RESPONSE_APPLY,   /* abusing this... */
 		_HL("wdgt_bd_no"), GTK_RESPONSE_CANCEL,
 		NULL, NULL);
 
-	g_signal_connect (G_OBJECT(note), "response", 
+	modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+				     (GtkWindow *) note, (GtkWindow *) win);
+
+	g_signal_connect (G_OBJECT(note), "response",
 			  G_CALLBACK(on_cert_dialog_response),
 			  (gpointer) certificate);
 
@@ -2915,7 +2933,7 @@ on_move_to_dialog_row_activated (GtkTreeView       *tree_view,
 			valid  = !modest_protocol_registry_protocol_type_has_tag 
 				(modest_runtime_get_protocol_registry (),
 				 protocol_type,
-				 MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
+				 MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
 		}
 		if (valid)
 			move_to_dialog_show_folders (dialog, selected);