[Xfce4-commits] r24249 - squeeze/trunk/libsqueeze

[Stephan Arts]

Author: stephan
Date: 2007-01-02 23:27:39 +0000 (Tue, 02 Jan 2007)
New Revision: 24249

Modified:
   squeeze/trunk/libsqueeze/archive.c
   squeeze/trunk/libsqueeze/internals.h
   squeeze/trunk/libsqueeze/libsqueeze.c
Log:
Fixed Commandline opening of archives using relative filenames

Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c	2007-01-02 23:03:39 UTC (rev 24248)
+++ squeeze/trunk/libsqueeze/archive.c	2007-01-02 23:27:39 UTC (rev 24249)
@@ -236,7 +236,10 @@
 
 	if(path)
 	{
-		archive->path_info = thunar_vfs_path_new(path, NULL);
+		if(g_path_is_absolute(path))
+			archive->path_info = thunar_vfs_path_new(path, NULL);
+		else
+			archive->path_info = thunar_vfs_path_relative(lsq_relative_base_path, path);
 		archive->path = thunar_vfs_path_dup_string(archive->path_info);
 	}
 	else

Modified: squeeze/trunk/libsqueeze/internals.h
===================================================================
--- squeeze/trunk/libsqueeze/internals.h	2007-01-02 23:03:39 UTC (rev 24248)
+++ squeeze/trunk/libsqueeze/internals.h	2007-01-02 23:27:39 UTC (rev 24249)
@@ -19,6 +19,7 @@
 const gchar            *lsq_tmp_dir;
 GSList                 *lsq_archive_support_list;
 GSList                 *lsq_opened_archive_list;
+ThunarVfsPath          *lsq_relative_base_path;
 
 /*
  * gint

Modified: squeeze/trunk/libsqueeze/libsqueeze.c
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.c	2007-01-02 23:03:39 UTC (rev 24248)
+++ squeeze/trunk/libsqueeze/libsqueeze.c	2007-01-02 23:27:39 UTC (rev 24249)
@@ -32,6 +32,7 @@
 void
 lsq_init()
 {
+	gchar *current_dir = g_get_current_dir();
 	lsq_tmp_dir = g_get_tmp_dir();
 
 	lsq_mime_database = thunar_vfs_mime_database_get_default();
@@ -43,6 +44,9 @@
 	lsq_register_support(lsq_archive_support_rar_new());
 	lsq_register_support(lsq_archive_support_unrar_new());
 	*/
+
+	lsq_relative_base_path = thunar_vfs_path_new(current_dir, NULL);
+	g_free(current_dir);
 }
 
 void