Fix for CR 6787971. Please review.
Description of the Change:
On renaming a bookmark via side pane, the bookmark was not updated into
.gtk-bookmarks file. Other apps were not able to pick up the change
immediately. Called nautilus_bookmark_list_save_file in bookmarks_edited
callback to save new name for the bookmark in .gtk-bookmarks file. Also
exposed function nautilus_bookmark_list_save_file in header file,
nautilus-bookmark-list.h
Changed Files: nautilus-2.25.2orig/src/nautilus-bookmark-list.h,
nautilus-2.25.2orig/src/nautilus-bookmark-list.c,
nautilus-2.25.2orig/src/nautilus-places-sidebar.c
Code Changes:
diff -urN nautilus-2.25.2orig/src/nautilus-bookmark-list.c
nautilus-2.25.2/src/nautilus-bookmark-list.c
--- nautilus-2.25.2orig/src/nautilus-bookmark-list.c 2009-02-10
17:55:28.196336811 +0530
+++ nautilus-2.25.2/src/nautilus-bookmark-list.c 2009-02-11
10:39:21.241993225 +0530
@@ -49,7 +49,6 @@
static void destroy
(GtkObject *object);
static void nautilus_bookmark_list_load_file
(NautilusBookmarkList *bookmarks);
-static void nautilus_bookmark_list_save_file
(NautilusBookmarkList *bookmarks);
G_DEFINE_TYPE(NautilusBookmarkList, nautilus_bookmark_list,
GTK_TYPE_OBJECT)
@@ -519,7 +518,7 @@
* Save bookmarks to disk.
* @bookmarks: the list of bookmarks to save.
**/
-static void
+void
nautilus_bookmark_list_save_file (NautilusBookmarkList *bookmarks)
{
GFile *file;
diff -urN nautilus-2.25.2orig/src/nautilus-bookmark-list.h
nautilus-2.25.2/src/nautilus-bookmark-list.h
--- nautilus-2.25.2orig/src/nautilus-bookmark-list.h 2009-02-10
17:55:28.003238913 +0530
+++ nautilus-2.25.2/src/nautilus-bookmark-list.h 2009-02-11
10:30:03.770888316 +0530
@@ -76,5 +76,6 @@
void nautilus_bookmark_list_set_window_geometry
(NautilusBookmarkList *bookmarks,
const
char *geometry);
const char * nautilus_bookmark_list_get_window_geometry
(NautilusBookmarkList *bookmarks);
+void nautilus_bookmark_list_save_file
(NautilusBookmarkList *bookmarks);
#endif /* NAUTILUS_BOOKMARK_LIST_H */
diff -urN nautilus-2.25.2orig/src/nautilus-places-sidebar.c
nautilus-2.25.2/src/nautilus-places-sidebar.c
--- nautilus-2.25.2orig/src/nautilus-places-sidebar.c 2009-02-10
17:55:28.061480824 +0530
+++ nautilus-2.25.2/src/nautilus-places-sidebar.c 2009-02-11
11:42:42.520934560 +0530
@@ -2143,6 +2143,7 @@
if (bookmark != NULL) {
nautilus_bookmark_set_has_custom_name (bookmark, TRUE);
nautilus_bookmark_set_name (bookmark, new_text);
+ nautilus_bookmark_list_save_file (sidebar->bookmarks);
}
}
Thanks,
Rohini
