diff options
| author | John Sullivan <sullivan@src.gnome.org> | 1999-12-29 16:57:31 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 1999-12-29 16:57:31 +0000 |
| commit | 130f9695d41b57aeea9b0bd64514829f71bd47fb (patch) | |
| tree | 6fe810537bcb2ecd354911d54337326832a30aad | |
| parent | 10cb529fc957bf6c9dafdfb4cb0f401267936e34 (diff) | |
| download | nautilus-130f9695d41b57aeea9b0bd64514829f71bd47fb.tar.gz | |
Added nautilus_bookmark_copy and fixed g_return_if_fail compile problem.
| -rw-r--r-- | ChangeLog-20000414 | 11 | ||||
| -rw-r--r-- | src/nautilus-bookmark.c | 10 | ||||
| -rw-r--r-- | src/nautilus-bookmark.h | 1 | ||||
| -rw-r--r-- | src/nautilus-bookmarklist.c | 13 |
4 files changed, 26 insertions, 9 deletions
diff --git a/ChangeLog-20000414 b/ChangeLog-20000414 index 41360d791..1f103d78b 100644 --- a/ChangeLog-20000414 +++ b/ChangeLog-20000414 @@ -1,5 +1,16 @@ 1999-12-28 John Sullivan <sullivan@eazel.com> + * src/nautilus-bookmarklist.c: + (nautilus_bookmarklist_contains): + changed two g_return_if_fail to g_return_val_if_fail. Eek! I + accidentally checked this in yesterday without compiling. I + should be tarred and feathered. + (nautilus_bookmarklist_append): Now calls new nautilus_bookmark_copy + * src/nautilus-bookmark.[ch]: + (nautilus_bookmark_copy): New method + +1999-12-28 John Sullivan <sullivan@eazel.com> + * src/nautilus-bookmark.c: * src/nautilus-bookmarklist.c: * src/nautilus-bookmarks-menu.c: diff --git a/src/nautilus-bookmark.c b/src/nautilus-bookmark.c index e18abc518..d04e6d527 100644 --- a/src/nautilus-bookmark.c +++ b/src/nautilus-bookmark.c @@ -141,6 +141,16 @@ nautilus_bookmark_compare_with (gconstpointer a, gconstpointer b) return 0; } +NautilusBookmark * +nautilus_bookmark_copy (const NautilusBookmark *bookmark) +{ + g_return_val_if_fail(NAUTILUS_IS_BOOKMARK (bookmark), NULL); + + return nautilus_bookmark_new( + nautilus_bookmark_get_name(bookmark), + nautilus_bookmark_get_uri(bookmark)); +} + const gchar * nautilus_bookmark_get_name (const NautilusBookmark *bookmark) { diff --git a/src/nautilus-bookmark.h b/src/nautilus-bookmark.h index e61f40d7b..3becbf7f2 100644 --- a/src/nautilus-bookmark.h +++ b/src/nautilus-bookmark.h @@ -56,6 +56,7 @@ typedef struct _NautilusBookmarkClass NautilusBookmarkClass; GtkType nautilus_bookmark_get_type (void); NautilusBookmark *nautilus_bookmark_new (const gchar *name, const gchar *uri); +NautilusBookmark *nautilus_bookmark_copy (const NautilusBookmark *); const gchar *nautilus_bookmark_get_name (const NautilusBookmark *); const gchar *nautilus_bookmark_get_uri (const NautilusBookmark *); diff --git a/src/nautilus-bookmarklist.c b/src/nautilus-bookmarklist.c index bc56c73ba..fa0fd909e 100644 --- a/src/nautilus-bookmarklist.c +++ b/src/nautilus-bookmarklist.c @@ -118,16 +118,11 @@ void nautilus_bookmarklist_append (NautilusBookmarklist *bookmarks, const NautilusBookmark *bookmark) { - NautilusBookmark *new_bookmark; - g_return_if_fail (NAUTILUS_IS_BOOKMARKLIST (bookmarks)); g_return_if_fail (NAUTILUS_IS_BOOKMARK (bookmark)); - new_bookmark = nautilus_bookmark_new( - nautilus_bookmark_get_name(bookmark), - nautilus_bookmark_get_uri(bookmark)); - - bookmarks->list = g_list_append(bookmarks->list, new_bookmark); + bookmarks->list = g_list_append(bookmarks->list, + nautilus_bookmark_copy(bookmark)); nautilus_bookmarklist_contents_changed(bookmarks); } @@ -144,8 +139,8 @@ gboolean nautilus_bookmarklist_contains (NautilusBookmarklist *bookmarks, const NautilusBookmark *bookmark) { - g_return_if_fail (NAUTILUS_IS_BOOKMARKLIST (bookmarks)); - g_return_if_fail (NAUTILUS_IS_BOOKMARK (bookmark)); + g_return_val_if_fail (NAUTILUS_IS_BOOKMARKLIST (bookmarks), FALSE); + g_return_val_if_fail (NAUTILUS_IS_BOOKMARK (bookmark), FALSE); return g_list_find_custom(bookmarks->list, (gpointer)bookmark, |