Index: nautilus-directory-background.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-directory-background.c,v
retrieving revision 1.96
diff -u -p -r1.96 nautilus-directory-background.c
--- nautilus-directory-background.c	16 Mar 2005 08:32:20 -0000	1.96
+++ nautilus-directory-background.c	9 Aug 2005 19:15:18 -0000
@@ -248,7 +248,7 @@ nautilus_file_background_write_desktop_s
 }
 
 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
 	 * defaults
Index: nautilus-file.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-file.c,v
retrieving revision 1.368
diff -u -p -r1.368 nautilus-file.c
--- nautilus-file.c	8 Aug 2005 23:35:11 -0000	1.368
+++ nautilus-file.c	9 Aug 2005 19:15:20 -0000
@@ -2918,7 +2918,7 @@ nautilus_file_get_where_string (Nautilus
 		 get_where_string, (file));
 }
 
-const char *TODAY_TIME_FORMATS [] = {
+static const char *TODAY_TIME_FORMATS [] = {
 	/* Today, use special word.
 	 * strftime patterns preceeded with the widest
 	 * possible resulting string for that pattern.
@@ -2949,7 +2949,7 @@ const char *TODAY_TIME_FORMATS [] = {
 	NULL
 };
 
-const char *YESTERDAY_TIME_FORMATS [] = {
+static const char *YESTERDAY_TIME_FORMATS [] = {
 	/* Yesterday, use special word.
 	 * Note to localizers: Same issues as "today" string.
 	 */
@@ -2968,7 +2968,7 @@ const char *YESTERDAY_TIME_FORMATS [] = 
 	NULL
 };
 
-const char *CURRENT_WEEK_TIME_FORMATS [] = {
+static const char *CURRENT_WEEK_TIME_FORMATS [] = {
 	/* Current week, include day of week.
 	 * Note to localizers: Same issues as "today" string.
 	 * The width measurement templates correspond to
Index: nautilus-icon-container.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-container.c,v
retrieving revision 1.392
diff -u -p -r1.392 nautilus-icon-container.c
--- nautilus-icon-container.c	6 Jul 2005 12:18:27 -0000	1.392
+++ nautilus-icon-container.c	9 Aug 2005 19:15:21 -0000
@@ -5402,7 +5402,7 @@ nautilus_icon_container_get_selection (N
 {
 	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;
 	for (p = container->details->icons; p != NULL; p = p->next) {
Index: nautilus-icon-factory.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-factory.c,v
retrieving revision 1.314
diff -u -p -r1.314 nautilus-icon-factory.c
--- nautilus-icon-factory.c	21 May 2005 16:13:58 -0000	1.314
+++ nautilus-icon-factory.c	9 Aug 2005 19:15:21 -0000
@@ -270,7 +270,7 @@ nautilus_icon_factory_get_icon_theme (vo
 }
 
 GnomeThumbnailFactory *
-nautilus_icon_factory_get_thumbnail_factory ()
+nautilus_icon_factory_get_thumbnail_factory (void)
 {
 	NautilusIconFactory *factory;
 
@@ -1340,7 +1340,6 @@ get_icon_from_cache (const char *icon,
 		
 		if (cached_icon == NULL) {
 			cached_icon = factory->fallback_icon;
-			cache_icon_ref (cached_icon);
 		}
 		
 		/* Create the key and icon for the hash table. */
Index: nautilus-metafile.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-metafile.c,v
retrieving revision 1.40
diff -u -p -r1.40 nautilus-metafile.c
--- nautilus-metafile.c	3 Aug 2005 14:53:22 -0000	1.40
+++ nautilus-metafile.c	9 Aug 2005 19:15:22 -0000
@@ -264,8 +264,8 @@ nautilus_metafile_get (const char *direc
  * We may want to consider limiting writes as well.
  */
 
-int num_reads_in_progress;
-GList *pending_reads;
+static int num_reads_in_progress;
+static GList *pending_reads;
 
 #if 0
 #define DEBUG_METADATA_IO
Index: nautilus-program-choosing.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-program-choosing.c,v
retrieving revision 1.78
diff -u -p -r1.78 nautilus-program-choosing.c
--- nautilus-program-choosing.c	2 May 2005 13:44:34 -0000	1.78
+++ nautilus-program-choosing.c	9 Aug 2005 19:15:22 -0000
@@ -387,7 +387,7 @@ slowly_and_stupidly_obtain_timestamp (Di
 				       0,
 				       CopyFromParent,
 				       CopyFromParent,
-				       CopyFromParent,
+				       (Visual *)CopyFromParent,
 				       CWOverrideRedirect | CWEventMask,
 				       &attrs);
 		
