diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-06-23 08:27:28 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-06-23 08:27:28 +0000 |
| commit | 199f10b46d760d3578179bf469fcf36520991a12 (patch) | |
| tree | 4090a227bb5954f4c503ee592d6df84da787ecb6 /libnautilus-private/nautilus-bookmark.c | |
| parent | 5a0426d093a78234fcbf128a6d011180a761cf70 (diff) | |
| download | nautilus-199f10b46d760d3578179bf469fcf36520991a12.tar.gz | |
Patch from Jamie McCracken <jamiemcc@blueyonder.co.uk>
2005-06-23 Alexander Larsson <alexl@redhat.com>
Patch from Jamie McCracken <jamiemcc@blueyonder.co.uk>
* src/nautilus-bookmark-list.[ch]:
Share bookmarks with gtk+.
* libnautilus-private/nautilus-file-utilities.[ch]:
* src/nautilus-window.c: (real_get_title):
Move compute_default_title to nautilus_compute_title_for_uri.
* libnautilus-private/nautilus-bookmark.[ch]:
* src/nautilus-bookmarks-window.c:
Add has_custom_name boolean to NautilusBookmark
* src/Makefile.am:
* src/nautilus-bookmark-parsing.[ch]:
* src/nautilus-navigation-window-menus.c:
Remove no longer needed files nautilus-bookmark-parsing.[ch].
Diffstat (limited to 'libnautilus-private/nautilus-bookmark.c')
| -rw-r--r-- | libnautilus-private/nautilus-bookmark.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c index 3335453c2..c71e3cf55 100644 --- a/libnautilus-private/nautilus-bookmark.c +++ b/libnautilus-private/nautilus-bookmark.c @@ -55,6 +55,7 @@ static guint signals[LAST_SIGNAL]; struct NautilusBookmarkDetails { char *name; + gboolean has_custom_name; char *uri; char *icon; NautilusFile *file; @@ -192,6 +193,7 @@ nautilus_bookmark_copy (NautilusBookmark *bookmark) return nautilus_bookmark_new_with_icon ( bookmark->details->uri, bookmark->details->name, + bookmark->details->has_custom_name, bookmark->details->icon); } @@ -203,6 +205,16 @@ nautilus_bookmark_get_name (NautilusBookmark *bookmark) return g_strdup (bookmark->details->name); } + +gboolean +nautilus_bookmark_get_has_custom_name (NautilusBookmark *bookmark) +{ + g_return_val_if_fail(NAUTILUS_IS_BOOKMARK (bookmark), FALSE); + + return (bookmark->details->has_custom_name); +} + + GdkPixbuf * nautilus_bookmark_get_pixbuf (NautilusBookmark *bookmark, guint icon_size, @@ -282,6 +294,12 @@ nautilus_bookmark_set_name (NautilusBookmark *bookmark, const char *new_name) return TRUE; } +void +nautilus_bookmark_set_has_custom_name (NautilusBookmark *bookmark, gboolean has_custom_name) +{ + bookmark->details->has_custom_name = has_custom_name; +} + static gboolean nautilus_bookmark_icon_is_different (NautilusBookmark *bookmark, char *new_icon) @@ -408,7 +426,7 @@ nautilus_bookmark_set_icon_to_default (NautilusBookmark *bookmark) NautilusBookmark * nautilus_bookmark_new (const char *uri, const char *name) { - return nautilus_bookmark_new_with_icon (uri, name, NULL); + return nautilus_bookmark_new_with_icon (uri, name, FALSE, NULL); } static void @@ -458,7 +476,7 @@ nautilus_bookmark_connect_file (NautilusBookmark *bookmark) } NautilusBookmark * -nautilus_bookmark_new_with_icon (const char *uri, const char *name, +nautilus_bookmark_new_with_icon (const char *uri, const char *name, gboolean has_custom_name, const char *icon) { NautilusBookmark *new_bookmark; @@ -469,7 +487,7 @@ nautilus_bookmark_new_with_icon (const char *uri, const char *name, new_bookmark->details->name = g_strdup (name); new_bookmark->details->uri = g_strdup (uri); - + new_bookmark->details->has_custom_name = has_custom_name; new_bookmark->details->icon = g_strdup (icon); nautilus_bookmark_connect_file (new_bookmark); |