diff --git a/ChangeLog b/ChangeLog index a5747842b0c3f0b63851f211eacc82bca89bbc99..27ae116e123c2859c0e3278acc7a3207eb72aa77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-10-06 Cosimo Cecchi + + * libnautilus-private/nautilus-file-operations.c: + * libnautilus-private/nautilus-mime-actions.c: + * src/file-manager/fm-directory-view.c: + * src/nautilus-connect-server-dialog-main.c: + * src/nautilus-window-manage-views.c: + use GtkMountOperation instead of EelMountOperation + 2008-10-06 Cosimo Cecchi * libnautilus-private/nautilus-customization-data.c: diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 927d3d2dd78c77c01dc85206d2e8ae3e506dc00b..ecfdb40b83501569c4a461cbbf887357a6a9abcd 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -2218,7 +2218,7 @@ nautilus_file_operations_mount_volume_full (GtkWindow *parent_window, { GMountOperation *mount_op; - mount_op = eel_mount_operation_new (parent_window); + mount_op = gtk_mount_operation_new (parent_window); g_object_set_data (G_OBJECT (mount_op), "mount-callback", mount_callback); diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c index 84d28f56026c371975d6029b4ba54bc934fb3fe3..44c818817c29d80b46168d4ef4a1fa342a23d77a 100644 --- a/libnautilus-private/nautilus-mime-actions.c +++ b/libnautilus-private/nautilus-mime-actions.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -957,10 +956,14 @@ activation_start_timed_cancel (ActivateParameters *parameters) } static void -activate_mount_op_active (EelMountOperation *operation, - gboolean is_active, +activate_mount_op_active (GtkMountOperation *operation, + GParamSpec *pspec, ActivateParameters *parameters) { + gboolean is_active; + + g_object_get (operation, "is-showing", &is_active, NULL); + if (is_active) { if (parameters->timed_wait_active) { eel_timed_wait_stop (cancel_activate_callback, parameters); @@ -1312,8 +1315,9 @@ activation_mount_not_mounted (ActivateParameters *parameters) if (parameters->not_mounted != NULL) { file = parameters->not_mounted->data; - mount_op = eel_mount_operation_new (parameters->parent_window); - g_signal_connect (mount_op, "active_changed", (GCallback)activate_mount_op_active, parameters); + mount_op = gtk_mount_operation_new (parameters->parent_window); + g_signal_connect_object (mount_op, "notify::is-showing", + G_CALLBACK (activate_mount_op_active), parameters, 0); location = nautilus_file_get_location (file); g_file_mount_enclosing_volume (location, 0, mount_op, parameters->cancellable, activation_mount_not_mounted_callback, parameters); @@ -1550,8 +1554,9 @@ activation_mount_mountables (ActivateParameters *parameters) if (parameters->mountables != NULL) { file = parameters->mountables->data; - mount_op = eel_mount_operation_new (parameters->parent_window); - g_signal_connect (mount_op, "active_changed", (GCallback)activate_mount_op_active, parameters); + mount_op = gtk_mount_operation_new (parameters->parent_window); + g_signal_connect_object (mount_op, "notify::is-showing", + G_CALLBACK (activate_mount_op_active), parameters, 0); nautilus_file_mount (file, mount_op, parameters->cancellable, diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index f94b2f7e9eaaa952caca1ad3cb7166fc5d677694..5685037e63636c177f16ca782c4026ff4ffb4045 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -38,7 +38,6 @@ #include "fm-properties-window.h" #include "libnautilus-private/nautilus-open-with-dialog.h" -#include #include #include #include @@ -5934,7 +5933,7 @@ action_mount_volume_callback (GtkAction *action, file = NAUTILUS_FILE (l->data); if (nautilus_file_can_mount (file)) { - mount_op = eel_mount_operation_new (fm_directory_view_get_containing_window (view)); + mount_op = gtk_mount_operation_new (fm_directory_view_get_containing_window (view)); nautilus_file_mount (file, mount_op, NULL, NULL, NULL); g_object_unref (mount_op); @@ -6023,7 +6022,7 @@ action_self_mount_volume_callback (GtkAction *action, return; } - mount_op = eel_mount_operation_new (fm_directory_view_get_containing_window (view)); + mount_op = gtk_mount_operation_new (fm_directory_view_get_containing_window (view)); nautilus_file_mount (file, mount_op, NULL, NULL, NULL); g_object_unref (mount_op); } @@ -6098,7 +6097,7 @@ action_location_mount_volume_callback (GtkAction *action, return; } - mount_op = eel_mount_operation_new (fm_directory_view_get_containing_window (view)); + mount_op = gtk_mount_operation_new (fm_directory_view_get_containing_window (view)); nautilus_file_mount (file, mount_op, NULL, NULL, NULL); g_object_unref (mount_op); } diff --git a/src/nautilus-connect-server-dialog-main.c b/src/nautilus-connect-server-dialog-main.c index 0704d98d1b8cb3748a920218bb0e4d91fada48e6..e96e8530409d30343780922da20b2693e1b56bc4 100644 --- a/src/nautilus-connect-server-dialog-main.c +++ b/src/nautilus-connect-server-dialog-main.c @@ -35,7 +35,6 @@ #include #include -#include #include @@ -150,12 +149,13 @@ nautilus_connect_server_dialog_present_uri (NautilusApplication *application, { GMountOperation *op; - op = eel_mount_operation_new (GTK_WINDOW (widget)); + op = gtk_mount_operation_new (GTK_WINDOW (widget)); g_file_mount_enclosing_volume (location, 0, op, NULL, (GAsyncReadyCallback) mount_enclosing_ready_cb, widget); + g_object_unref (op); } int diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index a064356c0409a195b6f8b528e4977ccd828312ba..2224e6a2583794d25e89146f811d23abd26cde7b 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include @@ -1042,7 +1041,7 @@ got_file_info_for_view_selection_callback (NautilusFile *file, !slot->tried_mount) { slot->tried_mount = TRUE; - mount_op = eel_mount_operation_new (GTK_WINDOW (window)); + mount_op = gtk_mount_operation_new (GTK_WINDOW (window)); location = nautilus_file_get_location (file); data = g_new0 (MountNotMountedData, 1); data->cancellable = g_cancellable_new ();