Darin and I started out thinking we were going to start entering

	bugs for the FIXME items but we were distracted into fixing bugs
	and tweaking code that we found while doing so.

	* check-FIXME.pl: Won't search old ChangeLogs for FIXMEs either;
	changed FIXME format from "FIXME bug xxx" to "FIXME bugzilla.eazel.com xxx"

	* components/history/ntl-history-view.c:
	(hyperbola_navigation_history_notify_location_change): Moved bookmark
	naming hack here and added FIXME explaining it.

	* libnautilus-extensions/nautilus-bookmark.h,
	* libnautilus-extensions/nautilus-bookmark.c:
	(nautilus_bookmark_new), (nautilus_bookmark_new_with_name):
	Combined these two into one routine that takes both the uri and
	title; removed hack for trying to come up with good name for
	bookmark here.
	(nautilus_bookmark_get_pixmap_and_mask): Changed to call
	_get_pixbuf instead of duplicating code.
	(nautilus_bookmark_get_pixbuf): Changed interface to return
	pixbuf or NULL instead of boolean result & "out" parameter.

	* src/nautilus-bookmark-list.c,
	* src/nautilus-bookmarks-window.c,
	* src/nautilus-window-menus.c,
	* src/ntl-window-msgs.c:
	Updated callers of nautilus_bookmark_new and _new_with_name.

1 files changed, 8 insertions, 10 deletions

diff --git a/libnautilus-private/nautilus-bookmark.h b/libnautilus-private/nautilus-bookmark.h
index bf0345aea..f51087507 100644
--- a/libnautilus-private/nautilus-bookmark.h
+++ b/libnautilus-private/nautilus-bookmark.h
@@ -29,7 +29,7 @@
 #include <gdk/gdktypes.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-typedef struct _NautilusBookmark NautilusBookmark;
+typedef struct NautilusBookmark NautilusBookmark;
 
 #define NAUTILUS_TYPE_BOOKMARK \
 	(nautilus_bookmark_get_type ())
@@ -42,25 +42,24 @@ typedef struct _NautilusBookmark NautilusBookmark;
 #define NAUTILUS_IS_BOOKMARK_CLASS(klass) \
 	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_BOOKMARK))
 
-typedef struct _NautilusBookmarkDetails NautilusBookmarkDetails;
+typedef struct NautilusBookmarkDetails NautilusBookmarkDetails;
 
-struct _NautilusBookmark {
+struct NautilusBookmark {
 	GtkObject object;
 	NautilusBookmarkDetails *details;	
 };
 
-struct _NautilusBookmarkClass {
+struct NautilusBookmarkClass {
 	GtkObjectClass parent_class;
 };
 
-typedef struct _NautilusBookmarkClass NautilusBookmarkClass;
+typedef struct NautilusBookmarkClass NautilusBookmarkClass;
 
 
 
 GtkType           nautilus_bookmark_get_type            (void);
-NautilusBookmark *nautilus_bookmark_new_with_name       (const char              *uri,
+NautilusBookmark *nautilus_bookmark_new       		(const char              *uri,
 							 const char              *name);
-NautilusBookmark *nautilus_bookmark_new                 (const char              *uri);
 NautilusBookmark *nautilus_bookmark_copy                (const NautilusBookmark  *bookmark);
 const char *      nautilus_bookmark_get_name            (const NautilusBookmark  *bookmark);
 const char *      nautilus_bookmark_get_uri             (const NautilusBookmark  *bookmark);
@@ -74,9 +73,8 @@ gboolean          nautilus_bookmark_get_pixmap_and_mask (const NautilusBookmark
 							 guint                    icon_size,
 							 GdkPixmap              **pixmap_return,
 							 GdkBitmap              **mask_return);
-gboolean		  nautilus_bookmark_get_pixbuf(const NautilusBookmark *bookmark,
-								guint		icon_size,
-				       		 	GdkPixbuf 	**pixbuf_return);
+GdkPixbuf *       nautilus_bookmark_get_pixbuf          (const NautilusBookmark *bookmark,
+							 guint		icon_size);
 GtkWidget *       nautilus_bookmark_menu_item_new       (const NautilusBookmark  *bookmark);