diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2005-08-12 18:11:30 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2005-08-12 18:11:30 +0000 |
| commit | 612994012f6efa8b3e8403389e7b2d507767d557 (patch) | |
| tree | cc0a363af4990604b95a802b89365a9400a56e80 /src/nautilus-bookmark-list.c | |
| parent | 4d71d0161b9abdcaf6b1b1fa209aeb215cfac122 (diff) | |
| download | nautilus-612994012f6efa8b3e8403389e7b2d507767d557.tar.gz | |
Lots of cleanups. Closes bug #313094 and bug #149714
2005-08-12 Kjartan Maraas <kmaraas@gnome.org>
Lots of cleanups. Closes bug #313094 and bug #149714
* libnautilus-private/nautilus-directory-background.c:
(nautilus_file_background_write_desktop_default_settings):
ANSIfication
* libnautilus-private/nautilus-file.c: Mark some variables
static.
* libnautilus-private/nautilus-icon-container.c:
(nautilus_icon_container_get_selection): Return NULL not
FALSE.
* libnautilus-private/nautilus-icon-factory.c:
(nautilus_icon_factory_get_thumbnail_factory): ANSIfication
* libnautilus-private/nautilus-metafile.c: Static variables
* libnautilus-private/nautilus-program-choosing.c:
(slowly_and_stupidly_obtain_timestamp): Sparse fix
* src/file-manager/fm-icon-view.c:
(fm_icon_view_get_background_widget): FALSE vs NULL
* src/file-manager/fm-list-view.c: (filename_cell_data_func):
Plug a leak. Bug #313094.
* src/file-manager/fm-tree-model.c: (fm_tree_model_iter_get_file):
NULL vs 0.
* src/nautilus-bookmark-list.c:
(nautilus_bookmark_list_get_file_path),
(nautilus_bookmark_list_load_file): ANSIfication
* src/nautilus-bookmarks-window.c: (bookmarks_delete_bookmark):
ANSIfication
* src/nautilus-main.c: (slowly_and_stupidly_obtain_timestamp):
NULL vs 0.
* src/nautilus-self-check-functions.c: (nautilus_run_self_checks):
ANSIfication
Diffstat (limited to 'src/nautilus-bookmark-list.c')
| -rw-r--r-- | src/nautilus-bookmark-list.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c index 0837ad1ac..6958a5535 100644 --- a/src/nautilus-bookmark-list.c +++ b/src/nautilus-bookmark-list.c @@ -123,7 +123,7 @@ new_bookmark_from_uri (const char *uri, const char *label) } static char * -nautilus_bookmark_list_get_file_path () +nautilus_bookmark_list_get_file_path (void) { char *file_path; file_path = g_build_filename (g_get_home_dir (), @@ -449,6 +449,7 @@ static void nautilus_bookmark_list_load_file (NautilusBookmarkList *bookmarks) { char *filename, *contents; + GError **error = NULL; filename = nautilus_bookmark_list_get_file_path (); @@ -462,7 +463,6 @@ nautilus_bookmark_list_load_file (NautilusBookmarkList *bookmarks) } /* Read new list from file */ - GError **error = NULL; if (g_file_get_contents (filename, &contents, NULL, error)) { char **lines; int i; |