Commit 711e7694 authored by Darin Adler's avatar Darin Adler

Changed to use new call that's for receiving dropped images.

	* components/music/nautilus-music-view.c:
	(nautilus_music_view_drag_data_received):
	* libnautilus-extensions/nautilus-icon-dnd.c:
	(receive_dropped_tile_image):
	* src/nautilus-sidebar.c: (receive_dropped_uri_list):
	Changed to use new call that's for receiving dropped images.

	* src/nautilus-sidebar.c: (background_settings_changed_callback),
	(background_appearance_changed_callback),
	(background_reset_callback), (nautilus_sidebar_update_info):
	Changed signal handlers to use the normal form instead of
	connect_object. Changed the reset callback to stop the reset
	signal from going any further now that there's a default handler
	for reset.

	* libnautilus-extensions/nautilus-directory-background.c:
	(background_reset_callback): Add a call to stop the reset signal
	from going any further now that there's a default handler for
	reset.

	* libnautilus-extensions/nautilus-background.h:
	* libnautilus-extensions/nautilus-background.c:
	(nautilus_background_initialize_class),
	(nautilus_background_receive_dropped_background_image),
	(nautilus_background_set_tile_image_uri),
	(nautilus_background_reset), (nautilus_background_real_reset):
	Made nautilus_background_reset set the color and image to NULL by
	default instead of doing nothing. Also added a new call to receive
	a dropped background image and only pay attention to the special
	"reset" image name there instead of hacking it into
	_set_tile_image_uri itself.

	* libnautilus-extensions/nautilus-stock-dialogs.h:
	* libnautilus-extensions/nautilus-stock-dialogs.c:
	(find_message_label), (find_message_label_callback),
	(show_message_box), (show_ok_box), (nautilus_info_dialog),
	(nautilus_warning_dialog), (nautilus_error_dialog),
	(clicked_callback), (nautilus_error_dialog_with_details),
	(nautilus_yes_no_dialog): Change the API for stock dialogs
	to be a little simpler, getting rid of the separate parented
	variant. Also added a new dialog for errors that have a second
	more detailed error message.

	* libnautilus-extensions/nautilus-program-chooser.c:
	(nautilus_program_chooser_show_no_choices_message):
	* libnautilus-extensions/nautilus-program-choosing.c:
	(nautilus_launch_application_parented):
	* src/file-manager/fm-error-reporting.c:
	(fm_report_error_renaming_file), (fm_report_error_setting_group),
	(fm_report_error_setting_owner),
	(fm_report_error_setting_permissions):
	* src/nautilus-property-browser.c: (emblem_image_file_changed),
	(add_background_to_browser):
	* src/nautilus-window-manage-views.c:
	(handle_unreadable_location),
	(nautilus_window_end_location_change_callback),
	(report_content_view_failure_to_user):
	* src/nautilus-window-menus.c: (show_bogus_bookmark_window):
	Change to use new API for stock dialogs.

	* src/nautilus-application.c: (create_factory),
	(nautilus_application_initialize),
	(nautilus_application_check_user_directories),
	(nautilus_application_startup):
	Moved OAF registration to application_startup and added some
	error handling for the case where we have two copies of Nautilus.

	* libnautilus-extensions/nautilus-file.h: Move get_mapped_uri
	out of the "good part" of the header and add a FIXME.

	* components/services/install/lib/.cvsignore:
	Ignore some new generated files. Maybe some day I can get Eskil to
	make these himself as he adds new things.
parent 62f445e5
2000-06-28 Darin Adler <darin@eazel.com>
* components/music/nautilus-music-view.c:
(nautilus_music_view_drag_data_received):
* libnautilus-extensions/nautilus-icon-dnd.c:
(receive_dropped_tile_image):
* src/nautilus-sidebar.c: (receive_dropped_uri_list):
Changed to use new call that's for receiving dropped images.
* src/nautilus-sidebar.c: (background_settings_changed_callback),
(background_appearance_changed_callback),
(background_reset_callback), (nautilus_sidebar_update_info):
Changed signal handlers to use the normal form instead of
connect_object. Changed the reset callback to stop the reset
signal from going any further now that there's a default handler
for reset.
* libnautilus-extensions/nautilus-directory-background.c:
(background_reset_callback): Add a call to stop the reset signal
from going any further now that there's a default handler for
reset.
* libnautilus-extensions/nautilus-background.h:
* libnautilus-extensions/nautilus-background.c:
(nautilus_background_initialize_class),
(nautilus_background_receive_dropped_background_image),
(nautilus_background_set_tile_image_uri),
(nautilus_background_reset), (nautilus_background_real_reset):
Made nautilus_background_reset set the color and image to NULL by
default instead of doing nothing. Also added a new call to receive
a dropped background image and only pay attention to the special
"reset" image name there instead of hacking it into
_set_tile_image_uri itself.
* libnautilus-extensions/nautilus-stock-dialogs.h:
* libnautilus-extensions/nautilus-stock-dialogs.c:
(find_message_label), (find_message_label_callback),
(show_message_box), (show_ok_box), (nautilus_info_dialog),
(nautilus_warning_dialog), (nautilus_error_dialog),
(clicked_callback), (nautilus_error_dialog_with_details),
(nautilus_yes_no_dialog): Change the API for stock dialogs
to be a little simpler, getting rid of the separate parented
variant. Also added a new dialog for errors that have a second
more detailed error message.
* libnautilus-extensions/nautilus-program-chooser.c:
(nautilus_program_chooser_show_no_choices_message):
* libnautilus-extensions/nautilus-program-choosing.c:
(nautilus_launch_application_parented):
* src/file-manager/fm-error-reporting.c:
(fm_report_error_renaming_file), (fm_report_error_setting_group),
(fm_report_error_setting_owner),
(fm_report_error_setting_permissions):
* src/nautilus-property-browser.c: (emblem_image_file_changed),
(add_background_to_browser):
* src/nautilus-window-manage-views.c:
(handle_unreadable_location),
(nautilus_window_end_location_change_callback),
(report_content_view_failure_to_user),
(report_sidebar_panel_failure_to_user):
* src/nautilus-window-menus.c: (show_bogus_bookmark_window):
Change to use new API for stock dialogs.
* src/nautilus-application.c: (create_factory),
(nautilus_application_initialize),
(nautilus_application_check_user_directories),
(nautilus_application_startup):
Moved OAF registration to application_startup and added some
error handling for the case where we have two copies of Nautilus.
* libnautilus-extensions/nautilus-file.h: Move get_mapped_uri
out of the "good part" of the header and add a FIXME.
* components/services/install/lib/.cvsignore:
Ignore some new generated files. Maybe some day I can get Eskil to
make these himself as he adds new things.
2000-06-28 John Sullivan <sullivan@eazel.com>
* libnautilus-extensions/nautilus-file.c:
......
......@@ -1433,7 +1433,7 @@ nautilus_music_view_drag_data_received (GtkWidget *widget, GdkDragContext *conte
break;
case TARGET_BGIMAGE:
nautilus_background_set_tile_image_uri
nautilus_background_receive_dropped_background_image
(nautilus_get_widget_background (widget),
uris[0]);
break;
......
*.lo
.deps
.libs
Makefile
Makefile.in
eazel-install-query-lex.c
libeazelinstall.la
makefile.staticlib
trilobite-eazel-install-common.c
trilobite-eazel-install-skels.c
trilobite-eazel-install-stubs.c
......
......@@ -55,6 +55,7 @@ static void nautilus_background_draw_flat_box (GtkStyle *style,
int y,
int width,
int height);
static void nautilus_background_real_reset (NautilusBackground *background);
NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusBackground, nautilus_background, GTK_TYPE_OBJECT)
......@@ -65,7 +66,7 @@ enum {
LAST_SIGNAL
};
#define RESET_BACKGROUND_IMAGE "reset.png"
#define RESET_BACKGROUND_MAGIC_IMAGE_NAME "reset.png"
static guint signals[LAST_SIGNAL];
......@@ -81,8 +82,10 @@ static void
nautilus_background_initialize_class (gpointer klass)
{
GtkObjectClass *object_class;
NautilusBackgroundClass *background_class;
object_class = GTK_OBJECT_CLASS (klass);
background_class = NAUTILUS_BACKGROUND_CLASS (klass);
signals[APPEARANCE_CHANGED] =
gtk_signal_new ("appearance_changed",
......@@ -93,7 +96,6 @@ nautilus_background_initialize_class (gpointer klass)
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE,
0);
signals[SETTINGS_CHANGED] =
gtk_signal_new ("settings_changed",
GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
......@@ -103,7 +105,6 @@ nautilus_background_initialize_class (gpointer klass)
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE,
0);
signals[RESET] =
gtk_signal_new ("reset",
GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
......@@ -117,6 +118,7 @@ nautilus_background_initialize_class (gpointer klass)
gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
object_class->destroy = nautilus_background_destroy;
background_class->reset = nautilus_background_real_reset;
}
static void
......@@ -295,8 +297,10 @@ void nautilus_background_draw_aa (NautilusBackground *background,
g_free (end_color_spec);
if (start_rgb != end_rgb) {
nautilus_gnome_canvas_fill_with_gradient(buffer, entire_width, entire_height, start_rgb, end_rgb,
horizontal_gradient);
nautilus_gnome_canvas_fill_with_gradient
(buffer, entire_width, entire_height,
start_rgb, end_rgb,
horizontal_gradient);
} else
gnome_canvas_buf_ensure_buf(buffer);
}
......@@ -378,6 +382,18 @@ start_loading_tile_image (NautilusBackground *background)
background);
}
void
nautilus_background_receive_dropped_background_image (NautilusBackground *background,
const char *image_uri)
{
/* Special case the reset-background image by file name. */
if (nautilus_str_has_suffix (image_uri, "/" RESET_BACKGROUND_MAGIC_IMAGE_NAME)) {
nautilus_background_reset (background);
} else {
nautilus_background_set_tile_image_uri (background, image_uri);
}
}
void
nautilus_background_set_tile_image_uri (NautilusBackground *background,
const char *image_uri)
......@@ -391,13 +407,6 @@ nautilus_background_set_tile_image_uri (NautilusBackground *background,
nautilus_cancel_gdk_pixbuf_load (background->details->load_tile_image_handle);
background->details->load_tile_image_handle = NULL;
/* special case the reset background image */
if (nautilus_str_has_suffix(image_uri, RESET_BACKGROUND_IMAGE)) {
nautilus_background_reset (background);
return;
}
g_free (background->details->tile_image_uri);
if (background->details->tile_image != NULL) {
......@@ -561,19 +570,22 @@ nautilus_background_is_set (NautilusBackground *background)
/**
* nautilus_background_reset:
*
* emit the reset signal to forget any color or image that has been set previously.
*
* Emit the reset signal to forget any color or image that has been
* set previously.
*/
void
nautilus_background_reset (NautilusBackground *background)
{
gtk_signal_emit (GTK_OBJECT (background),
gtk_signal_emit (GTK_OBJECT (background),
signals[RESET]);
}
gtk_signal_emit (GTK_OBJECT (background),
signals[SETTINGS_CHANGED]);
gtk_signal_emit (GTK_OBJECT (background),
signals[APPEARANCE_CHANGED]);
static void
nautilus_background_real_reset (NautilusBackground *background)
{
nautilus_background_set_color (background, NULL);
nautilus_background_set_tile_image_uri (background, NULL);
}
static void
......
......@@ -59,47 +59,51 @@ typedef struct NautilusBackgroundClass NautilusBackgroundClass;
#define NAUTILUS_IS_BACKGROUND_CLASS(klass) \
(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_BACKGROUND))
GtkType nautilus_background_get_type (void);
NautilusBackground *nautilus_background_new (void);
GtkType nautilus_background_get_type (void);
NautilusBackground *nautilus_background_new (void);
/* Calls to change a background. */
void nautilus_background_set_color (NautilusBackground *background,
const char *color_or_gradient);
void nautilus_background_set_tile_image_uri (NautilusBackground *background,
const char *image_uri);
void nautilus_background_reset (NautilusBackground *background);
void nautilus_background_set_color (NautilusBackground *background,
const char *color_or_gradient);
void nautilus_background_set_tile_image_uri (NautilusBackground *background,
const char *image_uri);
void nautilus_background_reset (NautilusBackground *background);
/* Calls to interrogate the current state of a background. */
char * nautilus_background_get_color (NautilusBackground *background);
char * nautilus_background_get_tile_image_uri (NautilusBackground *background);
gboolean nautilus_background_is_set (NautilusBackground *background);
char * nautilus_background_get_color (NautilusBackground *background);
char * nautilus_background_get_tile_image_uri (NautilusBackground *background);
gboolean nautilus_background_is_set (NautilusBackground *background);
/* Explicitly fills a rectangle with a background. */
void nautilus_background_draw (NautilusBackground *background,
GdkDrawable *drawable,
GdkGC *gc,
const GdkRectangle *rectangle,
int origin_x,
int origin_y);
void nautilus_background_draw (NautilusBackground *background,
GdkDrawable *drawable,
GdkGC *gc,
const GdkRectangle *rectangle,
int origin_x,
int origin_y);
/* Explicitly fills a rectangle with a background on the anti-aliased canvas. */
void nautilus_background_draw_aa (NautilusBackground *background,
GnomeCanvasBuf *buffer,
int entire_width,
int entire_height);
void nautilus_background_draw_aa (NautilusBackground *background,
GnomeCanvasBuf *buffer,
int entire_width,
int entire_height);
/* Handles a dragged color being dropped on a widget to change the background color. */
void nautilus_background_receive_dropped_color (NautilusBackground *background,
GtkWidget *widget,
int drop_location_x,
int drop_location_y,
const GtkSelectionData *dropped_color);
void nautilus_background_receive_dropped_color (NautilusBackground *background,
GtkWidget *widget,
int drop_location_x,
int drop_location_y,
const GtkSelectionData *dropped_color);
/* Handles a special-case image name that means "reset to default background" too. */
void nautilus_background_receive_dropped_background_image (NautilusBackground *background,
const char *image_uri);
/* Gets or creates a background so that it's attached to a widget. */
NautilusBackground *nautilus_get_widget_background (GtkWidget *widget);
NautilusBackground *nautilus_get_widget_background (GtkWidget *widget);
/* Find out if a nautilus background is too complex for GtkStyle, so that we have to draw it ourselves */
gboolean nautilus_background_is_too_complex_for_gtk_style (NautilusBackground *background);
gboolean nautilus_background_is_too_complex_for_gtk_style (NautilusBackground *background);
typedef struct NautilusBackgroundDetails NautilusBackgroundDetails;
......
......@@ -122,10 +122,12 @@ directory_changed_callback (NautilusDirectory *directory,
but for now, just use NULL */
static void
background_reset_callback (NautilusBackground *background,
NautilusDirectory *directory)
NautilusDirectory *directory)
{
nautilus_background_set_color (background, NULL);
nautilus_background_set_tile_image_uri (background, NULL);
gtk_signal_emit_stop_by_name (GTK_OBJECT (background),
"reset");
}
/* handle the background destroyed signal */
......
......@@ -108,7 +108,6 @@ gboolean nautilus_file_check_if_ready (NautilusFile *file,
/* Basic attributes for file objects. */
char * nautilus_file_get_name (NautilusFile *file);
char * nautilus_file_get_uri (NautilusFile *file);
char * nautilus_file_get_mapped_uri (NautilusFile *file);
GnomeVFSFileSize nautilus_file_get_size (NautilusFile *file);
GnomeVFSFileType nautilus_file_get_file_type (NautilusFile *file);
char * nautilus_file_get_mime_type (NautilusFile *file);
......@@ -222,6 +221,9 @@ int nautilus_file_compare_for_sort_reversed (NautilusFile
int nautilus_file_compare_name (NautilusFile *file_1,
const char *pattern);
/* FIXME: This probably doesn't belong in here, since it involves opening the file. */
char * nautilus_file_get_mapped_uri (NautilusFile *file);
/* Give a file a chance to activate itself instead of letting the
* location-based framework do it.
*/
......
......@@ -467,8 +467,8 @@ nautilus_icon_container_selection_items_local (const NautilusIconContainer *cont
static void
receive_dropped_tile_image (NautilusIconContainer *container, gpointer data)
{
g_assert(data != NULL);
nautilus_background_set_tile_image_uri
g_assert (data != NULL);
nautilus_background_receive_dropped_background_image
(nautilus_get_widget_background (GTK_WIDGET (container)), data);
}
......
......@@ -1459,7 +1459,7 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_
char *prompt;
char *unavailable_message;
char *file_name;
GtkWidget *dialog;
GnomeDialog *dialog;
file_name = nautilus_file_get_name (file);
......@@ -1479,15 +1479,10 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_
"for which file types with the \"File Types and "
"Programs\" part of the Gnome Control Center. Do "
"you want to go there now?", unavailable_message);
if (parent_window) {
dialog = nautilus_yes_no_dialog_parented
(prompt, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, parent_window);
} else {
dialog = nautilus_yes_no_dialog
(prompt, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL);
}
dialog = nautilus_yes_no_dialog
(prompt, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, parent_window);
gnome_dialog_button_connect (GNOME_DIALOG (dialog), GNOME_OK, launch_mime_capplet, NULL);
gnome_dialog_button_connect (dialog, GNOME_OK, launch_mime_capplet, NULL);
g_free (unavailable_message);
g_free (file_name);
......
......@@ -228,7 +228,7 @@ nautilus_launch_application_parented (GnomeVFSMimeApplication *application,
const char *uri,
GtkWindow *parent)
{
GtkWidget *dialog;
GnomeDialog *dialog;
char *command_string;
char *uri_or_path;
char *prompt;
......@@ -248,7 +248,7 @@ nautilus_launch_application_parented (GnomeVFSMimeApplication *application,
"\"%s\" is remote. If you want to open it "
"with %s, make a local copy first."),
application->name, uri, application->name);
dialog = nautilus_error_dialog_parented (prompt, parent);
dialog = nautilus_error_dialog (prompt, parent);
gtk_window_set_title (GTK_WINDOW (dialog), _("Can't open remote file"));
g_free (prompt);
......
......@@ -27,10 +27,13 @@
#include <gtk/gtkbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-messagebox.h>
#include <libgnomeui/gnome-stock.h>
#include <libgnomeui/gnome-uidefs.h>
#include "nautilus-string.h"
#include "nautilus-gnome-extensions.h"
struct NautilusTimedWait {
char *window_title;
......@@ -41,7 +44,7 @@ struct NautilusTimedWait {
GtkWindow *parent_window;
};
static void turn_on_line_wrap_flag_callback (GtkWidget *widget, gpointer callback_data);
static void find_message_label_callback (GtkWidget *widget, gpointer callback_data);
NautilusTimedWait *
nautilus_timed_wait_start (const char *window_title,
......@@ -166,7 +169,7 @@ nautilus_simple_dialog (GtkWidget *parent, const char *text, const char *title,
}
static void
turn_on_line_wrap_flag (GtkWidget *widget, const char *message)
find_message_label (GtkWidget *widget, const char *message)
{
char *text;
......@@ -176,110 +179,126 @@ turn_on_line_wrap_flag (GtkWidget *widget, const char *message)
if (GTK_IS_LABEL (widget)) {
gtk_label_get (GTK_LABEL (widget), &text);
if (nautilus_strcmp (text, message) == 0) {
gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
gtk_object_set_data (GTK_OBJECT (gtk_widget_get_toplevel (widget)),
"message label", widget);
}
}
/* Recurse for children. */
if (GTK_IS_CONTAINER (widget)) {
gtk_container_foreach (GTK_CONTAINER (widget),
turn_on_line_wrap_flag_callback,
find_message_label_callback,
(char *) message);
}
}
static void
turn_on_line_wrap_flag_callback (GtkWidget *widget, gpointer callback_data)
find_message_label_callback (GtkWidget *widget, gpointer callback_data)
{
turn_on_line_wrap_flag (widget, callback_data);
find_message_label (widget, callback_data);
}
/* Shamelessly stolen from gnome-dialog-util.c: */
static GtkWidget *
show_ok_box (const char *message,
const char *type,
GtkWindow *parent)
/* Shamelessly stolen from gnome-dialog-utils.c: */
static GnomeDialog *
show_message_box (const char *message,
const char *type,
const char *button_one,
const char *button_two,
GtkWindow *parent)
{
GtkWidget *box;
GtkLabel *message_label;
box = gnome_message_box_new
(message, type, GNOME_STOCK_BUTTON_OK, NULL);
box = gnome_message_box_new (message, type, button_one, button_two, NULL);
/* A bit of a hack. We want to use gnome_message_box_new,
* but we want the message to be wrapped. So, we search
* for the label with this message so we can mark it.
*/
turn_on_line_wrap_flag (box, message);
find_message_label (box, message);
message_label = GTK_LABEL (gtk_object_get_data (GTK_OBJECT (box), "message label"));
gtk_label_set_line_wrap (message_label, TRUE);
if (parent != NULL) {
gnome_dialog_set_parent (GNOME_DIALOG(box), parent);
gnome_dialog_set_parent (GNOME_DIALOG (box), parent);
}
gtk_widget_show (box);
return box;
return GNOME_DIALOG (box);
}
static GtkWidget *
show_yes_no_box (const char *message,
const char *type,
const char *yes_label,
const char *no_label,
GtkWindow *parent)
static GnomeDialog *
show_ok_box (const char *message,
const char *type,
GtkWindow *parent)
{
GtkWidget *box;
box = gnome_message_box_new
(message, type, yes_label, no_label, NULL);
/* A bit of a hack. We want to use gnome_message_box_new,
* but we want the message to be wrapped. So, we search
* for the label with this message so we can mark it.
*/
turn_on_line_wrap_flag (box, message);
if (parent != NULL) {
gnome_dialog_set_parent (GNOME_DIALOG(box), parent);
}
gtk_widget_show (box);
return box;
return show_message_box (message, type, GNOME_STOCK_BUTTON_OK, NULL, parent);
}
GtkWidget *
nautilus_info_dialog (const char *info)
{
return show_ok_box (info, GNOME_MESSAGE_BOX_INFO, NULL);
}
GtkWidget *
nautilus_info_dialog_parented (const char *info,
GtkWindow *parent)
GnomeDialog *
nautilus_info_dialog (const char *info,
GtkWindow *parent)
{
return show_ok_box (info, GNOME_MESSAGE_BOX_INFO, parent);
}
GtkWidget *
nautilus_warning_dialog (const char *warning)
GnomeDialog *
nautilus_warning_dialog (const char *warning,
GtkWindow *parent)
{
return show_ok_box (warning, GNOME_MESSAGE_BOX_WARNING, NULL);
return show_ok_box (warning, GNOME_MESSAGE_BOX_WARNING, parent);
}
GtkWidget *
nautilus_warning_dialog_parented (const char *warning,
GtkWindow *parent)
GnomeDialog *
nautilus_error_dialog (const char *error,
GtkWindow *parent)
{
return show_ok_box (warning, GNOME_MESSAGE_BOX_WARNING, parent);
return show_ok_box (error, GNOME_MESSAGE_BOX_ERROR, parent);
}
GtkWidget *
nautilus_error_dialog (const char *error)
static void
clicked_callback (GnomeDialog *dialog,
int button_number,
const char *detailed_error_message)
{
return show_ok_box (error, GNOME_MESSAGE_BOX_ERROR, NULL);
GtkLabel *label;
switch (button_number) {
case 0: /* Details */
label = GTK_LABEL (gtk_object_get_data (GTK_OBJECT (dialog), "message label"));
gtk_label_set_text (label, detailed_error_message);
gtk_widget_hide (GTK_WIDGET (nautilus_gnome_dialog_get_button_by_index (dialog, 0)));
break;
case 1: /* OK */
gnome_dialog_close (dialog);
break;
}
}
GtkWidget *
nautilus_error_dialog_parented (const char *error,
GtkWindow *parent)
GnomeDialog *
nautilus_error_dialog_with_details (const char *error_message,
const char *detailed_error_message,
GtkWindow *parent)
{
return show_ok_box (error, GNOME_MESSAGE_BOX_ERROR, parent);
GnomeDialog *dialog;
g_return_val_if_fail (error_message != NULL, NULL);
g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
if (detailed_error_message == NULL
|| strcmp (error_message, detailed_error_message) == 0) {
return nautilus_error_dialog (error_message, parent);
}
dialog = show_message_box (error_message, GNOME_MESSAGE_BOX_ERROR,