rpms/pcmanfm/devel pcmanfm-0.5-exec-from-non-terminal.patch, NONE, 1.1 pcmanfm.spec, 1.28, 1.29

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/pcmanfm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6473

Modified Files:
	pcmanfm.spec 
Added Files:
	pcmanfm-0.5-exec-from-non-terminal.patch 
Log Message:
* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-7
- Fix the issue when application cannot be lauched from desktop menu
  (sourceforge bug 2313286)


pcmanfm-0.5-exec-from-non-terminal.patch:

--- NEW FILE pcmanfm-0.5-exec-from-non-terminal.patch ---
--- pcmanfm-0.5/src/vfs/vfs-execute.c.debug	2008-05-25 21:59:15.000000000 +0900
+++ pcmanfm-0.5/src/vfs/vfs-execute.c	2009-04-06 17:26:14.000000000 +0900
@@ -131,8 +131,8 @@
         {
             if ( 0 == strncmp( envp[ i ], "DESKTOP_STARTUP_ID=", 19 ) )
                 startup_id_index = i;
-            new_env[i] = g_strdup( envp[ i ] );
         }
+        new_env[i] = g_strdup( envp[ i ] );
     }
 
     display = sn_display_new ( GDK_SCREEN_XDISPLAY ( screen ),
@@ -170,8 +170,11 @@
 
     /* This is taken from gdk_spawn_on_screen */
     display_name = gdk_screen_make_display_name ( screen );
-    if ( display_index >= 0 )
+    if ( display_index >= 0 ){
+        /* Now display_index points to the last entry of "DISPLAY=" */
+        g_free(new_env[ display_index ]);
         new_env[ display_index ] = g_strconcat( "DISPLAY=", display_name, NULL );
+    }
     else
         new_env[ i++ ] = g_strconcat( "DISPLAY=", display_name, NULL );
 


Index: pcmanfm.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/devel/pcmanfm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pcmanfm.spec	24 Feb 2009 04:00:49 -0000	1.28
+++ pcmanfm.spec	6 Apr 2009 08:55:03 -0000	1.29
@@ -3,7 +3,7 @@
 
 Name:		pcmanfm
 Version:	0.5
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Extremly fast and lightweight file manager
 
 Group:		User Interface/Desktops
@@ -12,6 +12,8 @@
 Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
 Patch0:		pcmanfm-0.5-kill-find-immediately.patch
 Patch1:		pcmanfm-0.5-icon-fallback.patch
+# Sent upstream (sf bug 2313286)
+Patch10:	pcmanfm-0.5-exec-from-non-terminal.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-glib-devel
@@ -31,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .search_hang
+%patch10 -p1 -b .non_terminal
 
 %if 0%{?fedora} >= 10
 function replace_icon(){
@@ -134,6 +137,10 @@
 %{_datadir}/mime/packages/*.xml
 
 %changelog
+* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-7
+- Fix the issue when application cannot be lauched from desktop menu
+  (sourceforge bug 2313286)
+
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-6
 - F-11: Mass rebuild