rpms/libgnomeui/devel gnomeui-obex-filechooser-crash.patch, NONE, 1.1 libgnomeui.spec, 1.96, 1.97

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/libgnomeui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23803

Modified Files:
	libgnomeui.spec 
Added Files:
	gnomeui-obex-filechooser-crash.patch 
Log Message:
* Mon May 19 2008 - Bastien Nocera <bnocera at redhat.com> - 2.22.1-3
- Add patch to fix ObexFTP crasher


gnomeui-obex-filechooser-crash.patch:

--- NEW FILE gnomeui-obex-filechooser-crash.patch ---
Index: file-chooser/gtkfilesystemgio.c
===================================================================
--- file-chooser/gtkfilesystemgio.c	(revision 5601)
+++ file-chooser/gtkfilesystemgio.c	(working copy)
@@ -875,13 +875,24 @@
   GtkFileInfo *info;
   gboolean is_folder;
   GTimeVal mtime;
-  const gchar *thumbnail_path;
+  const gchar *thumbnail_path, *display_name;
 
   info = gtk_file_info_new ();
   is_folder = (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY);
   g_file_info_get_modification_time (file_info, &mtime);
 
-  gtk_file_info_set_display_name (info, g_file_info_get_display_name (file_info));
+  display_name = g_file_info_get_display_name (file_info);
+  if (display_name == NULL) {
+    const gchar *name;
+    gchar *d_name;
+
+    name = g_file_info_get_name (file_info);
+    d__name = g_filename_display_name (name);
+    gtk_file_info_set_display_name (info, d_name);
+    g_free (d_name);
+  } else {
+    gtk_file_info_set_display_name (info, display_name);
+  }
   gtk_file_info_set_is_folder (info, is_folder);
   gtk_file_info_set_is_hidden (info, g_file_info_get_is_hidden (file_info));
   gtk_file_info_set_mime_type (info, g_file_info_get_content_type (file_info));


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- libgnomeui.spec	14 Apr 2008 05:26:13 -0000	1.96
+++ libgnomeui.spec	19 May 2008 18:15:39 -0000	1.97
@@ -18,7 +18,7 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.22.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnomeui/2.22/%{name}-%{version}.tar.bz2
 #
@@ -87,6 +87,8 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=521032
 Patch0: filechooser-auth.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=523699#c8
+Patch1: gnomeui-obex-filechooser-crash.patch
 
 Conflicts: gnome-libs-devel < 1.4.1.2
 Conflicts: gdk-pixbuf-devel <= 0.11
@@ -107,6 +109,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .filechooser-auth
+%patch1 -p0 -b .obex-crash
 
 aclocal
 automake
@@ -152,6 +155,9 @@
 %{_datadir}/gtk-doc/html/libgnomeui
 
 %changelog
+* Mon May 19 2008 - Bastien Nocera <bnocera at redhat.com> - 2.22.1-3
+- Add patch to fix ObexFTP crasher
+
 * Mon Apr 14 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-2
 - Bump rev to make sure the NVR is newer than the previous one