[Goodies-commits] r4077 - ristretto/trunk/src

[Stephan Arts]

Author: stephan
Date: 2008-03-21 14:52:02 +0000 (Fri, 21 Mar 2008)
New Revision: 4077

Modified:
   ristretto/trunk/src/navigator.c
Log:
Fix open of file from cli



Modified: ristretto/trunk/src/navigator.c
===================================================================
--- ristretto/trunk/src/navigator.c	2008-03-21 14:18:10 UTC (rev 4076)
+++ ristretto/trunk/src/navigator.c	2008-03-21 14:52:02 UTC (rev 4077)
@@ -1308,12 +1308,15 @@
 
         navigator->file_iter = iter;
 
-        g_signal_emit(G_OBJECT(navigator),
+        if (navigator->busy  == FALSE)
+        {
+            g_signal_emit(G_OBJECT(navigator),
                       rstto_navigator_signals[RSTTO_NAVIGATOR_SIGNAL_ITER_CHANGED],
                       0,
                       g_list_position(navigator->file_list, navigator->file_iter),
                       navigator->file_iter->data,
                       NULL);
+        }
     }
 
 }
@@ -1386,6 +1389,7 @@
 {
     ThunarVfsInfo *vfs_info = NULL;
     ThunarVfsPath *vfs_path = thunar_vfs_path_new(path, error);
+
     gchar *file_media = NULL;
     gchar *file_uri = NULL;
 
@@ -1420,6 +1424,8 @@
         if (open_folder == TRUE)
         {
             ThunarVfsPath *parent_vfs_path = thunar_vfs_path_get_parent(vfs_path);
+            thunar_vfs_path_ref(parent_vfs_path);
+
             gchar *parent_path = thunar_vfs_path_dup_string(parent_vfs_path);
 
             if(rstto_navigator_open_folder(navigator, parent_path, FALSE, error) == FALSE)
@@ -1439,7 +1445,7 @@
             }
             else
             {
-                g_critical("not found");
+                rstto_navigator_jump_first(navigator);
             }
         }
         else
@@ -1538,6 +1544,7 @@
     }
 
     g_free(dir_uri);
+    return TRUE;
 }
 
 void