rpms/libfm/devel libfm-0.1.12-crash-on-click-on-volume-entry-on-desktop-patch, NONE, 1.1 libfm.spec, 1.16, 1.17

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/libfm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32654/devel

Modified Files:
	libfm.spec 
Added Files:
	libfm-0.1.12-crash-on-click-on-volume-entry-on-desktop-patch 
Log Message:
* Fri Jun 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-4
- Fix crash with --desktop mode when clicking volume icon
  (bug 607069)



--- NEW FILE libfm-0.1.12-crash-on-click-on-volume-entry-on-desktop-patch ---
diff --git a/src/base/fm-file-launcher.c b/src/base/fm-file-launcher.c
index 1b496d7..58c12ec 100644
--- a/src/base/fm-file-launcher.c
+++ b/src/base/fm-file-launcher.c
@@ -119,7 +119,7 @@ gboolean fm_launch_files(GAppLaunchContext* ctx, GList* file_infos, FmFileLaunch
                     {
                         if(launcher->error)
                             launcher->error(ctx, err, user_data);
-                        g_error_free(err);
+                        if (err) g_error_free(err);
                         err = NULL;
                     }
                     continue;
@@ -202,7 +202,7 @@ gboolean fm_launch_files(GAppLaunchContext* ctx, GList* file_infos, FmFileLaunch
                     l->data = uri;
                 }
                 fis = g_list_reverse(fis);
-                g_app_info_launch_uris(app, fis, ctx, err);
+                g_app_info_launch_uris(app, fis, ctx, &err);
                 /* free URI strings */
                 g_list_foreach(fis, (GFunc)g_free, NULL);
                 g_object_unref(app);
diff --git a/src/gtk/fm-gtk-utils.c b/src/gtk/fm-gtk-utils.c
index 12ca7b6..b670765 100644
--- a/src/gtk/fm-gtk-utils.c
+++ b/src/gtk/fm-gtk-utils.c
@@ -587,7 +587,7 @@ static gboolean on_launch_error(GAppLaunchContext* ctx, GError* err, gpointer us
 {
     gpointer* data = (gpointer*)user_data;
     GtkWindow* parent = (GtkWindow*)data[0];
-    fm_show_error(parent, err->message);
+    if (err) fm_show_error(parent, err->message);
     return TRUE;
 }
 


Index: libfm.spec
===================================================================
RCS file: /cvs/extras/rpms/libfm/devel/libfm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libfm.spec	9 Jun 2010 17:53:38 -0000	1.16
+++ libfm.spec	24 Jun 2010 17:57:51 -0000	1.17
@@ -5,7 +5,7 @@
 
 Name:           libfm
 Version:        0.1.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 Group:          System Environment/Libraries
@@ -15,12 +15,14 @@ Source0:        http://downloads.sourcef
 # Fedora specific patches
 Patch0:         libfm-0.1.9-pref-apps.patch
 # Patches already in git
+#
 # Patches need discussing with the upstream
 # Upstream bug 3009374, sorting by name broken in cs_CZ.UTF-8
 Patch1:         libfm-0.1.12-sort-in-cs_CZ.UTF-8.patch
 # Upstream bug 3012747, pcmanfm // crashes
 Patch2:         libfm-0.1.12-filen-begin-with-slasla.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fedora bug 607069, pcmanfm --desktop crashes when clicking volume icon
+Patch3:         libfm-0.1.12-crash-on-click-on-volume-entry-on-desktop-patch
 
 BuildRequires:  gtk2-devel >= 2.16.0
 BuildRequires:  menu-cache-devel >= 0.3.2
@@ -85,6 +87,7 @@ developing applications that use %{name}
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .sort_cs
 %patch2 -p1 -b .slasla
+%patch3 -p1 -b .desk_vol
 
 # treak rpath
 sed -i.libdir_syssearch -e \
@@ -191,6 +194,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Fri Jun 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-4
+- Fix crash with --desktop mode when clicking volume icon
+  (bug 607069)
+
 * Thu Jun 10 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-3
 - Fix an issue that pcmanfm // crashes (upstream bug 3012747)