Fix how autorunning works. Instead of inhibiting autorunning every time we

2008-04-29  David Zeuthen  <davidz@redhat.com>

        * libnautilus-private/nautilus-autorun.c:
        * libnautilus-private/nautilus-autorun.h:
        * libnautilus-private/nautilus-file-operations.c:
        (volume_mount_cb), (nautilus_file_operations_mount_volume):
        * libnautilus-private/nautilus-file-operations.h:
        * libnautilus-private/nautilus-mime-actions.c:
        (activation_mount_not_mounted_callback):
        * libnautilus-private/nautilus-vfs-file.c:
        (vfs_file_mount_callback):
        * src/nautilus-application.c: (startup_volume_mount_cb),
        (volume_added_callback):
        * src/nautilus-places-sidebar.c: (open_selected_bookmark),
        (mount_shortcut_cb):
        * src/nautilus-window-manage-views.c: (mount_not_mounted_callback):
        Fix how autorunning works. Instead of inhibiting autorunning
        every time we run something, we turn things around and instead
        allow automounting only in the instance where Nautilus automounted
        something itself. So in essence this patch is s/inhibit/allow/.
        This fixes an annoying problem where Nautilus would do autorun
        everytime something was mounted even from the command line. A
        consequence of this are windows popping up and other annoyances.
        This patch fixes that problem.

        * src/nautilus-x-content-bar.c: (nautilus_x_content_bar_init):
        Make sure the label is ellipsized.


svn path=/trunk/; revision=14112

4 files changed, 7 insertions, 8 deletions

diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 0c0611c81..04875acb7 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -171,9 +171,7 @@ startup_volume_mount_cb (GObject *source_object,
 			 GAsyncResult *res,
 			 gpointer user_data)
 {
-	if (g_volume_mount_finish (G_VOLUME (source_object), res, NULL)) {
-		nautilus_inhibit_autorun_for_volume (G_VOLUME (source_object));
-	}
+	g_volume_mount_finish (G_VOLUME (source_object), res, NULL);
 }
 
 static void
@@ -1344,7 +1342,7 @@ volume_added_callback (GVolumeMonitor *monitor,
 	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT) &&
 	    g_volume_should_automount (volume) &&
 	    g_volume_can_mount (volume)) {
-		nautilus_file_operations_mount_volume (NULL, volume, FALSE);
+		nautilus_file_operations_mount_volume (NULL, volume, TRUE);
 	}
 }
 
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index 766d408ce..75ffb93e5 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -1304,7 +1304,7 @@ open_selected_bookmark (NautilusPlacesSidebar *sidebar,
 		GVolume *volume;
 		gtk_tree_model_get (model, &iter, PLACES_SIDEBAR_COLUMN_VOLUME, &volume, -1);
 		if (volume != NULL) {
-			nautilus_file_operations_mount_volume (NULL, volume, TRUE);
+			nautilus_file_operations_mount_volume (NULL, volume, FALSE);
 			g_object_unref (volume);
 		}
 	}
@@ -1419,7 +1419,7 @@ mount_shortcut_cb (GtkMenuItem           *item,
 			    -1);
 
 	if (volume != NULL) {
-		nautilus_file_operations_mount_volume (NULL, volume, TRUE);
+		nautilus_file_operations_mount_volume (NULL, volume, FALSE);
 		g_object_unref (volume);
 	}
 }
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index b59a5ff39..4c8b23f8b 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -913,7 +913,6 @@ mount_not_mounted_callback (GObject *source_object,
 		window->details->mount_error = NULL;
 		g_error_free (error);
 	} else {
-		nautilus_inhibit_autorun_for_file (G_FILE (source_object));
 		nautilus_file_invalidate_all_attributes (window->details->determine_view_file);
 		nautilus_file_call_when_ready (window->details->determine_view_file,
 					       NAUTILUS_FILE_ATTRIBUTE_INFO |
diff --git a/src/nautilus-x-content-bar.c b/src/nautilus-x-content-bar.c
index f1518423a..25130e8b6 100644
--- a/src/nautilus-x-content-bar.c
+++ b/src/nautilus-x-content-bar.c
@@ -271,7 +271,9 @@ nautilus_x_content_bar_init (NautilusXContentBar *bar)
 	hbox = GTK_WIDGET (bar);
 
 	bar->priv->label = gtk_label_new (NULL);
-	gtk_box_pack_start (GTK_BOX (bar), bar->priv->label, FALSE, FALSE, 0);
+	gtk_label_set_ellipsize (GTK_LABEL (bar->priv->label), PANGO_ELLIPSIZE_END);
+	gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (bar), bar->priv->label, TRUE, TRUE, 0);
 
 	bar->priv->button = gtk_button_new ();
 	gtk_box_pack_end (GTK_BOX (hbox), bar->priv->button, FALSE, FALSE, 0);