[Pkg-e-commits] [SCM] Enlightenment 17 branch, upstream-vcs, updated. a8698069ec4eec9c2a189198fa5eec9854b168ac

raster raster at alioth.debian.org
Sun May 4 21:40:10 UTC 2008


The following commit has been merged in the upstream-vcs branch:
commit 67314c1cdf94f2c45edcf557593bcf82b47976c2
Author: raster <raster>
Date:   Sun Apr 6 02:08:09 2008 +0000

    fedor's custom command fix patch

diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 8ecb61a..00d6adc 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -831,21 +831,33 @@ _e_fwin_cb_open(void *data, E_Dialog *dia)
 		    }
 	       }
 	     evas_list_free(selected);
+	     
+	     // Create a fake .desktop for custom command.
+	     if (!desktop)
+	       {
+		  desktop = efreet_desktop_empty_new("");
+		  desktop->exec = strdup(fad->exec_cmd);
+	       }
+
 	     if (fad->fwin->win)
 	       {
 		  if (desktop)
-		    e_exec(fad->fwin->win->border->zone, desktop, NULL, files, "fwin");
-		  else
-		    e_exec(fad->fwin->win->border->zone, NULL, fad->exec_cmd, files, "fwin");
+		     e_exec(fad->fwin->win->border->zone, desktop, NULL, files,
+			    "fwin");
 	       }
 	     else if (fad->fwin->zone)
 	       {
 		  if (desktop)
-		    e_exec(fad->fwin->zone, desktop, NULL, files, "fwin");
-		  else
-		    e_exec(fad->fwin->zone, NULL, fad->exec_cmd, files, "fwin");
+		     e_exec(fad->fwin->zone, desktop, NULL, files, "fwin");
 	       }
-	     ecore_list_destroy(files);
+
+	     // Free fake .desktop
+	     if (!strcmp(fad->exec_cmd, ""))
+	       {
+		  efreet_desktop_free(desktop);
+	       }
+
+	     ecore_list_destroy(files);	    
 	  }
 	chdir(pcwd);
      }

-- 
Enlightenment 17



More information about the Pkg-e-commits mailing list