comparison 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
comparison
equal deleted inserted replaced
652:9bcfd6d7a902 653:e06947d07086
473 g_idle_add(gr_quit_idle_cb, NULL); 473 g_idle_add(gr_quit_idle_cb, NULL);
474 } 474 }
475 475
476 static void gr_file_load(const gchar *text, gpointer data) 476 static void gr_file_load(const gchar *text, gpointer data)
477 { 477 {
478 if (isfile(text)) 478 gchar *filename = expand_tilde(text);
479 { 479
480 if (file_extension_match(text, ".gqv")) 480 if (isfile(filename))
481 { 481 {
482 collection_window_new(text); 482 if (file_extension_match(filename, ".gqv"))
483 {
484 collection_window_new(filename);
483 } 485 }
484 else 486 else
485 { 487 {
486 layout_set_path(NULL, text); 488 layout_set_path(NULL, filename);
487 } 489 }
488 } 490 }
489 else if (isdir(text)) 491 else if (isdir(filename))
490 { 492 {
491 layout_set_path(NULL, text); 493 layout_set_path(NULL, filename);
492 } 494 }
493 else 495 else
494 { 496 {
495 printf("remote sent filename that does not exist:\"%s\"\n", text); 497 printf("remote sent filename that does not exist:\"%s\"\n", filename);
496 } 498 }
499
500 g_free(filename);
497 } 501 }
498 502
499 static void gr_file_view(const gchar *text, gpointer data) 503 static void gr_file_view(const gchar *text, gpointer data)
500 { 504 {
501 view_window_new(file_data_new_simple(text)); 505 gchar *filename = expand_tilde(text);
506
507 view_window_new(file_data_new_simple(filename));
508 g_free(filename);
502 } 509 }
503 510
504 static void gr_list_clear(const gchar *text, gpointer data) 511 static void gr_list_clear(const gchar *text, gpointer data)
505 { 512 {
506 RemoteData *remote_data = data; 513 RemoteData *remote_data = data;