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.

1 files changed, 29 insertions, 29 deletions

diff --git a/libnautilus-extensions/nautilus-stock-dialogs.h b/libnautilus-extensions/nautilus-stock-dialogs.h
index 3c28f1ebe..de9a46aec 100644
--- a/libnautilus-extensions/nautilus-stock-dialogs.h
+++ b/libnautilus-extensions/nautilus-stock-dialogs.h
@@ -25,42 +25,42 @@
 #ifndef NAUTILUS_STOCK_DIALOGS_H
 #define NAUTILUS_STOCK_DIALOGS_H
 
-#include <gtk/gtkwindow.h>
+#include <libgnomeui/gnome-dialog.h>
 
 typedef void (* NautilusCancelCallback) (gpointer callback_data);
 typedef struct NautilusTimedWait NautilusTimedWait;
 
 /* Dialog for cancelling something that normally is fast enough not to need a dialog. */
-NautilusTimedWait *nautilus_timed_wait_start        (const char             *window_title,
-						     const char             *wait_message,
-						     NautilusCancelCallback  cancel_callback,
-						     gpointer                callback_data,
-						     GDestroyNotify          destroy_notify,
-						     GtkWindow              *parent_window);
-void               nautilus_timed_wait_stop         (NautilusTimedWait      *timed_wait);
+NautilusTimedWait *nautilus_timed_wait_start          (const char             *window_title,
+						       const char             *wait_message,
+						       NautilusCancelCallback  cancel_callback,
+						       gpointer                callback_data,
+						       GDestroyNotify          destroy_notify,
+						       GtkWindow              *parent_window);
+void               nautilus_timed_wait_stop           (NautilusTimedWait      *timed_wait);
 
 /* Basic dialog with buttons. */
-int                nautilus_simple_dialog           (GtkWidget              *parent,
-						     const char             *text,
-						     const char             *title,
-						     ...);
+int                nautilus_simple_dialog             (GtkWidget              *parent,
+						       const char             *text,
+						       const char             *title,
+						       ...);
 
-/* Variations on gnome stock dialogs; these do line wrapping. */
-GtkWidget *        nautilus_info_dialog             (const char             *info);
-GtkWidget *        nautilus_info_dialog_parented    (const char             *info,
-						     GtkWindow              *parent);
-GtkWidget *        nautilus_warning_dialog          (const char             *warning);
-GtkWidget *        nautilus_warning_dialog_parented (const char             *warning,
-						     GtkWindow              *parent);
-GtkWidget *        nautilus_error_dialog            (const char             *error);
-GtkWidget *        nautilus_error_dialog_parented   (const char             *error,
-						     GtkWindow              *parent);
-GtkWidget *        nautilus_yes_no_dialog           (const char             *question,
-						     const char             *yes_label,
-						     const char             *no_label);
-GtkWidget *        nautilus_yes_no_dialog_parented  (const char             *question,
-						     const char             *yes_label,
-						     const char             *no_label,
-						     GtkWindow              *parent);
+/* Variations on gnome stock dialogs; these do line wrapping, we don't
+ * bother with non-parented versions, and we return GnomeDialog
+ * pointers instead of GtkWidget pointers.
+ */
+GnomeDialog *      nautilus_info_dialog               (const char             *informative_message,
+						       GtkWindow              *parent);
+GnomeDialog *      nautilus_warning_dialog            (const char             *warning_message,
+						       GtkWindow              *parent);
+GnomeDialog *      nautilus_error_dialog              (const char             *error_message,
+						       GtkWindow              *parent);
+GnomeDialog *      nautilus_error_dialog_with_details (const char             *error_message,
+						       const char             *detailed_error_message,
+						       GtkWindow              *parent);
+GnomeDialog *      nautilus_yes_no_dialog             (const char             *question,
+						       const char             *yes_label,
+						       const char             *no_label,
+						       GtkWindow              *parent);
 
 #endif /* NAUTILUS_STOCK_DIALOGS_H */