rpms/nautilus/devel nautilus-2.22.0-fm_properties_owner_change_crash.patch, NONE, 1.1 nautilus-2.22.0-mime-application-x-ext.patch, NONE, 1.1 nautilus.spec, 1.187, 1.188

[Tomas Bzatek (tbzatek)]

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23190

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.22.0-fm_properties_owner_change_crash.patch 
	nautilus-2.22.0-mime-application-x-ext.patch 
Log Message:
* Thu Mar 13 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.22.0-2
- Don't create application/x-ext-<extension> types for known mimetypes (patch from head)
- Fix a crash in the Properties dialog while changing owner (patch from head)


nautilus-2.22.0-fm_properties_owner_change_crash.patch:

--- NEW FILE nautilus-2.22.0-fm_properties_owner_change_crash.patch ---
Index: src/file-manager/fm-properties-window.c
===================================================================
--- src/file-manager/fm-properties-window.c	(revision 13898)
+++ src/file-manager/fm-properties-window.c	(working copy)
@@ -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);

nautilus-2.22.0-mime-application-x-ext.patch:

--- NEW FILE nautilus-2.22.0-mime-application-x-ext.patch ---
--- trunk/libnautilus-private/nautilus-mime-application-chooser.c	2008/02/20 15:11:17	13784
+++ trunk/libnautilus-private/nautilus-mime-application-chooser.c	2008/03/13 15:11:05	13931
@@ -599,9 +599,9 @@
 			       const char *extension,
 			       const char *mime_type)
 {
-	chooser->details->extension = g_strdup (extension);
 	if (extension != NULL &&
 	    g_content_type_is_unknown (mime_type)) {
+		chooser->details->extension = g_strdup (extension);
 		    chooser->details->content_type = g_strdup_printf ("application/x-extension-%s", extension);
 		    /* the %s here is a file extension */
 		    chooser->details->type_description =


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- nautilus.spec	11 Mar 2008 02:20:47 -0000	1.187
+++ nautilus.spec	13 Mar 2008 16:11:17 -0000	1.188
@@ -19,7 +19,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.22.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2
@@ -83,6 +83,10 @@
 
 Patch7:		rtl-fix.patch
 
+# Patches from head
+Patch8:		nautilus-2.22.0-fm_properties_owner_change_crash.patch
+Patch9:		nautilus-2.22.0-mime-application-x-ext.patch
+
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -118,6 +122,9 @@
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
 
+%patch8 -p0 -b .fm-properties
+%patch9 -p1 -b .mime
+
 %build
 
 libtoolize --force --copy
@@ -225,6 +232,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Mar 13 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.22.0-2
+- Don't create application/x-ext-<extension> types for known mimetypes (patch from head)
+- Fix a crash in the Properties dialog while changing owner (patch from head)
+
 * Mon Mar 10 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-1
 - Update to 2.22.0