diff --git a/ChangeLog b/ChangeLog
index 102b0822d7..5ae94d3ae4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-09  Sven Neumann  <sven@gimp.org>
+
+	* app/widgets/gimpactionview.c
+	* app/widgets/gimphelp.c: specify alternative button order for
+	message dialogs.
+
+	* app/dialogs/user-install-dialog.c: removed trailing whitespace.
+
 2007-10-08  Sven Neumann  <sven@gimp.org>
 
 	* app/tools/gimpperspectiveclonetool.c: implement button_release
diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c
index 308760cb3f..7f15cff74d 100644
--- a/app/dialogs/user-install-dialog.c
+++ b/app/dialogs/user-install-dialog.c
@@ -95,7 +95,7 @@ user_install_dialog_new (GimpUserInstall *install)
   gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
 			     _("The GIMP user installation failed; "
 			       "see the log for details."));
- 
+
   frame = gimp_frame_new (_("Installation Log"));
   gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame,
@@ -108,7 +108,7 @@ user_install_dialog_new (GimpUserInstall *install)
                                   GTK_POLICY_AUTOMATIC);
   gtk_container_add (GTK_CONTAINER (frame), scrolled);
   gtk_widget_show (scrolled);
- 
+
   buffer = gtk_text_buffer_new (NULL);
 
   gtk_text_buffer_create_tag (buffer, "bold",
diff --git a/app/widgets/gimpactionview.c b/app/widgets/gimpactionview.c
index 854e0228c8..f48420d490 100644
--- a/app/widgets/gimpactionview.c
+++ b/app/widgets/gimpactionview.c
@@ -546,6 +546,10 @@ gimp_action_view_conflict_confirm (GimpActionView  *view,
 
                              NULL);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
   g_signal_connect (dialog, "response",
                     G_CALLBACK (gimp_action_view_conflict_response),
                     confirm_data);
diff --git a/app/widgets/gimphelp.c b/app/widgets/gimphelp.c
index 63b6a9f904..20f9478b2e 100644
--- a/app/widgets/gimphelp.c
+++ b/app/widgets/gimphelp.c
@@ -257,13 +257,21 @@ gimp_help_browser_error (Gimp        *gimp,
 
                              NULL);
 
-  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box, primary);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+                                     primary);
   gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, text);
 
   if (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK)
-    g_object_set (gimp->config,
-                  "help-browser", GIMP_HELP_BROWSER_WEB_BROWSER,
-                  NULL);
+    {
+      g_object_set (gimp->config,
+                    "help-browser", GIMP_HELP_BROWSER_WEB_BROWSER,
+                    NULL);
+    }
 
   gtk_widget_destroy (dialog);
 }
@@ -282,14 +290,15 @@ gimp_help_call (Gimp        *gimp,
     {
       GValueArray *return_vals;
 
-      return_vals = gimp_pdb_execute_procedure_by_name (gimp->pdb,
-                                                        gimp_get_user_context (gimp),
-                                                        NULL,
-                                                        procedure_name,
-                                                        G_TYPE_STRING, help_domain,
-                                                        G_TYPE_STRING, help_locales,
-                                                        G_TYPE_STRING, help_id,
-                                                        G_TYPE_NONE);
+      return_vals =
+        gimp_pdb_execute_procedure_by_name (gimp->pdb,
+                                            gimp_get_user_context (gimp),
+                                            NULL,
+                                            procedure_name,
+                                            G_TYPE_STRING, help_domain,
+                                            G_TYPE_STRING, help_locales,
+                                            G_TYPE_STRING, help_id,
+                                            G_TYPE_NONE);
 
       g_value_array_free (return_vals);
 
@@ -346,15 +355,16 @@ gimp_help_call (Gimp        *gimp,
                   help_id      ? help_id      : "(null)");
 #endif
 
-      return_vals = gimp_pdb_execute_procedure_by_name (gimp->pdb,
-                                                        gimp_get_user_context (gimp),
-                                                        NULL,
-                                                        "extension-gimp-help-temp",
-                                                        G_TYPE_STRING, procedure_name,
-                                                        G_TYPE_STRING, help_domain,
-                                                        G_TYPE_STRING, help_locales,
-                                                        G_TYPE_STRING, help_id,
-                                                        G_TYPE_NONE);
+      return_vals =
+        gimp_pdb_execute_procedure_by_name (gimp->pdb,
+                                            gimp_get_user_context (gimp),
+                                            NULL,
+                                            "extension-gimp-help-temp",
+                                            G_TYPE_STRING, procedure_name,
+                                            G_TYPE_STRING, help_domain,
+                                            G_TYPE_STRING, help_locales,
+                                            G_TYPE_STRING, help_id,
+                                            G_TYPE_NONE);
 
       g_value_array_free (return_vals);
     }