nautilus r14320 - in trunk: . libnautilus-private src/file-manager

[cosimoc svn gnome org]

Author: cosimoc
Date: Fri Jul  4 12:49:18 2008
New Revision: 14320
URL: http://svn.gnome.org/viewvc/nautilus?rev=14320&view=rev

Log:
2008-07-04  Cosimo Cecchi  <cosimoc gnome org>

	* libnautilus-private/nautilus-file-utilities.c:
	(nautilus_get_user_directory), (nautilus_get_desktop_directory),
	(nautilus_create_templates_directory),
	(nautilus_get_searches_directory):
	* libnautilus-private/nautilus-metafile.c:
	(construct_private_metafile_uri):
	* libnautilus-private/nautilus-mime-actions.c: (activate_files):
	* src/file-manager/fm-directory-view.c: (change_to_view_directory),
	(run_script_callback):
	Use g_mkdir() and g_chdir() instead of mkdir() and chdir() to fix
	some warnings under GCC 4.3.1.


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-file-utilities.c
   trunk/libnautilus-private/nautilus-metafile.c
   trunk/libnautilus-private/nautilus-mime-actions.c
   trunk/src/file-manager/fm-directory-view.c

Modified: trunk/libnautilus-private/nautilus-file-utilities.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file-utilities.c	(original)
+++ trunk/libnautilus-private/nautilus-file-utilities.c	Fri Jul  4 12:49:18 2008
@@ -36,8 +36,9 @@
 #include <eel/eel-string.h>
 #include <eel/eel-debug.h>
 #include <libgnome/gnome-util.h>
+#include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gstrfuncs.h>
+#include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -98,7 +99,7 @@
 					   NULL);
 	
 	if (!g_file_test (user_directory, G_FILE_TEST_EXISTS)) {
-		mkdir (user_directory, DEFAULT_NAUTILUS_DIRECTORY_MODE);
+		g_mkdir (user_directory, DEFAULT_NAUTILUS_DIRECTORY_MODE);
 		/* FIXME bugzilla.gnome.org 41286: 
 		 * How should we handle the case where this mkdir fails? 
 		 * Note that nautilus_application_startup will refuse to launch if this 
@@ -430,7 +431,7 @@
 	/* Don't try to create a home directory */
 	if (!eel_preferences_get_boolean (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR)) {
 		if (!g_file_test (desktop_directory, G_FILE_TEST_EXISTS)) {
-			mkdir (desktop_directory, DEFAULT_DESKTOP_DIRECTORY_MODE);
+			g_mkdir (desktop_directory, DEFAULT_DESKTOP_DIRECTORY_MODE);
 			/* FIXME bugzilla.gnome.org 41286: 
 			 * How should we handle the case where this mkdir fails? 
 			 * Note that nautilus_application_startup will refuse to launch if this 
@@ -523,7 +524,7 @@
 
 	dir = nautilus_get_templates_directory ();
 	if (!g_file_test (dir, G_FILE_TEST_EXISTS)) {
-		mkdir (dir, DEFAULT_NAUTILUS_DIRECTORY_MODE);
+		g_mkdir (dir, DEFAULT_NAUTILUS_DIRECTORY_MODE);
 	}
 	g_free (dir);
 }
@@ -550,7 +551,7 @@
 	g_free (user_dir);
 	
 	if (!g_file_test (searches_dir, G_FILE_TEST_EXISTS))
-		mkdir (searches_dir, DEFAULT_NAUTILUS_DIRECTORY_MODE);
+		g_mkdir (searches_dir, DEFAULT_NAUTILUS_DIRECTORY_MODE);
 
 	return searches_dir;
 }

Modified: trunk/libnautilus-private/nautilus-metafile.c
==============================================================================
--- trunk/libnautilus-private/nautilus-metafile.c	(original)
+++ trunk/libnautilus-private/nautilus-metafile.c	Fri Jul  4 12:49:18 2008
@@ -36,7 +36,8 @@
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-xml-extensions.h>
-#include <glib/gurifuncs.h>
+#include <glib.h>
+#include <glib/gstdio.h>
 #include <libxml/parser.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
@@ -224,7 +225,7 @@
 	user_directory = nautilus_get_user_directory ();
 	metafiles_directory = g_build_filename (user_directory, METAFILES_DIRECTORY_NAME, NULL);
 	g_free (user_directory);
-	mkdir (metafiles_directory, 0700);
+	g_mkdir (metafiles_directory, 0700);
 
 	/* Construct a file name from the URI. */
 	escaped_uri = escape_slashes (uri);

Modified: trunk/libnautilus-private/nautilus-mime-actions.c
==============================================================================
--- trunk/libnautilus-private/nautilus-mime-actions.c	(original)
+++ trunk/libnautilus-private/nautilus-mime-actions.c	Fri Jul  4 12:49:18 2008
@@ -30,8 +30,8 @@
 #include <eel/eel-string.h>
 #include <eel/eel-mount-operation.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "nautilus-file-attributes.h"
 #include "nautilus-file.h"
@@ -1081,7 +1081,7 @@
 	if (parameters->activation_directory &&
 	    (launch_files != NULL || launch_in_terminal_files != NULL)) {
 		old_working_dir = g_get_current_dir ();
-		chdir (parameters->activation_directory);
+		g_chdir (parameters->activation_directory);
 		
 	}
 
@@ -1127,7 +1127,7 @@
 	}
 
 	if (old_working_dir != NULL) {
-		chdir (old_working_dir);
+		g_chdir (old_working_dir);
 		g_free (old_working_dir);
 	}
 

Modified: trunk/src/file-manager/fm-directory-view.c
==============================================================================
--- trunk/src/file-manager/fm-directory-view.c	(original)
+++ trunk/src/file-manager/fm-directory-view.c	Fri Jul  4 12:49:18 2008
@@ -52,6 +52,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <libgnomeui/gnome-help.h>
 #include <libnautilus-private/nautilus-recent.h>
@@ -83,7 +84,6 @@
 #include <libnautilus-private/nautilus-signaller.h>
 #include <libnautilus-private/nautilus-autorun.h>
 #include <libnautilus-private/nautilus-icon-names.h>
-#include <unistd.h>
 
 /* Minimum starting update inverval */
 #define UPDATE_INTERVAL_MIN 100
@@ -4697,7 +4697,7 @@
 
 	/* FIXME: What to do about non-local directories? */
 	if (path != NULL) {
-		chdir (path);
+		g_chdir (path);
 	}
 
 	g_free (path);
@@ -4905,7 +4905,7 @@
 
 	nautilus_file_list_free (selected_files);
 	unset_script_environment_variables ();
-	chdir (old_working_dir);		
+	g_chdir (old_working_dir);		
 	g_free (old_working_dir);
 	g_free (quoted_path);
 }