diff options
| author | Alexander Larsson <alexl@redhat.com> | 2004-12-15 11:44:41 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2004-12-15 11:44:41 +0000 |
| commit | 9a34ea6e028adf20fb12c470e3d5aabbe9dd61c4 (patch) | |
| tree | db5617fbf6acba3cb3aa7486fc4e4590422487c9 | |
| parent | d48b6fc82484d51c48dd42ad8fe38fe7f1892c28 (diff) | |
| download | nautilus-9a34ea6e028adf20fb12c470e3d5aabbe9dd61c4.tar.gz | |
Fill in ctrl-l dialog correctly for desktop.
2004-12-15 Alexander Larsson <alexl@redhat.com>
* src/nautilus-location-dialog.c: (nautilus_location_dialog_new):
Fill in ctrl-l dialog correctly for desktop.
Patch from Matthew Gatto <poobar@nycap.rr.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/nautilus-location-dialog.c | 8 |
2 files changed, 14 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2004-12-15 Alexander Larsson <alexl@redhat.com> + * src/nautilus-location-dialog.c: (nautilus_location_dialog_new): + Fill in ctrl-l dialog correctly for desktop. + + Patch from Matthew Gatto <poobar@nycap.rr.com> + +2004-12-15 Alexander Larsson <alexl@redhat.com> + * libnautilus-private/nautilus-icon-container.c: (nautilus_icon_container_update_icon): * libnautilus-private/nautilus-icon-factory.c: (load_icon_file): diff --git a/src/nautilus-location-dialog.c b/src/nautilus-location-dialog.c index 843832234..2226cc243 100644 --- a/src/nautilus-location-dialog.c +++ b/src/nautilus-location-dialog.c @@ -29,7 +29,9 @@ #include <gtk/gtkhbox.h> #include <gtk/gtklabel.h> #include <gtk/gtkstock.h> +#include <libnautilus-private/nautilus-file-utilities.h> #include "nautilus-location-entry.h" +#include "nautilus-desktop-window.h" struct _NautilusLocationDialogDetails { GtkWidget *entry; @@ -198,7 +200,11 @@ nautilus_location_dialog_new (NautilusWindow *window) location = nautilus_window_get_location (window); if (location != NULL) { - formatted_location = eel_format_uri_for_display (location); + if(NAUTILUS_IS_DESKTOP_WINDOW (window)) { + formatted_location = nautilus_get_desktop_directory (); + } else { + formatted_location = eel_format_uri_for_display (location); + } nautilus_entry_set_text (NAUTILUS_ENTRY (NAUTILUS_LOCATION_DIALOG (dialog)->details->entry), formatted_location); gtk_editable_select_region (GTK_EDITABLE (NAUTILUS_LOCATION_DIALOG (dialog)->details->entry), 0, -1); gtk_editable_set_position (GTK_EDITABLE (NAUTILUS_LOCATION_DIALOG (dialog)->details->entry), -1); |