summaryrefslogtreecommitdiff
path: root/src/nautilus-x-content-bar.c
diff options
context:
space:
mode:
authorDavid Zeuthen <davidz@redhat.com>2008-04-30 01:09:55 +0000
committerDavid Zeuthen <davidz@src.gnome.org>2008-04-30 01:09:55 +0000
commit0e85a1cae0370ad4f4b7de85948c5d1698a5fde1 (patch)
tree9adec852ec66def150b9f0742362331456087910 /src/nautilus-x-content-bar.c
parentfe93322d03a57cb687bbede0499fee52ad200aa0 (diff)
downloadnautilus-0e85a1cae0370ad4f4b7de85948c5d1698a5fde1.tar.gz
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
Diffstat (limited to 'src/nautilus-x-content-bar.c')
-rw-r--r--src/nautilus-x-content-bar.c4
1 files changed, 3 insertions, 1 deletions
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);