rpms/libfm/F-13 libfm-0.1.11-gterm-argc.patch, NONE, 1.1 libfm.spec, 1.5, 1.6

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/libfm/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31824/F-13

Modified Files:
	libfm.spec 
Added Files:
	libfm-0.1.11-gterm-argc.patch 
Log Message:
* Fri May  7 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-2
- Fix wrapper of gnome-terminal when libfm.conf doesn't exist or so
  (bug 589730)


libfm-0.1.11-gterm-argc.patch:
 gnome-terminal-wrapper.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libfm-0.1.11-gterm-argc.patch ---
--- libfm-0.1.11/src/gnome-terminal-wrapper.c.debug	2010-04-25 01:00:24.000000000 +0900
+++ libfm-0.1.11/src/gnome-terminal-wrapper.c	2010-05-07 16:58:20.000000000 +0900
@@ -82,7 +82,7 @@
     path = sep + 1;
     g_setenv("PATH", path, TRUE);
 
-    if(argc < 2) /* only execute the temrinal emulator */
+    if((argc < 2) && terminal) /* only execute the temrinal emulator */
     {
         sep = strchr(terminal, ' ');
         if(sep)
@@ -90,7 +90,7 @@
         argv[0] = terminal;
     }
 
-    if( strcmp(argv[1], "-x") == 0 ) /* gnome-terminal -x */
+    if( (argc >= 2) && (strcmp(argv[1], "-x") == 0) ) /* gnome-terminal -x */
     {
         /* this is mostly called from glib/gio */
         int term_argc;


Index: libfm.spec
===================================================================
RCS file: /cvs/extras/rpms/libfm/F-13/libfm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libfm.spec	28 Apr 2010 18:54:59 -0000	1.5
+++ libfm.spec	7 May 2010 08:21:35 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           libfm
 Version:        0.1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 Group:          System Environment/Libraries
@@ -12,6 +12,8 @@ Source0:        http://downloads.sourcef
 Patch0:         libfm-0.1.9-pref-apps.patch
 # The following patch must be reversed
 Patch1:         libfm-0.1.11-wrong-linkage.patch
+# Patch for 589730
+Patch2:         libfm-0.1.11-gterm-argc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -77,6 +79,7 @@ developing applications that use %{name}
 %setup -q
 
 %patch0 -p1 -b .orig
+%patch2 -p1 -b .gterm_segv
 
 # Patch1 needs autotools
 %patch1 -p1 -b .link -R
@@ -182,6 +185,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Fri May  7 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-2
+- Fix wrapper of gnome-terminal when libfm.conf doesn't exist or so
+  (bug 589730)
+
 * Thu Apr 29 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-1
 - Update to 0.1.11