Commit 1852a2ae authored by Cosimo Cecchi's avatar Cosimo Cecchi Committed by Alexander Larsson

use GtkMountOperation instead of EelMountOperation

2008-10-06  Cosimo Cecchi  <cosimoc@gnome.org>

        * 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



svn path=/trunk/; revision=14690
parent c9aff00e
2008-10-06 Cosimo Cecchi <cosimoc@gnome.org>
* 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 <cosimoc@gnome.org> 2008-10-06 Cosimo Cecchi <cosimoc@gnome.org>
* libnautilus-private/nautilus-customization-data.c: * libnautilus-private/nautilus-customization-data.c:
......
...@@ -2218,7 +2218,7 @@ nautilus_file_operations_mount_volume_full (GtkWindow *parent_window, ...@@ -2218,7 +2218,7 @@ nautilus_file_operations_mount_volume_full (GtkWindow *parent_window,
{ {
GMountOperation *mount_op; 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), g_object_set_data (G_OBJECT (mount_op),
"mount-callback", "mount-callback",
mount_callback); mount_callback);
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <eel/eel-glib-extensions.h> #include <eel/eel-glib-extensions.h>
#include <eel/eel-stock-dialogs.h> #include <eel/eel-stock-dialogs.h>
#include <eel/eel-string.h> #include <eel/eel-string.h>
#include <eel/eel-mount-operation.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <string.h> #include <string.h>
...@@ -957,10 +956,14 @@ activation_start_timed_cancel (ActivateParameters *parameters) ...@@ -957,10 +956,14 @@ activation_start_timed_cancel (ActivateParameters *parameters)
} }
static void static void
activate_mount_op_active (EelMountOperation *operation, activate_mount_op_active (GtkMountOperation *operation,
gboolean is_active, GParamSpec *pspec,
ActivateParameters *parameters) ActivateParameters *parameters)
{ {
gboolean is_active;
g_object_get (operation, "is-showing", &is_active, NULL);
if (is_active) { if (is_active) {
if (parameters->timed_wait_active) { if (parameters->timed_wait_active) {
eel_timed_wait_stop (cancel_activate_callback, parameters); eel_timed_wait_stop (cancel_activate_callback, parameters);
...@@ -1312,8 +1315,9 @@ activation_mount_not_mounted (ActivateParameters *parameters) ...@@ -1312,8 +1315,9 @@ activation_mount_not_mounted (ActivateParameters *parameters)
if (parameters->not_mounted != NULL) { if (parameters->not_mounted != NULL) {
file = parameters->not_mounted->data; file = parameters->not_mounted->data;
mount_op = eel_mount_operation_new (parameters->parent_window); mount_op = gtk_mount_operation_new (parameters->parent_window);
g_signal_connect (mount_op, "active_changed", (GCallback)activate_mount_op_active, parameters); g_signal_connect_object (mount_op, "notify::is-showing",
G_CALLBACK (activate_mount_op_active), parameters, 0);
location = nautilus_file_get_location (file); location = nautilus_file_get_location (file);
g_file_mount_enclosing_volume (location, 0, mount_op, parameters->cancellable, g_file_mount_enclosing_volume (location, 0, mount_op, parameters->cancellable,
activation_mount_not_mounted_callback, parameters); activation_mount_not_mounted_callback, parameters);
...@@ -1550,8 +1554,9 @@ activation_mount_mountables (ActivateParameters *parameters) ...@@ -1550,8 +1554,9 @@ activation_mount_mountables (ActivateParameters *parameters)
if (parameters->mountables != NULL) { if (parameters->mountables != NULL) {
file = parameters->mountables->data; file = parameters->mountables->data;
mount_op = eel_mount_operation_new (parameters->parent_window); mount_op = gtk_mount_operation_new (parameters->parent_window);
g_signal_connect (mount_op, "active_changed", (GCallback)activate_mount_op_active, parameters); g_signal_connect_object (mount_op, "notify::is-showing",
G_CALLBACK (activate_mount_op_active), parameters, 0);
nautilus_file_mount (file, nautilus_file_mount (file,
mount_op, mount_op,
parameters->cancellable, parameters->cancellable,
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include "fm-properties-window.h" #include "fm-properties-window.h"
#include "libnautilus-private/nautilus-open-with-dialog.h" #include "libnautilus-private/nautilus-open-with-dialog.h"
#include <eel/eel-mount-operation.h>
#include <eel/eel-background.h> #include <eel/eel-background.h>
#include <eel/eel-glib-extensions.h> #include <eel/eel-glib-extensions.h>
#include <eel/eel-gnome-extensions.h> #include <eel/eel-gnome-extensions.h>
...@@ -5934,7 +5933,7 @@ action_mount_volume_callback (GtkAction *action, ...@@ -5934,7 +5933,7 @@ action_mount_volume_callback (GtkAction *action,
file = NAUTILUS_FILE (l->data); file = NAUTILUS_FILE (l->data);
if (nautilus_file_can_mount (file)) { 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, nautilus_file_mount (file, mount_op, NULL,
NULL, NULL); NULL, NULL);
g_object_unref (mount_op); g_object_unref (mount_op);
...@@ -6023,7 +6022,7 @@ action_self_mount_volume_callback (GtkAction *action, ...@@ -6023,7 +6022,7 @@ action_self_mount_volume_callback (GtkAction *action,
return; 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); nautilus_file_mount (file, mount_op, NULL, NULL, NULL);
g_object_unref (mount_op); g_object_unref (mount_op);
} }
...@@ -6098,7 +6097,7 @@ action_location_mount_volume_callback (GtkAction *action, ...@@ -6098,7 +6097,7 @@ action_location_mount_volume_callback (GtkAction *action,
return; 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); nautilus_file_mount (file, mount_op, NULL, NULL, NULL);
g_object_unref (mount_op); g_object_unref (mount_op);
} }
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <eel/eel-preferences.h> #include <eel/eel-preferences.h>
#include <eel/eel-stock-dialogs.h> #include <eel/eel-stock-dialogs.h>
#include <eel/eel-mount-operation.h>
#include <libnautilus-private/nautilus-icon-names.h> #include <libnautilus-private/nautilus-icon-names.h>
...@@ -150,12 +149,13 @@ nautilus_connect_server_dialog_present_uri (NautilusApplication *application, ...@@ -150,12 +149,13 @@ nautilus_connect_server_dialog_present_uri (NautilusApplication *application,
{ {
GMountOperation *op; GMountOperation *op;
op = eel_mount_operation_new (GTK_WINDOW (widget)); op = gtk_mount_operation_new (GTK_WINDOW (widget));
g_file_mount_enclosing_volume (location, g_file_mount_enclosing_volume (location,
0, op, 0, op,
NULL, NULL,
(GAsyncReadyCallback) mount_enclosing_ready_cb, (GAsyncReadyCallback) mount_enclosing_ready_cb,
widget); widget);
g_object_unref (op);
} }
int int
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <eel/eel-gtk-macros.h> #include <eel/eel-gtk-macros.h>
#include <eel/eel-stock-dialogs.h> #include <eel/eel-stock-dialogs.h>
#include <eel/eel-string.h> #include <eel/eel-string.h>
#include <eel/eel-mount-operation.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
...@@ -1042,7 +1041,7 @@ got_file_info_for_view_selection_callback (NautilusFile *file, ...@@ -1042,7 +1041,7 @@ got_file_info_for_view_selection_callback (NautilusFile *file,
!slot->tried_mount) { !slot->tried_mount) {
slot->tried_mount = TRUE; 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); location = nautilus_file_get_location (file);
data = g_new0 (MountNotMountedData, 1); data = g_new0 (MountNotMountedData, 1);
data->cancellable = g_cancellable_new (); data->cancellable = g_cancellable_new ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment