summaryrefslogtreecommitdiff
path: root/src/nautilus-window.h
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@src.gnome.org>2007-11-30 14:51:10 +0000
committerAlexander Larsson <alexl@src.gnome.org>2007-11-30 14:51:10 +0000
commit469047a2a58430026d68a3b99b223b922b18b8d1 (patch)
tree0d7422285604a348f98f3c93e39afdf570050678 /src/nautilus-window.h
parentce669bd18cf00a3fc485ffedc53850e2d89b57e0 (diff)
downloadnautilus-469047a2a58430026d68a3b99b223b922b18b8d1.tar.gz
Merge gio-branch
svn path=/trunk/; revision=13464
Diffstat (limited to 'src/nautilus-window.h')
-rw-r--r--src/nautilus-window.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 1d2f0bd55..d4ae6d428 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -68,7 +68,7 @@ typedef struct {
char * (* get_title) (NautilusWindow *window);
gboolean (* set_title) (NautilusWindow *window, const char *title);
- char * (* get_icon_name) (NautilusWindow *window);
+ NautilusIconInfo * (* get_icon) (NautilusWindow *window);
void (* load_view_as_menu) (NautilusWindow *window);
void (* set_content_view_widget) (NautilusWindow *window,
@@ -119,11 +119,12 @@ struct NautilusWindow {
GType nautilus_window_get_type (void);
void nautilus_window_show_window (NautilusWindow *window);
void nautilus_window_close (NautilusWindow *window);
-char * nautilus_window_get_location (NautilusWindow *window);
+char * nautilus_window_get_location_uri (NautilusWindow *window);
+GFile * nautilus_window_get_location (NautilusWindow *window);
void nautilus_window_go_to (NautilusWindow *window,
- const char *location);
+ GFile *location);
void nautilus_window_go_to_with_selection (NautilusWindow *window,
- const char *location,
+ GFile *location,
GList *new_selection);
void nautilus_window_go_home (NautilusWindow *window);
void nautilus_window_go_up (NautilusWindow *window,