nautilus r14690 - in trunk: . libnautilus-private src src/file-manager

[alexl svn gnome org]

Author: alexl
Date: Mon Oct  6 10:52:43 2008
New Revision: 14690
URL: http://svn.gnome.org/viewvc/nautilus?rev=14690&view=rev

Log:
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




Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-file-operations.c
   trunk/libnautilus-private/nautilus-mime-actions.c
   trunk/src/file-manager/fm-directory-view.c
   trunk/src/nautilus-connect-server-dialog-main.c
   trunk/src/nautilus-window-manage-views.c

Modified: trunk/libnautilus-private/nautilus-file-operations.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file-operations.c	(original)
+++ trunk/libnautilus-private/nautilus-file-operations.c	Mon Oct  6 10:52:43 2008
@@ -2218,7 +2218,7 @@
 {
 	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);

Modified: trunk/libnautilus-private/nautilus-mime-actions.c
==============================================================================
--- trunk/libnautilus-private/nautilus-mime-actions.c	(original)
+++ trunk/libnautilus-private/nautilus-mime-actions.c	Mon Oct  6 10:52:43 2008
@@ -28,7 +28,6 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
-#include <eel/eel-mount-operation.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <string.h>
@@ -957,10 +956,14 @@
 }
 
 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 @@
 
 	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 @@
 
 	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,

Modified: trunk/src/file-manager/fm-directory-view.c
==============================================================================
--- trunk/src/file-manager/fm-directory-view.c	(original)
+++ trunk/src/file-manager/fm-directory-view.c	Mon Oct  6 10:52:43 2008
@@ -38,7 +38,6 @@
 #include "fm-properties-window.h"
 #include "libnautilus-private/nautilus-open-with-dialog.h"
 
-#include <eel/eel-mount-operation.h>
 #include <eel/eel-background.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gnome-extensions.h>
@@ -5934,7 +5933,7 @@
 		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 @@
 		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 @@
 		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);
 }

Modified: trunk/src/nautilus-connect-server-dialog-main.c
==============================================================================
--- trunk/src/nautilus-connect-server-dialog-main.c	(original)
+++ trunk/src/nautilus-connect-server-dialog-main.c	Mon Oct  6 10:52:43 2008
@@ -35,7 +35,6 @@
 
 #include <eel/eel-preferences.h>
 #include <eel/eel-stock-dialogs.h>
-#include <eel/eel-mount-operation.h>
 
 #include <libnautilus-private/nautilus-icon-names.h>
 
@@ -150,12 +149,13 @@
 {
 	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

Modified: trunk/src/nautilus-window-manage-views.c
==============================================================================
--- trunk/src/nautilus-window-manage-views.c	(original)
+++ trunk/src/nautilus-window-manage-views.c	Mon Oct  6 10:52:43 2008
@@ -48,7 +48,6 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
-#include <eel/eel-mount-operation.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
@@ -1042,7 +1041,7 @@
 	    !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 ();