nautilus r13928 - in trunk: . src/file-manager

[tbzatek svn gnome org]

Author: tbzatek
Date: Wed Mar 12 10:22:11 2008
New Revision: 13928
URL: http://svn.gnome.org/viewvc/nautilus?rev=13928&view=rev

Log:
2008-03-12  Tomas Bzatek  <tbzatek redhat com> 

        * src/file-manager/fm-properties-window.c:
        Fix a crash while changing owner



Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-properties-window.c

Modified: trunk/src/file-manager/fm-properties-window.c
==============================================================================
--- trunk/src/file-manager/fm-properties-window.c	(original)
+++ trunk/src/file-manager/fm-properties-window.c	Wed Mar 12 10:22:11 2008
@@ -1924,7 +1924,8 @@
 
 static void
 owner_change_callback (NautilusFile *file,
-		       GError *error,
+                       GFile 	    *result_location,
+		       GError        *error,
 		       FMPropertiesWindow *window)
 {
 	char *owner;
@@ -2067,7 +2068,9 @@
 	g_assert (NAUTILUS_IS_FILE (file));
 
 	owner_text = combo_box_get_active_entry (combo_box, 0);
-	name_array = g_strsplit (owner_text, " - ", 2);
+        if (! owner_text)
+	    return;
+    	name_array = g_strsplit (owner_text, " - ", 2);
 	new_owner = name_array[0];
 	g_free (owner_text);
 	cur_owner = nautilus_file_get_owner_name (file);