gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-13 04:51:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lots of cleanups. Closes bug #313094 and bug #149714

Browse source 
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
This commit is contained in:
Kjartan Maraas 2005-08-12 18:11:30 +00:00 committed by Kjartan Maraas
parent 4d71d0161b
commit 612994012f
14 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ChangeLog
View file

@ -1,3 +1,36 @@
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
2005-08-09 Martin Wehner <martin.wehner@gmail.com> 2005-08-09 Martin Wehner <martin.wehner@gmail.com>
* configure.in: * configure.in:

2
libnautilus-private/nautilus-directory-background.c
View file

@ -248,7 +248,7 @@ nautilus_file_background_write_desktop_settings (char *color, char *image, EelBa
} }
static void static void
nautilus_file_background_write_desktop_default_settings () nautilus_file_background_write_desktop_default_settings (void)
{ {
/* We just unset all the gconf keys so they go back to /* We just unset all the gconf keys so they go back to
* defaults * defaults

6
libnautilus-private/nautilus-file.c
View file

@ -2918,7 +2918,7 @@ nautilus_file_get_where_string (NautilusFile *file)
get_where_string, (file)); get_where_string, (file));
} }
const char *TODAY_TIME_FORMATS [] = { static const char *TODAY_TIME_FORMATS [] = {
/* Today, use special word. /* Today, use special word.
* strftime patterns preceeded with the widest * strftime patterns preceeded with the widest
* possible resulting string for that pattern. * possible resulting string for that pattern.
@ -2949,7 +2949,7 @@ const char *TODAY_TIME_FORMATS [] = {
NULL NULL
}; };
const char *YESTERDAY_TIME_FORMATS [] = { static const char *YESTERDAY_TIME_FORMATS [] = {
/* Yesterday, use special word. /* Yesterday, use special word.
* Note to localizers: Same issues as "today" string. * Note to localizers: Same issues as "today" string.
*/ */
@ -2968,7 +2968,7 @@ const char *YESTERDAY_TIME_FORMATS [] = {
NULL NULL
}; };
const char *CURRENT_WEEK_TIME_FORMATS [] = { static const char *CURRENT_WEEK_TIME_FORMATS [] = {
/* Current week, include day of week. /* Current week, include day of week.
* Note to localizers: Same issues as "today" string. * Note to localizers: Same issues as "today" string.
* The width measurement templates correspond to * The width measurement templates correspond to

2
libnautilus-private/nautilus-icon-container.c
View file

@ -5402,7 +5402,7 @@ nautilus_icon_container_get_selection (NautilusIconContainer *container)
{ {
GList *list, *p; GList *list, *p;
g_return_val_if_fail (NAUTILUS_IS_ICON_CONTAINER (container), FALSE); g_return_val_if_fail (NAUTILUS_IS_ICON_CONTAINER (container), NULL);
list = NULL; list = NULL;
for (p = container->details->icons; p != NULL; p = p->next) { for (p = container->details->icons; p != NULL; p = p->next) {

2
libnautilus-private/nautilus-icon-factory.c
View file

@ -270,7 +270,7 @@ nautilus_icon_factory_get_icon_theme (void)
} }
GnomeThumbnailFactory * GnomeThumbnailFactory *
nautilus_icon_factory_get_thumbnail_factory () nautilus_icon_factory_get_thumbnail_factory (void)
{ {
NautilusIconFactory *factory; NautilusIconFactory *factory;

4
libnautilus-private/nautilus-metafile.c
View file

@ -264,8 +264,8 @@ nautilus_metafile_get (const char *directory_uri)
* We may want to consider limiting writes as well. * We may want to consider limiting writes as well.
*/ */
int num_reads_in_progress; static int num_reads_in_progress;
GList *pending_reads; static GList *pending_reads;
#if 0 #if 0
#define DEBUG_METADATA_IO #define DEBUG_METADATA_IO

2
libnautilus-private/nautilus-program-choosing.c
View file

@ -387,7 +387,7 @@ slowly_and_stupidly_obtain_timestamp (Display *xdisplay)
0, 0,
CopyFromParent, CopyFromParent,
CopyFromParent, CopyFromParent,
CopyFromParent, (Visual *)CopyFromParent,
CWOverrideRedirect | CWEventMask, CWOverrideRedirect | CWEventMask,
&attrs); &attrs);

2
src/file-manager/fm-icon-view.c
View file

@ -1223,7 +1223,7 @@ fm_icon_view_can_zoom_out (FMDirectoryView *view)
static GtkWidget * static GtkWidget *
fm_icon_view_get_background_widget (FMDirectoryView *view) fm_icon_view_get_background_widget (FMDirectoryView *view)
{ {
g_return_val_if_fail (FM_IS_ICON_VIEW (view), FALSE); g_return_val_if_fail (FM_IS_ICON_VIEW (view), NULL);
return GTK_WIDGET (get_icon_container (FM_ICON_VIEW (view))); return GTK_WIDGET (get_icon_container (FM_ICON_VIEW (view)));
} }

1
src/file-manager/fm-list-view.c
View file

@ -1293,6 +1293,7 @@ filename_cell_data_func (GtkTreeViewColumn *column,
"text", text, "text", text,
"underline", underline, "underline", underline,
NULL); NULL);
g_free (text);
} }
static void static void

4
src/file-manager/fm-tree-model.c
View file

@ -1736,8 +1736,8 @@ fm_tree_model_iter_get_file (FMTreeModel *model, GtkTreeIter *iter)
{ {
TreeNode *node; TreeNode *node;
g_return_val_if_fail (FM_IS_TREE_MODEL (model), 0); g_return_val_if_fail (FM_IS_TREE_MODEL (model), NULL);
g_return_val_if_fail (iter_is_valid (FM_TREE_MODEL (model), iter), 0); g_return_val_if_fail (iter_is_valid (FM_TREE_MODEL (model), iter), NULL);
node = iter->user_data; node = iter->user_data;
return node == NULL ? NULL : nautilus_file_ref (node->file); return node == NULL ? NULL : nautilus_file_ref (node->file);

4
src/nautilus-bookmark-list.c
View file

@ -123,7 +123,7 @@ new_bookmark_from_uri (const char *uri, const char *label)
} }
static char * static char *
nautilus_bookmark_list_get_file_path () nautilus_bookmark_list_get_file_path (void)
{ {
char *file_path; char *file_path;
file_path = g_build_filename (g_get_home_dir (), file_path = g_build_filename (g_get_home_dir (),
@ -449,6 +449,7 @@ static void
nautilus_bookmark_list_load_file (NautilusBookmarkList *bookmarks) nautilus_bookmark_list_load_file (NautilusBookmarkList *bookmarks)
{ {
char *filename, *contents; char *filename, *contents;
GError **error = NULL;
filename = nautilus_bookmark_list_get_file_path (); filename = nautilus_bookmark_list_get_file_path ();
@ -462,7 +463,6 @@ nautilus_bookmark_list_load_file (NautilusBookmarkList *bookmarks)
} }
/* Read new list from file */ /* Read new list from file */
GError **error = NULL;
if (g_file_get_contents (filename, &contents, NULL, error)) { if (g_file_get_contents (filename, &contents, NULL, error)) {
char **lines; char **lines;
int i; int i;

2
src/nautilus-bookmarks-window.c
View file

@ -600,7 +600,7 @@ on_jump_button_clicked (GtkButton *button,
} }
static void static void
bookmarks_delete_bookmark () bookmarks_delete_bookmark (void)
{ {
GtkTreeIter iter; GtkTreeIter iter;
GtkTreePath *path; GtkTreePath *path;

2
src/nautilus-main.c
View file

@ -216,7 +216,7 @@ slowly_and_stupidly_obtain_timestamp (Display *xdisplay)
0, 0,
CopyFromParent, CopyFromParent,
CopyFromParent, CopyFromParent,
CopyFromParent, (Visual *)CopyFromParent,
CWOverrideRedirect | CWEventMask, CWOverrideRedirect | CWEventMask,
&attrs); &attrs);

2
src/nautilus-self-check-functions.c
View file

@ -32,7 +32,7 @@
#include "nautilus-self-check-functions.h" #include "nautilus-self-check-functions.h"
void nautilus_run_self_checks() void nautilus_run_self_checks(void)
{ {
NAUTILUS_FOR_EACH_SELF_CHECK_FUNCTION (NAUTILUS_CALL_SELF_CHECK_FUNCTION) NAUTILUS_FOR_EACH_SELF_CHECK_FUNCTION (NAUTILUS_CALL_SELF_CHECK_FUNCTION)
} }