[Xfce4-commits] r25976 - xarchiver/trunk/src

[Giuseppe Torelli]

Author: colossus
Date: 2007-08-12 14:22:28 +0000 (Sun, 12 Aug 2007)
New Revision: 25976

Modified:
   xarchiver/trunk/src/main.c
   xarchiver/trunk/src/socket.c
Log:
Fixed bug 1717605 on sf.net bug tracking page.
Added 7zr executable in the archiver's search path.


Modified: xarchiver/trunk/src/main.c
===================================================================
--- xarchiver/trunk/src/main.c	2007-08-12 14:16:49 UTC (rev 25975)
+++ xarchiver/trunk/src/main.c	2007-08-12 14:22:28 UTC (rev 25976)
@@ -402,9 +402,10 @@
 			ArchiveSuffix = g_list_prepend ( ArchiveSuffix, "*.zip");
 		}
 	}
-
 	absolute_path = g_find_program_in_path("7za");
-    if ( absolute_path )
+    if (absolute_path == NULL)
+    	absolute_path = g_find_program_in_path("7zr");
+    if (absolute_path)
     {
         ArchiveType = g_list_prepend ( ArchiveType, "7z");
 	    ArchiveSuffix = g_list_prepend ( ArchiveSuffix, "*.7z");

Modified: xarchiver/trunk/src/socket.c
===================================================================
--- xarchiver/trunk/src/socket.c	2007-08-12 14:16:49 UTC (rev 25975)
+++ xarchiver/trunk/src/socket.c	2007-08-12 14:22:28 UTC (rev 25976)
@@ -45,7 +45,7 @@
 	gint sock;
 
 	if (socket_info.file_name == NULL)
-		socket_info.file_name = g_strdup ("/tmp/xarchiver_socket");
+		socket_info.file_name = g_strconcat ("/tmp/xarchiver_",g_get_user_name(),"_socket",NULL);
 
 	sock = socket_fd_connect_unix(socket_info.file_name);
 	if (sock < 0)