Commit b1db3597 authored by Darin Adler's avatar Darin Adler
Browse files

src now compiles -- next problem is linking

        * Lots of files:
	src now compiles -- next problem is linking
parent 5f50533f
2001-10-30 Darin Adler <darin@bentspoon.com>
* Lots of files:
src now compiles -- next problem is linking
2001-10-29 Darin Adler <darin@bentspoon.com> 2001-10-29 Darin Adler <darin@bentspoon.com>
* Lots of files: * Lots of files:
......
BOOLEAN:POINTER BOOLEAN:POINTER
INT:POINTER,INT INT:POINTER,INT
INT:POINTER,POINTER INT:POINTER,POINTER
POINTER:VOID
VOID:DOUBLE
VOID:POINTER,INT,INT,INT VOID:POINTER,INT,INT,INT
VOID:POINTER,POINTER VOID:POINTER,POINTER
VOID:POINTER,POINTER VOID:POINTER,POINTER
......
...@@ -8,7 +8,7 @@ INCLUDES =\ ...@@ -8,7 +8,7 @@ INCLUDES =\
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/cut-n-paste-code/widgets/e-paned \ -I$(top_srcdir)/cut-n-paste-code/widgets/e-paned \
-I$(top_srcdir)/cut-n-paste-code/widgets/gimphwrapbox \ -I$(top_srcdir)/cut-n-paste-code/widgets/gimphwrapbox \
$(NAUTILUS_PRIVATE_CFLAGS) \ $(NAUTILUS_SRC_CFLAGS) \
-DVERSION="\"$(VERSION)\"" \ -DVERSION="\"$(VERSION)\"" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \ -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
...@@ -21,7 +21,7 @@ LDADD =\ ...@@ -21,7 +21,7 @@ LDADD =\
$(top_builddir)/libnautilus/libnautilus.la \ $(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-adapter/libnautilus-adapter.la \ $(top_builddir)/libnautilus-adapter/libnautilus-adapter.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \ $(top_builddir)/libnautilus-private/libnautilus-private.la \
$(NAUTILUS_PRIVATE_LIBS) \ $(NAUTILUS_SRC_LIBS) \
$(NULL) $(NULL)
nautilus_shell_interface_idl_sources = \ nautilus_shell_interface_idl_sources = \
...@@ -113,8 +113,8 @@ nautilus_SOURCES = \ ...@@ -113,8 +113,8 @@ nautilus_SOURCES = \
$(NULL) $(NULL)
$(nautilus_shell_interface_idl_sources): nautilus_shell_interface_idl_stamp $(nautilus_shell_interface_idl_sources): nautilus_shell_interface_idl_stamp
nautilus_shell_interface_idl_stamp: $(ORBIT_IDL) nautilus-shell-interface.idl $(top_srcdir)/libnautilus/nautilus-view-component.idl nautilus_shell_interface_idl_stamp: nautilus-shell-interface.idl $(ORBIT_IDL) $(top_srcdir)/libnautilus/nautilus-view-component.idl
$(ORBIT_IDL) $(IDL_CFLAGS) -I$(top_srcdir) $(srcdir)/nautilus-shell-interface.idl $(ORBIT_IDL) $(NAUTILUS_SRC_IDL_INCLUDES) -I$(top_srcdir) $<
touch $@ touch $@
$(nautilus_OBJECTS): nautilus_shell_interface_idl_stamp $(nautilus_OBJECTS): nautilus_shell_interface_idl_stamp
......
...@@ -4,8 +4,7 @@ noinst_LTLIBRARIES=libnautilus-file-manager.la ...@@ -4,8 +4,7 @@ noinst_LTLIBRARIES=libnautilus-file-manager.la
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(NAUTILUS_PRIVATE_CFLAGS) \ $(NAUTILUS_SRC_CFLAGS) \
$(MEDUSA_CFLAGS) \
-DVERSION="\"$(VERSION)\"" \ -DVERSION="\"$(VERSION)\"" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \ -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
......
...@@ -149,7 +149,7 @@ static void ...@@ -149,7 +149,7 @@ static void
panel_desktop_area_changed (FMDesktopIconView *icon_view) panel_desktop_area_changed (FMDesktopIconView *icon_view)
{ {
long *borders = NULL; long *borders = NULL;
GdkAtom type_returned; Atom type_returned;
int format_returned; int format_returned;
unsigned long items_returned; unsigned long items_returned;
unsigned long bytes_after_return; unsigned long bytes_after_return;
...@@ -162,8 +162,7 @@ panel_desktop_area_changed (FMDesktopIconView *icon_view) ...@@ -162,8 +162,7 @@ panel_desktop_area_changed (FMDesktopIconView *icon_view)
gdk_error_trap_push (); gdk_error_trap_push ();
if (XGetWindowProperty (GDK_DISPLAY (), if (XGetWindowProperty (GDK_DISPLAY (),
GDK_ROOT_WINDOW (), GDK_ROOT_WINDOW (),
gdk_atom_intern ("GNOME_PANEL_DESKTOP_AREA", gdk_x11_get_xatom_by_name ("GNOME_PANEL_DESKTOP_AREA"),
FALSE),
0 /* long_offset */, 0 /* long_offset */,
4 /* long_length */, 4 /* long_length */,
False /* delete */, False /* delete */,
...@@ -209,7 +208,7 @@ desktop_icon_view_property_filter (GdkXEvent *gdk_xevent, ...@@ -209,7 +208,7 @@ desktop_icon_view_property_filter (GdkXEvent *gdk_xevent,
switch (xevent->type) { switch (xevent->type) {
case PropertyNotify: case PropertyNotify:
if (xevent->xproperty.atom == gdk_atom_intern ("GNOME_PANEL_DESKTOP_AREA", FALSE)) { if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name ("GNOME_PANEL_DESKTOP_AREA")) {
panel_desktop_area_changed (icon_view); panel_desktop_area_changed (icon_view);
} }
break; break;
...@@ -257,7 +256,7 @@ fm_desktop_icon_view_destroy (GtkObject *object) ...@@ -257,7 +256,7 @@ fm_desktop_icon_view_destroy (GtkObject *object)
/* Clean up details */ /* Clean up details */
if (icon_view->details->ui != NULL) { if (icon_view->details->ui != NULL) {
bonobo_ui_component_unset_container (icon_view->details->ui); bonobo_ui_component_unset_container (icon_view->details->ui, NULL);
bonobo_object_unref (BONOBO_OBJECT (icon_view->details->ui)); bonobo_object_unref (BONOBO_OBJECT (icon_view->details->ui));
} }
...@@ -628,25 +627,25 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view) ...@@ -628,25 +627,25 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_trash_monitor_get ()), gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_trash_monitor_get ()),
"trash_state_changed", "trash_state_changed",
fm_desktop_icon_view_trash_state_changed_callback, G_CALLBACK (fm_desktop_icon_view_trash_state_changed_callback),
desktop_icon_view, desktop_icon_view,
GTK_OBJECT (desktop_icon_view)); GTK_OBJECT (desktop_icon_view));
gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_volume_monitor_get ()), gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_volume_monitor_get ()),
"volume_mounted", "volume_mounted",
volume_mounted_callback, G_CALLBACK (volume_mounted_callback),
desktop_icon_view, desktop_icon_view,
GTK_OBJECT (desktop_icon_view)); GTK_OBJECT (desktop_icon_view));
gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_volume_monitor_get ()), gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_volume_monitor_get ()),
"volume_unmounted", "volume_unmounted",
volume_unmounted_callback, G_CALLBACK (volume_unmounted_callback),
desktop_icon_view, desktop_icon_view,
GTK_OBJECT (desktop_icon_view)); GTK_OBJECT (desktop_icon_view));
eel_preferences_add_callback (NAUTILUS_PREFERENCES_HOME_URI, eel_preferences_add_callback (NAUTILUS_PREFERENCES_HOME_URI,
home_uri_changed, home_uri_changed,
desktop_icon_view); desktop_icon_view);
/* Read out the panel desktop area and update the icon container /* Read out the panel desktop area and update the icon container
* accordingly */ * accordingly */
...@@ -1080,7 +1079,7 @@ mount_parameters_free (MountParameters *parameters) ...@@ -1080,7 +1079,7 @@ mount_parameters_free (MountParameters *parameters)
} }
static void static void
mount_parameters_free_wrapper (gpointer user_data) mount_parameters_free_wrapper (gpointer user_data, GClosure *closure)
{ {
mount_parameters_free ((MountParameters *)user_data); mount_parameters_free ((MountParameters *)user_data);
} }
...@@ -1157,13 +1156,11 @@ update_disks_menu (FMDesktopIconView *view) ...@@ -1157,13 +1156,11 @@ update_disks_menu (FMDesktopIconView *view)
g_free (command_path); g_free (command_path);
bonobo_ui_component_add_listener_full bonobo_ui_component_add_listener_full
(view->details->ui, (view->details->ui, command_name,
command_name, g_cclosure_new (G_CALLBACK (mount_or_unmount_removable_volume),
mount_or_unmount_removable_volume, mount_parameters_new (view, nautilus_volume_get_mount_path (volume)),
mount_parameters_new (view, nautilus_volume_get_mount_path (volume)), mount_parameters_free_wrapper));
mount_parameters_free_wrapper);
g_free (command_name); g_free (command_name);
} }
} }
...@@ -1255,7 +1252,8 @@ real_merge_menus (FMDirectoryView *view) ...@@ -1255,7 +1252,8 @@ real_merge_menus (FMDirectoryView *view)
desktop_view->details->ui = bonobo_ui_component_new ("Desktop Icon View"); desktop_view->details->ui = bonobo_ui_component_new ("Desktop Icon View");
bonobo_ui_component_set_container (desktop_view->details->ui, bonobo_ui_component_set_container (desktop_view->details->ui,
fm_directory_view_get_bonobo_ui_container (view)); fm_directory_view_get_bonobo_ui_container (view),
NULL);
bonobo_ui_util_set_ui (desktop_view->details->ui, bonobo_ui_util_set_ui (desktop_view->details->ui,
DATADIR, DATADIR,
"nautilus-desktop-icon-view-ui.xml", "nautilus-desktop-icon-view-ui.xml",
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include <gtk/gtksignal.h> #include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h> #include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h> #include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-geometry.h>
#include <libgnomeui/gnome-uidefs.h> #include <libgnomeui/gnome-uidefs.h>
#include <libgnomevfs/gnome-vfs-async-ops.h> #include <libgnomevfs/gnome-vfs-async-ops.h>
#include <libgnomevfs/gnome-vfs-mime.h> #include <libgnomevfs/gnome-vfs-mime.h>
...@@ -77,6 +76,7 @@ ...@@ -77,6 +76,7 @@
#include <libnautilus-private/nautilus-view-identifier.h> #include <libnautilus-private/nautilus-view-identifier.h>
#include <libnautilus/nautilus-bonobo-ui.h> #include <libnautilus/nautilus-bonobo-ui.h>
#include <math.h> #include <math.h>
#include <unistd.h>
/* The list view receives files from the directory model in chunks, to /* The list view receives files from the directory model in chunks, to
* improve responsiveness during loading. This is the number of files * improve responsiveness during loading. This is the number of files
...@@ -452,7 +452,7 @@ fm_directory_view_get_containing_window (FMDirectoryView *view) ...@@ -452,7 +452,7 @@ fm_directory_view_get_containing_window (FMDirectoryView *view)
gboolean gboolean
fm_directory_view_confirm_multiple_windows (FMDirectoryView *view, int count) fm_directory_view_confirm_multiple_windows (FMDirectoryView *view, int count)
{ {
GnomeDialog *dialog; GtkDialog *dialog;
char *prompt; char *prompt;
char *title; char *title;
...@@ -464,13 +464,12 @@ fm_directory_view_confirm_multiple_windows (FMDirectoryView *view, int count) ...@@ -464,13 +464,12 @@ fm_directory_view_confirm_multiple_windows (FMDirectoryView *view, int count)
"Are you sure you want to do this?"), count); "Are you sure you want to do this?"), count);
title = g_strdup_printf (_("Open %d Windows?"), count); title = g_strdup_printf (_("Open %d Windows?"), count);
dialog = eel_show_yes_no_dialog (prompt, title, dialog = eel_show_yes_no_dialog (prompt, title,
GNOME_STOCK_BUTTON_OK, _("OK"), _("Cancel"),
GNOME_STOCK_BUTTON_CANCEL, fm_directory_view_get_containing_window (view));
fm_directory_view_get_containing_window (view));
g_free (prompt); g_free (prompt);
g_free (title); g_free (title);
return gnome_dialog_run (dialog) == GNOME_OK; return gtk_dialog_run (dialog) == GTK_RESPONSE_OK;
} }
static gboolean static gboolean
...@@ -752,7 +751,7 @@ static gboolean ...@@ -752,7 +751,7 @@ static gboolean
confirm_delete_directly (FMDirectoryView *view, confirm_delete_directly (FMDirectoryView *view,
GList *uris) GList *uris)
{ {
GnomeDialog *dialog; GtkDialog *dialog;
char *prompt; char *prompt;
char *file_name; char *file_name;
int uri_count; int uri_count;
...@@ -781,12 +780,12 @@ confirm_delete_directly (FMDirectoryView *view, ...@@ -781,12 +780,12 @@ confirm_delete_directly (FMDirectoryView *view,
(prompt, (prompt,
_("Delete?"), _("Delete?"),
_("Delete"), _("Delete"),
GNOME_STOCK_BUTTON_CANCEL, _("Cancel"),
fm_directory_view_get_containing_window (view)); fm_directory_view_get_containing_window (view));
g_free (prompt); g_free (prompt);
return gnome_dialog_run (dialog) == GNOME_OK; return gtk_dialog_run (dialog) == GTK_RESPONSE_OK;
} }
static void static void
...@@ -1142,12 +1141,12 @@ add_scripts_directory (FMDirectoryView *view, ...@@ -1142,12 +1141,12 @@ add_scripts_directory (FMDirectoryView *view,
gtk_signal_connect (GTK_OBJECT (directory), gtk_signal_connect (GTK_OBJECT (directory),
"files_added", "files_added",
scripts_added_or_changed_callback, G_CALLBACK (scripts_added_or_changed_callback),
view); view);
gtk_signal_connect (GTK_OBJECT (directory), gtk_signal_connect (GTK_OBJECT (directory),
"files_changed", "files_changed",
scripts_added_or_changed_callback, G_CALLBACK (scripts_added_or_changed_callback),
view); view);
view->details->scripts_directory_list = g_list_prepend view->details->scripts_directory_list = g_list_prepend
...@@ -1198,41 +1197,41 @@ fm_directory_view_init (FMDirectoryView *view) ...@@ -1198,41 +1197,41 @@ fm_directory_view_init (FMDirectoryView *view)
gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view),
"stop_loading", "stop_loading",
GTK_SIGNAL_FUNC (stop_loading_callback), G_CALLBACK (stop_loading_callback),
view); view);
gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view),
"load_location", "load_location",
GTK_SIGNAL_FUNC (load_location_callback), G_CALLBACK (load_location_callback),
view); view);
gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view),
"selection_changed", "selection_changed",
GTK_SIGNAL_FUNC (selection_changed_callback), G_CALLBACK (selection_changed_callback),
view); view);
gtk_signal_connect (GTK_OBJECT (fm_directory_view_get_bonobo_control (view)), gtk_signal_connect (GTK_OBJECT (fm_directory_view_get_bonobo_control (view)),
"activate", "activate",
bonobo_control_activate_callback, G_CALLBACK (bonobo_control_activate_callback),
view); view);
gtk_signal_connect (GTK_OBJECT (view->details->zoomable), gtk_signal_connect (GTK_OBJECT (view->details->zoomable),
"zoom_in", "zoom_in",
zoomable_zoom_in_callback, G_CALLBACK (zoomable_zoom_in_callback),
view); view);
gtk_signal_connect (GTK_OBJECT (view->details->zoomable), gtk_signal_connect (GTK_OBJECT (view->details->zoomable),
"zoom_out", "zoom_out",
zoomable_zoom_out_callback, G_CALLBACK (zoomable_zoom_out_callback),
view); view);
gtk_signal_connect (GTK_OBJECT (view->details->zoomable), gtk_signal_connect (GTK_OBJECT (view->details->zoomable),
"set_zoom_level", "set_zoom_level",
GTK_SIGNAL_FUNC (zoomable_set_zoom_level_callback), G_CALLBACK (zoomable_set_zoom_level_callback),
view); view);
gtk_signal_connect (GTK_OBJECT (view->details->zoomable), gtk_signal_connect (GTK_OBJECT (view->details->zoomable),
"zoom_to_fit", "zoom_to_fit",
zoomable_zoom_to_fit_callback, G_CALLBACK (zoomable_zoom_to_fit_callback),
view); view);
gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_trash_monitor_get ()), gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_trash_monitor_get ()),
"trash_state_changed", "trash_state_changed",
fm_directory_view_trash_state_changed_callback, G_CALLBACK (fm_directory_view_trash_state_changed_callback),
view, view,
GTK_OBJECT (view)); GTK_OBJECT (view));
...@@ -1611,7 +1610,7 @@ static void ...@@ -1611,7 +1610,7 @@ static void
real_file_limit_reached (FMDirectoryView *view) real_file_limit_reached (FMDirectoryView *view)
{ {
NautilusFile *file; NautilusFile *file;
GnomeDialog *dialog; GtkDialog *dialog;
char *directory_name; char *directory_name;
char *message; char *message;
...@@ -1751,19 +1750,11 @@ typedef struct { ...@@ -1751,19 +1750,11 @@ typedef struct {
static void static void
debuting_uri_data_free (DebutingUriData *data) debuting_uri_data_free (DebutingUriData *data)
{ {
eel_g_hash_table_destroy_deep_custom g_hash_table_destroy (data->debuting_uris);
(data->debuting_uris, (GFunc) g_free, NULL, NULL, NULL);
nautilus_file_list_free (data->added_files); nautilus_file_list_free (data->added_files);
g_free (data); g_free (data);
} }
static gboolean
remove_debuting_uri (GHashTable *hash_table, const char *key)
{
return eel_g_hash_table_remove_deep_custom
(hash_table, key, (GFunc) g_free, NULL, NULL, NULL);
}
/* This signal handler watch for the arrival of the icons created /* This signal handler watch for the arrival of the icons created
* as the result of a file operation. Once the last one is detected * as the result of a file operation. Once the last one is detected
* it selects and reveals them all. * it selects and reveals them all.
...@@ -1777,7 +1768,7 @@ debuting_uri_add_file_callback (FMDirectoryView *view, ...@@ -1777,7 +1768,7 @@ debuting_uri_add_file_callback (FMDirectoryView *view,
uri = nautilus_file_get_uri (new_file); uri = nautilus_file_get_uri (new_file);
if (remove_debuting_uri (data->debuting_uris, uri)) { if (g_hash_table_remove (data->debuting_uris, uri)) {
gtk_object_ref (GTK_OBJECT (new_file)); gtk_object_ref (GTK_OBJECT (new_file));
data->added_files = g_list_prepend (data->added_files, new_file); data->added_files = g_list_prepend (data->added_files, new_file);
...@@ -1785,7 +1776,7 @@ debuting_uri_add_file_callback (FMDirectoryView *view, ...@@ -1785,7 +1776,7 @@ debuting_uri_add_file_callback (FMDirectoryView *view,
fm_directory_view_set_selection (view, data->added_files); fm_directory_view_set_selection (view, data->added_files);
fm_directory_view_reveal_selection (view); fm_directory_view_reveal_selection (view);
gtk_signal_disconnect_by_func (GTK_OBJECT (view), gtk_signal_disconnect_by_func (GTK_OBJECT (view),
debuting_uri_add_file_callback, G_CALLBACK (debuting_uri_add_file_callback),
data); data);
} }
} }
...@@ -1836,7 +1827,7 @@ pre_copy_move (FMDirectoryView *directory_view) ...@@ -1836,7 +1827,7 @@ pre_copy_move (FMDirectoryView *directory_view)
*/ */
gtk_signal_connect (GTK_OBJECT (directory_view), gtk_signal_connect (GTK_OBJECT (directory_view),
"add_file", "add_file",
pre_copy_move_add_file_callback, G_CALLBACK (pre_copy_move_add_file_callback),
copy_move_done_data); copy_move_done_data);
return copy_move_done_data; return copy_move_done_data;
...@@ -1852,7 +1843,7 @@ copy_move_done_partition_func (gpointer data, gpointer callback_data) ...@@ -1852,7 +1843,7 @@ copy_move_done_partition_func (gpointer data, gpointer callback_data)
gboolean result; gboolean result;
uri = nautilus_file_get_uri (NAUTILUS_FILE (data)); uri = nautilus_file_get_uri (NAUTILUS_FILE (data));
result = remove_debuting_uri ((GHashTable *) callback_data, uri); result = g_hash_table_remove ((GHashTable *) callback_data, uri);
g_free (uri); g_free (uri);
return result; return result;
...@@ -1909,7 +1900,7 @@ copy_move_done_callback (GHashTable *debuting_uris, gpointer data) ...@@ -1909,7 +1900,7 @@ copy_move_done_callback (GHashTable *debuting_uris, gpointer data)
* directory_view pointer. * directory_view pointer.
*/ */
gtk_signal_disconnect_by_func (GTK_OBJECT (directory_view), gtk_signal_disconnect_by_func (GTK_OBJECT (directory_view),
pre_copy_move_add_file_callback, G_CALLBACK (pre_copy_move_add_file_callback),
data); data);
/* Any items in the debuting_uris hash table that have /* Any items in the debuting_uris hash table that have
...@@ -1936,7 +1927,7 @@ copy_move_done_callback (GHashTable *debuting_uris, gpointer data) ...@@ -1936,7 +1927,7 @@ copy_move_done_callback (GHashTable *debuting_uris, gpointer data)
*/ */
gtk_signal_connect_full (GTK_OBJECT (directory_view), gtk_signal_connect_full (GTK_OBJECT (directory_view),
"add_file", "add_file",
debuting_uri_add_file_callback, G_CALLBACK (debuting_uri_add_file_callback),
NULL, NULL,
debuting_uri_data, debuting_uri_data,
(GtkDestroyNotify) debuting_uri_data_free, (GtkDestroyNotify) debuting_uri_data_free,
...@@ -2625,7 +2616,7 @@ fm_directory_view_get_bonobo_ui_container (FMDirectoryView *view) ...@@ -2625,7 +2616,7 @@ fm_directory_view_get_bonobo_ui_container (FMDirectoryView *view)
g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL); g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL);
return bonobo_control_get_remote_ui_container return bonobo_control_get_remote_ui_container
(fm_directory_view_get_bonobo_control (view)); (fm_directory_view_get_bonobo_control (view), NULL);
} }
/** /**
...@@ -2925,7 +2916,7 @@ file_name_from_uri (const char *uri) ...@@ -2925,7 +2916,7 @@ file_name_from_uri (const char *uri)
static gboolean static gboolean
fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean all) fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean all)
{ {
GnomeDialog *dialog; GtkDialog *dialog;
char *prompt; char *prompt;
int uri_count; int uri_count;
char *file_name; char *file_name;
...@@ -2957,18 +2948,18 @@ fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean ...@@ -2957,18 +2948,18 @@ fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean
(prompt, (prompt,
_("Delete Immediately?"), _("Delete Immediately?"),
_("Delete"), _("Delete"),
GNOME_STOCK_BUTTON_CANCEL, _("Cancel"),
fm_directory_view_get_containing_window (view)); fm_directory_view_get_containing_window (view));
g_free (prompt); g_free (prompt);
return gnome_dialog_run (dialog) == GNOME_OK; return gtk_dialog_run (dialog) == GTK_RESPONSE_OK;
} }
static gboolean static gboolean
confirm_delete_from_trash (FMDirectoryView *view, GList *uris) confirm_delete_from_trash (FMDirectoryView *view, GList *uris)
{ {
GnomeDialog *dialog;