Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 1f4bd55d1b9d5f701f2df8d1be7466df85a8669a

1 files changed, 4 insertions, 5 deletions

diff --git a/src/nautilus-ui-utilities.c b/src/nautilus-ui-utilities.c
index ac2c423da..765097f9e 100644
--- a/src/nautilus-ui-utilities.c
+++ b/src/nautilus-ui-utilities.c
@@ -393,10 +393,9 @@ get_text_for_date_range (GPtrArray *date_range,
 }
 
 GtkDialog *
-show_dialog (const gchar *primary_text,
-             const gchar *secondary_text,
-             GtkWindow   *parent,
-             GtkMessageType type)
+show_error_dialog (const gchar *primary_text,
+                   const gchar *secondary_text,
+                   GtkWindow   *parent)
 {
     GtkWidget *dialog;
 
@@ -404,7 +403,7 @@ show_dialog (const gchar *primary_text,
 
     dialog = gtk_message_dialog_new (parent,
                                      GTK_DIALOG_MODAL,
-                                     type,
+                                     GTK_MESSAGE_ERROR,
                                      GTK_BUTTONS_OK,
                                      "%s", primary_text);