[nautilus] bookmark: remove unused GIcon argument to nautilus_bookmark_new()

[Cosimo Cecchi <cosimoc src gnome org>]

commit 7aad4a33814e6e7fae5e762882db43452a575a83
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Sep 14 16:52:31 2012 -0400

    bookmark: remove unused GIcon argument to nautilus_bookmark_new()
    
    We always pass NULL these days.

 libnautilus-private/nautilus-bookmark.c |    4 +---
 libnautilus-private/nautilus-bookmark.h |    3 +--
 src/nautilus-bookmark-list.c            |    2 +-
 src/nautilus-bookmarks-window.c         |    3 +--
 src/nautilus-places-sidebar.c           |    2 +-
 src/nautilus-window-manage-views.c      |    2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index 880f553..ffaf695 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -549,14 +549,12 @@ nautilus_bookmark_get_uri (NautilusBookmark *bookmark)
 
 NautilusBookmark *
 nautilus_bookmark_new (GFile *location,
-		       const gchar *custom_name,
-                       GIcon *icon)
+		       const gchar *custom_name)
 {
 	NautilusBookmark *new_bookmark;
 
 	new_bookmark = NAUTILUS_BOOKMARK (g_object_new (NAUTILUS_TYPE_BOOKMARK,
 							"location", location,
-							"icon", icon,
 							"name", custom_name,
 							"custom-name", custom_name != NULL,
 							NULL));
diff --git a/libnautilus-private/nautilus-bookmark.h b/libnautilus-private/nautilus-bookmark.h
index df75cc6..56d034c 100644
--- a/libnautilus-private/nautilus-bookmark.h
+++ b/libnautilus-private/nautilus-bookmark.h
@@ -65,8 +65,7 @@ typedef struct NautilusBookmarkClass NautilusBookmarkClass;
 
 GType                 nautilus_bookmark_get_type               (void);
 NautilusBookmark *    nautilus_bookmark_new                    (GFile *location,
-                                                                const char *custom_name,
-                                                                GIcon *icon);
+                                                                const char *custom_name);
 NautilusBookmark *    nautilus_bookmark_copy                   (NautilusBookmark      *bookmark);
 const char *          nautilus_bookmark_get_name               (NautilusBookmark      *bookmark);
 GFile *               nautilus_bookmark_get_location           (NautilusBookmark      *bookmark);
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index b053b7f..ec04c56 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -67,7 +67,7 @@ new_bookmark_from_uri (const char *uri, const char *label)
 	new_bookmark = NULL;
 
 	if (location) {
-		new_bookmark = nautilus_bookmark_new (location, label, NULL);
+		new_bookmark = nautilus_bookmark_new (location, label);
 		g_object_unref (location);
 	}
 
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index 7d47cbf..ca99cc1 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -519,8 +519,7 @@ update_bookmark_from_text (NautilusBookmarksWindow *self)
 
 	bookmark = nautilus_bookmark_new (location,
 					  self->priv->name_text_changed ?
-					  gtk_entry_get_text (GTK_ENTRY (self->priv->name_field)) : NULL,
-					  NULL);
+					  gtk_entry_get_text (GTK_ENTRY (self->priv->name_field)) : NULL);
 	g_object_unref (location);
 
 	selected_row = get_selected_row (self);
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index fddb6be..64b6187 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -1901,7 +1901,7 @@ add_bookmark (NautilusPlacesSidebar *sidebar)
 		}
 
 		location = g_file_new_for_uri (uri);
-		bookmark = nautilus_bookmark_new (location, name, NULL);
+		bookmark = nautilus_bookmark_new (location, name);
 
 		if (!nautilus_bookmark_list_contains (sidebar->bookmarks, bookmark)) {
 			nautilus_bookmark_list_append (sidebar->bookmarks, bookmark);
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 836d34c..cf146da 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -134,7 +134,7 @@ set_displayed_file (NautilusWindowSlot *slot, NautilusFile *file)
 		if (new_location == NULL) {
 			slot->current_location_bookmark = NULL;
 		} else {
-			slot->current_location_bookmark = nautilus_bookmark_new (new_location, display_name, NULL);
+			slot->current_location_bookmark = nautilus_bookmark_new (new_location, display_name);
 		}
 		g_free (display_name);
         }