--- trunk/src/main.c	2009/11/03 20:20:39	157
+++ trunk/src/main.c	2009/11/05 20:37:16	164
@@ -31,6 +31,9 @@
 
 #ifdef USE_MAEMO
 #include <hildon/hildon-banner.h>
+#if MAEMO_VERSION_MAJOR >= 5
+#include <hildon/hildon-note.h>
+#endif
 #endif
 
 #include <locale.h>
@@ -94,17 +97,18 @@
     }
   }
 
+#if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
   GtkWidget *dialog = gtk_message_dialog_new(
 			   GTK_WINDOW(NULL),
 			   GTK_DIALOG_DESTROY_WITH_PARENT,
-#if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
 			   GTK_MESSAGE_ERROR, 
-#else
-			   GTK_MESSAGE_OTHER, 			   
-#endif
 			   GTK_BUTTONS_CLOSE, buf);
 
   gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
+#else
+  GtkWidget *dialog = 
+    hildon_note_new_information(GTK_WINDOW(NULL), buf);
+#endif
 
   gtk_dialog_run(GTK_DIALOG(dialog));
   gtk_widget_destroy(dialog);
@@ -776,16 +780,12 @@
     if(col_name && !strcmp(col_name, "Del")) {
       printf("clicked delete\n");
 
+#if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
       /* ask user what he wants */
       GtkWidget *dialog = gtk_message_dialog_new(
   	         GTK_WINDOW(appdata->window),
 		 GTK_DIALOG_DESTROY_WITH_PARENT,
-		 /* this doesn't fix the text selection issues ... */
-#if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >=5)
-		 GTK_MESSAGE_OTHER,
-#else
 		 GTK_MESSAGE_QUESTION,
-#endif
 		 GTK_BUTTONS_CANCEL,
 		 _("Do you want to close this entry only or do "
 		   "you want to remove it completely from the list?"));
@@ -795,11 +795,21 @@
 			     _("Close"), 2,
 			     NULL);
 
+      gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?")); 
+#else
+      GtkWidget *dialog = 
+	hildon_note_new_confirmation_add_buttons(GTK_WINDOW(appdata->window),
+		  _("Do you want to close this entry only or do "
+		    "you want to remove it completely from the list?"),
+		 GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+		  _("Remove"), 1,
+		  _("Close"), 2,
+		  NULL);
+#endif
+
       if(gpx->closed)
 	gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
 
-      gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
-      
       /* set the active flag again if the user answered "no" */
       switch(gtk_dialog_run(GTK_DIALOG(dialog))) {