? INSTALL
? install-sh
? missing
? mkinstalldirs
? nautilus-diff
? warnings
? libnautilus-extension/Makefile
? libnautilus-extension/Makefile.in
? libnautilus-extension/libnautilus-extension.pc
? po/notexist
Index: libnautilus-private/nautilus-directory-background.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-directory-background.c,v
retrieving revision 1.93
diff -u -r1.93 nautilus-directory-background.c
--- libnautilus-private/nautilus-directory-background.c	9 Apr 2004 21:18:44 -0000	1.93
+++ libnautilus-private/nautilus-directory-background.c	20 Aug 2004 22:52:36 -0000
@@ -311,7 +311,7 @@
 }
 
 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: libnautilus-private/nautilus-file.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-file.c,v
retrieving revision 1.347
diff -u -r1.347 nautilus-file.c
--- libnautilus-private/nautilus-file.c	16 Aug 2004 11:32:12 -0000	1.347
+++ libnautilus-private/nautilus-file.c	20 Aug 2004 22:52:37 -0000
@@ -1889,7 +1889,7 @@
 	integer <<= 1;
 	integer |= file_is_desktop (file);
 	integer <<= 1;
-#if TRASH_IS_FAST_ENOUGH
+#ifdef TRASH_IS_FAST_ENOUGH
 	integer |= nautilus_file_is_in_trash (file);
 #endif
 
@@ -1902,7 +1902,7 @@
 {
 	/* Prepend in reverse order. */
 
-#if TRASH_IS_FAST_ENOUGH
+#ifdef TRASH_IS_FAST_ENOUGH
 	if (nautilus_file_is_in_trash (file)) {
 		names = g_list_prepend
 			(names, g_strdup (NAUTILUS_FILE_EMBLEM_NAME_TRASH));
@@ -4705,7 +4705,7 @@
 	/* We want to update gnome-vfs/data/mime/gnome-vfs.keys to include 
 	 * English (& localizable) versions of every mime type anyone ever sees.
 	 */
-	if (g_ascii_strcasecmp (mime_type, "x-directory/normal") == 0) {
+	if (g_ascii_strcasecmp (mime_type, "inode/directory") == 0) {
 		g_warning (_("Can't find description even for \"x-directory/normal\". This "
 			     "probably means that your gnome-vfs.keys file is in the wrong place "
 			     "or isn't being found for some other reason."));
Index: libnautilus-private/nautilus-icon-container.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-container.c,v
retrieving revision 1.375
diff -u -r1.375 nautilus-icon-container.c
--- libnautilus-private/nautilus-icon-container.c	25 Jun 2004 19:22:29 -0000	1.375
+++ libnautilus-private/nautilus-icon-container.c	20 Aug 2004 22:52:38 -0000
@@ -5327,7 +5327,7 @@
 {
 	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: libnautilus-private/nautilus-program-choosing.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-program-choosing.c,v
retrieving revision 1.74
diff -u -r1.74 nautilus-program-choosing.c
--- libnautilus-private/nautilus-program-choosing.c	22 Jul 2004 03:57:43 -0000	1.74
+++ libnautilus-private/nautilus-program-choosing.c	20 Aug 2004 22:52:38 -0000
@@ -122,7 +122,7 @@
 				  const char *uri_scheme,
 				  GtkWindow *parent_window)
 {
-#if NEW_MIME_COMPLETE
+#ifdef NEW_MIME_COMPLETE
 	GtkDialog *message_dialog;
 	LaunchParameters *launch_parameters;
 	char *prompt;
@@ -391,7 +391,7 @@
 				       0,
 				       CopyFromParent,
 				       CopyFromParent,
-				       CopyFromParent,
+				       (Visual *)CopyFromParent,
 				       CWOverrideRedirect | CWEventMask,
 				       &attrs);
 		
@@ -578,7 +578,7 @@
 		
 	case GNOME_VFS_ERROR_NO_DEFAULT:
 	case GNOME_VFS_ERROR_NO_HANDLER:
-#if NEW_MIME_COMPLETE
+#ifdef NEW_MIME_COMPLETE
 		nautilus_program_chooser_show_no_choices_message
 					(action_type, file, parent_window);
 		break;
@@ -630,7 +630,7 @@
 			break;
 		case GNOME_VFS_OK:
 		default:
-#if NEW_MIME_COMPLETE
+#ifdef NEW_MIME_COMPLETE
 			nautilus_program_chooser_show_invalid_message
 				(action_type, file, parent_window);
 #endif
@@ -793,7 +793,7 @@
 		break;
 
 	default:
-#if NEW_MIME_COMPLETE
+#ifdef NEW_MIME_COMPLETE
 		nautilus_program_chooser_show_invalid_message
 			(GNOME_VFS_MIME_ACTION_TYPE_APPLICATION, file, parent_window);
 			 
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.634
diff -u -r1.634 fm-directory-view.c
--- src/file-manager/fm-directory-view.c	18 Aug 2004 23:23:53 -0000	1.634
+++ src/file-manager/fm-directory-view.c	20 Aug 2004 22:52:40 -0000
@@ -654,7 +654,7 @@
 	g_free (uri);
 }				      
 
-#if NEW_MIME_COMPLETE
+#ifdef NEW_MIME_COMPLETE
 static void
 fm_directory_view_chose_application_callback (GnomeVFSMimeApplication *application, 
 					      gpointer callback_data)
@@ -3848,6 +3848,8 @@
 			action = ACTIVATION_ACTION_OPEN_IN_APPLICATION;
 		}
 	}
+	g_free (activation_uri);
+
 	return action;
 }
 
@@ -5758,6 +5760,7 @@
 			     eel_istr_has_prefix (uri, "dav:") ||
 			     eel_istr_has_prefix (uri, "davs:"))) {
 				show_connect = TRUE;
+				g_free (uri);
 			}
 		} else if (nautilus_file_is_mime_type (file,
 						       "x-directory/smb-share")) {
@@ -6680,7 +6683,7 @@
 	use_new_window = file_count > 1;
 
 	if (use_new_window && mode == Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE) {
-#if !NEW_UI_COMPLETE
+#ifndef NEW_UI_COMPLETE
 		/* Match the current window type */
 		mode = Nautilus_ViewFrame_OPEN_IN_SPATIAL;
 #endif
Index: src/file-manager/fm-icon-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-icon-view.c,v
retrieving revision 1.297
diff -u -r1.297 fm-icon-view.c
--- src/file-manager/fm-icon-view.c	8 Jun 2004 17:35:11 -0000	1.297
+++ src/file-manager/fm-icon-view.c	20 Aug 2004 22:52:40 -0000
@@ -1355,7 +1355,7 @@
 static GtkWidget * 
 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)));
 }
Index: src/file-manager/fm-list-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-list-view.c,v
retrieving revision 1.227
diff -u -r1.227 fm-list-view.c
--- src/file-manager/fm-list-view.c	18 Aug 2004 22:53:34 -0000	1.227
+++ src/file-manager/fm-list-view.c	20 Aug 2004 22:52:41 -0000
@@ -1991,7 +1991,7 @@
 {
 	g_assert (FM_IS_LIST_VIEW (directory_view));
 
-#if GNOME2_CONVERSION_COMPLETE
+#ifdef GNOME2_CONVERSION_COMPLETE
 	/* FIXME: This needs to update the emblems of the icons, since
 	 * relative emblems may have changed.
 	 */
Index: src/file-manager/fm-tree-model.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-tree-model.c,v
retrieving revision 1.4
diff -u -r1.4 fm-tree-model.c
--- src/file-manager/fm-tree-model.c	16 Apr 2004 12:26:31 -0000	1.4
+++ src/file-manager/fm-tree-model.c	20 Aug 2004 22:52:41 -0000
@@ -1712,8 +1712,8 @@
 {
 	TreeNode *node;
 
-	g_return_val_if_fail (FM_IS_TREE_MODEL (model), 0);
-	g_return_val_if_fail (iter_is_valid (FM_TREE_MODEL (model), iter), 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), NULL);
 
 	node = iter->user_data;
 	return node == NULL ? NULL : nautilus_file_ref (node->file);
