diff src/remote.c @ 653:e06947d07086

Expand tilde with file: and view: remote parameters. Now these are working: geeqie -r file:~/dir geeqie -r view:~user/file
author zas_
date Tue, 13 May 2008 16:09:43 +0000
parents 9bcfd6d7a902
children 8268cbe682f1
line wrap: on
line diff
--- a/src/remote.c	Tue May 13 14:49:38 2008 +0000
+++ b/src/remote.c	Tue May 13 16:09:43 2008 +0000
@@ -475,30 +475,37 @@
 
 static void gr_file_load(const gchar *text, gpointer data)
 {
-	if (isfile(text))
+	gchar *filename = expand_tilde(text);
+
+	if (isfile(filename))
 		{
-		if (file_extension_match(text, ".gqv"))
+		if (file_extension_match(filename, ".gqv"))
 			{
-			collection_window_new(text);
+			collection_window_new(filename);
 			}
 		else
 			{
-			layout_set_path(NULL, text);
+			layout_set_path(NULL, filename);
 			}
 		}
-	else if (isdir(text))
+	else if (isdir(filename))
 		{
-		layout_set_path(NULL, text);
+		layout_set_path(NULL, filename);
 		}
 	else
 		{
-		printf("remote sent filename that does not exist:\"%s\"\n", text);
+		printf("remote sent filename that does not exist:\"%s\"\n", filename);
 		}
+
+	g_free(filename);
 }
 
 static void gr_file_view(const gchar *text, gpointer data)
 {
-	view_window_new(file_data_new_simple(text));
+	gchar *filename = expand_tilde(text);
+
+	view_window_new(file_data_new_simple(filename));
+	g_free(filename);
 }
 
 static void gr_list_clear(const gchar *text, gpointer data)