[nautilus] Revert "Merge remote-tracking branch 'upstream/master'"
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] Revert "Merge remote-tracking branch 'upstream/master'"
- Date: Mon, 23 Apr 2018 20:04:57 +0000 (UTC)
commit dab23f2e771aff3d1d233a97d38b239cbb05a899
Author: Carlos Soriano <csoriano1618 gmail com>
Date: Mon Apr 23 20:03:55 2018 +0000
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 1f4bd55d1b9d5f701f2df8d1be7466df85a8669a
src/nautilus-application.c | 2 +-
src/nautilus-error-reporting.c | 16 ++++-------
src/nautilus-file-operations.c | 14 ++++------
src/nautilus-file-utilities.c | 9 +++---
src/nautilus-files-view-dnd.c | 23 +++++++---------
src/nautilus-files-view.c | 31 ++++++++-------------
src/nautilus-mime-actions.c | 23 +++++-----------
src/nautilus-mime-application-chooser.c | 21 ++++++--------
src/nautilus-program-choosing.c | 39 ++++++++++++--------------
src/nautilus-properties-window.c | 28 ++++++++-----------
src/nautilus-ui-utilities.c | 9 +++---
src/nautilus-ui-utilities.h | 49 ++++++++++++++++-----------------
src/nautilus-window-slot.c | 2 +-
src/nautilus-window.c | 2 +-
14 files changed, 113 insertions(+), 155 deletions(-)
---
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index f38340e24..21c3ac697 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -192,7 +192,7 @@ check_required_directories (NautilusApplication *self)
directories_as_string->str);
}
- dialog = show_dialog (error_string, detail_string, NULL, GTK_MESSAGE_ERROR);
+ dialog = show_error_dialog (error_string, detail_string, NULL);
/* We need the main event loop so the user has a chance to see the dialog. */
gtk_application_add_window (GTK_APPLICATION (self),
GTK_WINDOW (dialog));
diff --git a/src/nautilus-error-reporting.c b/src/nautilus-error-reporting.c
index 5ef9e6cb2..547edb904 100644
--- a/src/nautilus-error-reporting.c
+++ b/src/nautilus-error-reporting.c
@@ -112,10 +112,7 @@ nautilus_report_error_loading_directory (NautilusFile *file,
message = g_strdup (error->message);
}
- show_dialog (_("This location could not be displayed."),
- message,
- parent_window,
- GTK_MESSAGE_ERROR);
+ show_error_dialog (_("This location could not be displayed."), message, parent_window);
}
void
@@ -167,7 +164,7 @@ nautilus_report_error_setting_group (NautilusFile *file,
}
- show_dialog (_("The group could not be changed."), message, parent_window, GTK_MESSAGE_ERROR);
+ show_error_dialog (_("The group could not be changed."), message, parent_window);
}
void
@@ -191,7 +188,7 @@ nautilus_report_error_setting_owner (NautilusFile *file,
message = g_strdup_printf (_("Sorry, could not change the owner of “%s”: %s"),
truncated_name, truncated_error_message);
- show_dialog (_("The owner could not be changed."), message, parent_window, GTK_MESSAGE_ERROR);
+ show_error_dialog (_("The owner could not be changed."), message, parent_window);
}
void
@@ -215,10 +212,7 @@ nautilus_report_error_setting_permissions (NautilusFile *file,
message = g_strdup_printf (_("Sorry, could not change the permissions of “%s”: %s"),
truncated_name, truncated_error_message);
- show_dialog (_("The permissions could not be changed."),
- message,
- parent_window,
- GTK_MESSAGE_ERROR);
+ show_error_dialog (_("The permissions could not be changed."), message, parent_window);
}
typedef struct _NautilusRenameData
@@ -319,7 +313,7 @@ nautilus_report_error_renaming_file (NautilusFile *file,
truncated_error_message);
}
- show_dialog (_("The item could not be renamed."), message, parent_window, GTK_MESSAGE_ERROR);
+ show_error_dialog (_("The item could not be renamed."), message, parent_window);
}
static void
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index 55bc3abae..eb620f051 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -2604,10 +2604,9 @@ unmount_mount_callback (GObject *source_object,
primary = g_strdup_printf (_("Unable to unmount %s"),
mount_name);
}
- show_dialog (primary,
- error->message,
- data->parent_window,
- GTK_MESSAGE_ERROR);
+ show_error_dialog (primary,
+ error->message,
+ data->parent_window);
g_free (primary);
}
}
@@ -2930,10 +2929,9 @@ volume_mount_cb (GObject *source_object,
primary = g_strdup_printf (_("Unable to access “%s”"), name);
g_free (name);
success = FALSE;
- show_dialog (primary,
- error->message,
- parent,
- GTK_MESSAGE_ERROR);
+ show_error_dialog (primary,
+ error->message,
+ parent);
g_free (primary);
}
g_error_free (error);
diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c
index a322d4d92..e27fef428 100644
--- a/src/nautilus-file-utilities.c
+++ b/src/nautilus-file-utilities.c
@@ -30,8 +30,8 @@
#include "nautilus-file-operations.h"
#include "nautilus-search-directory.h"
#include "nautilus-starred-directory.h"
-#include "nautilus-ui-utilities.h"
#include <eel/eel-glib-extensions.h>
+#include <eel/eel-stock-dialogs.h>
#include <eel/eel-string.h>
#include <eel/eel-debug.h>
#include <eel/eel-vfs-extensions.h>
@@ -926,10 +926,9 @@ nautilus_restore_files_from_trash (GList *files,
message = g_strdup_printf (_("Could not determine original location of “%s” "), file_name);
g_free (file_name);
- show_dialog (message,
- _("The item cannot be restored from trash"),
- parent_window,
- GTK_MESSAGE_WARNING);
+ eel_show_warning_dialog (message,
+ _("The item cannot be restored from trash"),
+ parent_window);
g_free (message);
}
diff --git a/src/nautilus-files-view-dnd.c b/src/nautilus-files-view-dnd.c
index dd26582d5..ca4714ee6 100644
--- a/src/nautilus-files-view-dnd.c
+++ b/src/nautilus-files-view-dnd.c
@@ -30,6 +30,7 @@
#include "nautilus-files-view.h"
#include "nautilus-application.h"
+#include <eel/eel-stock-dialogs.h>
#include <eel/eel-string.h>
#include <eel/eel-vfs-extensions.h>
@@ -38,7 +39,6 @@
#include "nautilus-clipboard.h"
#include "nautilus-dnd.h"
#include "nautilus-global-preferences.h"
-#include "nautilus-ui-utilities.h"
#define GET_ANCESTOR(obj) \
GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (obj), GTK_TYPE_WINDOW))
@@ -145,10 +145,9 @@ nautilus_files_view_handle_netscape_url_drop (NautilusFilesView *view,
if (!g_file_is_native (f))
{
- show_dialog (_("Drag and drop is not supported."),
- _("Drag and drop is only supported on local file systems."),
- GET_ANCESTOR (view),
- GTK_MESSAGE_WARNING);
+ eel_show_warning_dialog (_("Drag and drop is not supported."),
+ _("Drag and drop is only supported on local file systems."),
+ GET_ANCESTOR (view));
g_object_unref (f);
return;
}
@@ -186,10 +185,9 @@ nautilus_files_view_handle_netscape_url_drop (NautilusFilesView *view,
(action != GDK_ACTION_MOVE) &&
(action != GDK_ACTION_LINK))
{
- show_dialog (_("Drag and drop is not supported."),
- _("An invalid drag type was used."),
- GET_ANCESTOR (view),
- GTK_MESSAGE_WARNING);
+ eel_show_warning_dialog (_("Drag and drop is not supported."),
+ _("An invalid drag type was used."),
+ GET_ANCESTOR (view));
return;
}
@@ -279,10 +277,9 @@ nautilus_files_view_handle_uri_list_drop (NautilusFilesView *view,
(action != GDK_ACTION_MOVE) &&
(action != GDK_ACTION_LINK))
{
- show_dialog (_("Drag and drop is not supported."),
- _("An invalid drag type was used."),
- GET_ANCESTOR (view),
- GTK_MESSAGE_WARNING);
+ eel_show_warning_dialog (_("Drag and drop is not supported."),
+ _("An invalid drag type was used."),
+ GET_ANCESTOR (view));
g_free (container_uri);
return;
}
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index d798b348d..a1cd2c9cd 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -6551,10 +6551,8 @@ file_mount_callback (NautilusFile *file,
name = nautilus_file_get_display_name (file);
/* Translators: %s is a file name formatted for display */
text = g_strdup_printf (_("Unable to access “%s”"), name);
- show_dialog (text,
- error->message,
- GTK_WINDOW (nautilus_files_view_get_window (view)),
- GTK_MESSAGE_ERROR);
+ show_error_dialog (text, error->message,
+ GTK_WINDOW (nautilus_files_view_get_window (view)));
g_free (text);
g_free (name);
}
@@ -6581,10 +6579,8 @@ file_unmount_callback (NautilusFile *file,
name = nautilus_file_get_display_name (file);
/* Translators: %s is a file name formatted for display */
text = g_strdup_printf (_("Unable to remove “%s”"), name);
- show_dialog (text,
- error->message,
- GTK_WINDOW (nautilus_files_view_get_window (view)),
- GTK_MESSAGE_ERROR);
+ show_error_dialog (text, error->message,
+ GTK_WINDOW (nautilus_files_view_get_window (view)));
g_free (text);
g_free (name);
}
@@ -6611,10 +6607,8 @@ file_eject_callback (NautilusFile *file,
name = nautilus_file_get_display_name (file);
/* Translators: %s is a file name formatted for display */
text = g_strdup_printf (_("Unable to eject “%s”"), name);
- show_dialog (text,
- error->message,
- GTK_WINDOW (nautilus_files_view_get_window (view)),
- GTK_MESSAGE_ERROR);
+ show_error_dialog (text, error->message,
+ GTK_WINDOW (nautilus_files_view_get_window (view)));
g_free (text);
g_free (name);
}
@@ -6635,10 +6629,9 @@ file_stop_callback (NautilusFile *file,
(error->code != G_IO_ERROR_CANCELLED &&
error->code != G_IO_ERROR_FAILED_HANDLED)))
{
- show_dialog (_("Unable to stop drive"),
- error->message,
- GTK_WINDOW (nautilus_files_view_get_window (view)),
- GTK_MESSAGE_ERROR);
+ show_error_dialog (_("Unable to stop drive"),
+ error->message,
+ GTK_WINDOW (nautilus_files_view_get_window (view)));
}
}
@@ -6749,10 +6742,8 @@ file_start_callback (NautilusFile *file,
name = nautilus_file_get_display_name (file);
/* Translators: %s is a file name formatted for display */
text = g_strdup_printf (_("Unable to start “%s”"), name);
- show_dialog (text,
- error->message,
- GTK_WINDOW (nautilus_files_view_get_window (view)),
- GTK_MESSAGE_ERROR);
+ show_error_dialog (text, error->message,
+ GTK_WINDOW (nautilus_files_view_get_window (view)));
g_free (text);
g_free (name);
}
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 4386921ee..c59a4f7af 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -1184,10 +1184,8 @@ search_for_application_dbus_call_notify_cb (GDBusProxy *proxy,
message = g_strdup_printf ("%s\n%s",
_("There was an internal error trying to search for applications:"),
error->message);
- show_dialog (_("Unable to search for application"),
- message,
- parameters_install->parent_window,
- GTK_MESSAGE_ERROR);
+ show_error_dialog (_("Unable to search for application"), message,
+ parameters_install->parent_window);
g_free (message);
}
else
@@ -1903,10 +1901,7 @@ activation_mount_not_mounted_callback (GObject *source_object,
error->code != G_IO_ERROR_FAILED_HANDLED &&
error->code != G_IO_ERROR_ALREADY_MOUNTED))
{
- show_dialog (_("Unable to access location"),
- error->message,
- parameters->parent_window,
- GTK_MESSAGE_ERROR);
+ show_error_dialog (_("Unable to access location"), error->message, parameters->parent_window);
}
if (error->domain != G_IO_ERROR ||
@@ -2201,10 +2196,8 @@ activation_mountable_mounted (NautilusFile *file,
error->code != G_IO_ERROR_FAILED_HANDLED &&
error->code != G_IO_ERROR_ALREADY_MOUNTED))
{
- show_dialog (_("Unable to access location"),
- error->message,
- parameters->parent_window,
- GTK_MESSAGE_ERROR);
+ show_error_dialog (_("Unable to access location"),
+ error->message, parameters->parent_window);
}
if (error->code == G_IO_ERROR_CANCELLED)
@@ -2292,10 +2285,8 @@ activation_mountable_started (NautilusFile *file,
(error->code != G_IO_ERROR_CANCELLED &&
error->code != G_IO_ERROR_FAILED_HANDLED))
{
- show_dialog (_("Unable to start location"),
- error->message,
- NULL,
- GTK_MESSAGE_ERROR);
+ show_error_dialog (_("Unable to start location"),
+ error->message, NULL);
}
if (error->code == G_IO_ERROR_CANCELLED)
diff --git a/src/nautilus-mime-application-chooser.c b/src/nautilus-mime-application-chooser.c
index a09bf322e..43399e0c3 100644
--- a/src/nautilus-mime-application-chooser.c
+++ b/src/nautilus-mime-application-chooser.c
@@ -84,10 +84,9 @@ add_clicked_cb (GtkButton *button,
{
message = g_strdup_printf (_("Error while adding “%s”: %s"),
g_app_info_get_display_name (info), error->message);
- show_dialog (_("Could not add application"),
- message,
- GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (chooser))),
- GTK_MESSAGE_ERROR);
+ show_error_dialog (_("Could not add application"),
+ message,
+ GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (chooser))));
g_error_free (error);
g_free (message);
}
@@ -117,10 +116,9 @@ remove_clicked_cb (GtkMenuItem *item,
chooser->content_type,
&error))
{
- show_dialog (_("Could not forget association"),
- error->message,
- GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (chooser))),
- GTK_MESSAGE_ERROR);
+ show_error_dialog (_("Could not forget association"),
+ error->message,
+ GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (chooser))));
g_error_free (error);
}
@@ -183,10 +181,9 @@ set_as_default_clicked_cb (GtkButton *button,
{
message = g_strdup_printf (_("Error while setting “%s” as default application: %s"),
g_app_info_get_display_name (info), error->message);
- show_dialog (_("Could not set as default"),
- message,
- GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (chooser))),
- GTK_MESSAGE_ERROR);
+ show_error_dialog (_("Could not set as default"),
+ message,
+ GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (chooser))));
}
g_object_unref (info);
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);
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 477812ef9..10b315c37 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -487,10 +487,9 @@ nautilus_properties_window_drag_data_received (GtkWidget *widget,
if (!exactly_one)
{
- show_dialog (_("You cannot assign more than one custom icon at a time!"),
- _("Please drop just one image to set a custom icon."),
- window,
- GTK_MESSAGE_ERROR);
+ show_error_dialog(_("You cannot assign more than one custom icon at a time!"),
+ _("Please drop just one image to set a custom icon."),
+ window);
}
else
{
@@ -505,17 +504,15 @@ nautilus_properties_window_drag_data_received (GtkWidget *widget,
f = g_file_new_for_uri (uris[0]);
if (!g_file_is_native (f))
{
- show_dialog (_("The file that you dropped is not local."),
- _("You can only use local images as custom icons."),
- window,
- GTK_MESSAGE_ERROR);
+ show_error_dialog(_("The file that you dropped is not local."),
+ _("You can only use local images as custom icons."),
+ window);
}
else
{
- show_dialog (_("The file that you dropped is not an image."),
- _("You can only use local images as custom icons."),
- window,
- GTK_MESSAGE_ERROR);
+ show_error_dialog(_("The file that you dropped is not an image."),
+ _("You can only use local images as custom icons."),
+ window);
}
g_object_unref (f);
}
@@ -3115,10 +3112,9 @@ open_in_disks (GtkButton *button,
if (error != NULL)
{
message = g_strdup_printf (_("Details: %s"), error->message);
- show_dialog (_("There was an error launching the application."),
- message,
- GTK_WINDOW (self),
- GTK_MESSAGE_ERROR);
+ show_error_dialog (_("There was an error launching the application."),
+ message,
+ GTK_WINDOW (self));
}
}
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);
diff --git a/src/nautilus-ui-utilities.h b/src/nautilus-ui-utilities.h
index 06b58f33a..a35aaec6e 100644
--- a/src/nautilus-ui-utilities.h
+++ b/src/nautilus-ui-utilities.h
@@ -25,28 +25,27 @@
#include <gtk/gtk.h>
-void nautilus_gmenu_add_item_in_submodel (GMenu *menu,
- GMenuItem *item,
- const gchar *section_name,
- gboolean prepend);
-void nautilus_gmenu_merge (GMenu *original,
- GMenu *gmenu_to_merge,
- const gchar *submodel_name,
- gboolean prepend);
-void nautilus_pop_up_context_menu_at_pointer (GtkWidget *parent,
- GMenu *menu,
- const GdkEvent *event);
-
-void nautilus_ui_frame_image (GdkPixbuf **pixbuf);
-void nautilus_ui_frame_video (GdkPixbuf **pixbuf);
-
-gboolean nautilus_file_date_in_between (guint64 file_unix_time,
- GDateTime *initial_date,
- GDateTime *end_date);
-gchar * get_text_for_date_range (GPtrArray *date_range,
- gboolean prefix_with_since);
-
-GtkDialog * show_dialog (const gchar *primary_text,
- const gchar *secondary_text,
- GtkWindow *parent,
- GtkMessageType type);
\ No newline at end of file
+void nautilus_gmenu_add_item_in_submodel (GMenu *menu,
+ GMenuItem *item,
+ const gchar *section_name,
+ gboolean prepend);
+void nautilus_gmenu_merge (GMenu *original,
+ GMenu *gmenu_to_merge,
+ const gchar *submodel_name,
+ gboolean prepend);
+void nautilus_pop_up_context_menu_at_pointer (GtkWidget *parent,
+ GMenu *menu,
+ const GdkEvent *event);
+
+void nautilus_ui_frame_image (GdkPixbuf **pixbuf);
+void nautilus_ui_frame_video (GdkPixbuf **pixbuf);
+
+gboolean nautilus_file_date_in_between (guint64 file_unix_time,
+ GDateTime *initial_date,
+ GDateTime *end_date);
+gchar* get_text_for_date_range (GPtrArray *date_range,
+ gboolean prefix_with_since);
+
+GtkDialog * show_error_dialog (const gchar *primary_text,
+ const gchar *secondary_text,
+ GtkWindow *parent);
\ No newline at end of file
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 895bbc209..541dd24a8 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -1526,7 +1526,7 @@ nautilus_window_slot_display_view_selection_failure (NautilusWindow *window,
detail_message = g_strdup_printf (_("Unhandled error message: %s"), error->message);
}
- show_dialog (error_message, detail_message, GTK_WINDOW (window), GTK_MESSAGE_ERROR);
+ show_error_dialog (error_message, detail_message, GTK_WINDOW (window));
done:
g_free (error_message);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 4dba58a37..05fb98572 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1110,7 +1110,7 @@ places_sidebar_show_error_message_cb (GtkPlacesSidebar *sidebar,
{
NautilusWindow *window = NAUTILUS_WINDOW (user_data);
- show_dialog (primary, secondary, GTK_WINDOW (window), GTK_MESSAGE_ERROR);
+ show_error_dialog (primary, secondary, GTK_WINDOW (window));
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
