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

This reverts commit 1f4bd55d1b9d5f701f2df8d1be7466df85a8669a

1 files changed, 18 insertions, 21 deletions

diff --git a/src/nautilus-program-choosing.c b/src/nautilus-program-choosing.c
index 81a9dee58..9954ec65e 100644
--- a/src/nautilus-program-choosing.c
+++ b/src/nautilus-program-choosing.c
@@ -27,6 +27,7 @@
 #include "nautilus-icon-info.h"
 #include "nautilus-recent.h"
 #include "nautilus-ui-utilities.h"
+#include <eel/eel-stock-dialogs.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
@@ -335,10 +336,9 @@ nautilus_launch_desktop_file (GdkScreen   *screen,
     {
         g_free (desktop_file_path);
         g_object_unref (desktop_file);
-        show_dialog (_("Sorry, but you cannot execute commands from a remote site."),
-                     _("This is disabled due to security considerations."),
-                     parent_window,
-                     GTK_MESSAGE_ERROR);
+        show_error_dialog(_("Sorry, but you cannot execute commands from a remote site."),
+                          _("This is disabled due to security considerations."),
+                          parent_window);
 
         return;
     }
@@ -348,10 +348,9 @@ nautilus_launch_desktop_file (GdkScreen   *screen,
     g_free (desktop_file_path);
     if (app_info == NULL)
     {
-        show_dialog (_("There was an error launching the application."),
-                     NULL,
-                     parent_window,
-                     GTK_MESSAGE_ERROR);
+        show_error_dialog(_("There was an error launching the application."),
+                          NULL,
+                          parent_window);
         return;
     }
 
@@ -377,10 +376,10 @@ nautilus_launch_desktop_file (GdkScreen   *screen,
         if (count == 0)
         {
             /* all files are non-local */
-            show_dialog (_("This drop target only supports local files."),
-                         _("To open non-local files copy them to a local folder and then drop them again."),
-                         parent_window,
-                         GTK_MESSAGE_ERROR);
+            show_error_dialog(_("This drop target only supports local files."),
+                              _("To open non-local files copy them to a local folder and then"
+                              " drop them again."),
+                              parent_window);
 
             g_list_free_full (files, g_object_unref);
             g_object_unref (app_info);
@@ -389,11 +388,10 @@ nautilus_launch_desktop_file (GdkScreen   *screen,
         else if (count != total)
         {
             /* some files are non-local */
-            show_dialog (_("This drop target only supports local files."),
-                         _("To open non-local files copy them to a local folder and then"
-                         " drop them again. The local files you dropped have already been opened."),
-                         parent_window,
-                         GTK_MESSAGE_WARNING);
+            eel_show_warning_dialog(_("This drop target only supports local files."),
+                                    _("To open non-local files copy them to a local folder and then"
+                                    " drop them again. The local files you dropped have already been opened."),
+                                    parent_window);
         }
     }
 
@@ -425,10 +423,9 @@ nautilus_launch_desktop_file (GdkScreen   *screen,
     if (error != NULL)
     {
         message = g_strconcat (_("Details: "), error->message, NULL);
-        show_dialog (_("There was an error launching the application."),
-                     message,
-                     parent_window,
-                     GTK_MESSAGE_ERROR);
+        show_error_dialog(_("There was an error launching the application."),
+                          message,
+                          parent_window);
 
         g_error_free (error);
         g_free (message);