Handle broken links correctly

moo/mooedit/mooeditwindow.c

@@ -535,6 +535,8 @@ static void     add_tab                 (MooEditWindow      *window,
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
                                     GTK_POLICY_AUTOMATIC,
                                     GTK_POLICY_AUTOMATIC);
+    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow),
+                                         GTK_SHADOW_ETCHED_IN);
     gtk_container_add (GTK_CONTAINER (scrolledwindow), GTK_WIDGET (edit));
     gtk_widget_show_all (scrolledwindow);
     g_object_set_qdata (G_OBJECT (edit), SCROLLED_WINDOW_QUARK, scrolledwindow);

moo/mooedit/moofileview-icons.c

@@ -292,8 +292,10 @@ GdkPixbuf  *moo_get_icon_for_file           (GtkWidget         *widget,
         case ICON_NONE:
             goto fallback;
 
+        /* what's the point in having symlink icon for broken links? */
+        case ICON_BROKEN_SYMBOLIC_LINK:
         case ICON_NOENT:
-            pixbuf = get_fallback_icon (widget, icon_type, size);
+            pixbuf = get_fallback_icon (widget, ICON_NOENT, size);
             break;
 
         case ICON_REGULAR:

moo/mooedit/moofileview.c

@@ -54,6 +54,7 @@ struct _MooFileViewFile {
     gboolean     is_dir;
     struct stat  statbuf;
     gboolean     exists;
+    gboolean     broken_link;
     gpointer     time;  /* struct tm* */
     gpointer     date_string;
     guint        size;
@@ -756,9 +757,17 @@ static gboolean populate_tree           (MooFileView    *fileview,
     fileview->priv->populate_dir = g_dir_open (path, 0, error);
     if (!fileview->priv->populate_dir) return FALSE;
 
+#if 1
     if (populate_a_bit (fileview))
         fileview->priv->populate_idle =
                 g_idle_add ((GSourceFunc) populate_a_bit, fileview);
+#else
+    while (populate_a_bit (fileview))
+    {
+        while (gtk_events_pending ())
+            gtk_main_iteration ();
+    }
+#endif
 
     if (gtk_tree_model_get_iter_first (fileview->priv->filter_model, &iter))
     {
@@ -872,31 +881,27 @@ static MooFileViewFile  *file_new   (MooFileView    *fileview,
     file->uri = g_strdup_printf ("file://%s", fullname);
     file->display_name = g_filename_display_basename (basename);
 
-#ifdef USE_XDGMIME
-    file->mime_type = xdg_mime_get_mime_type_for_file (fullname);
-#else
-    file->mime_type = NULL;
-#endif
-
-
     file->time = NULL;  /* struct tm* */
     file->date_string = NULL;
     file->size = 0;
 
     file->is_dir = FALSE;
     file->exists = TRUE;
+    file->broken_link = FALSE;
 
     if (g_stat (fullname, &file->statbuf) != 0)
     {
-        if (errno == ENOENT)
+        file->exists = FALSE;
+
+        if (errno == ENOENT && !g_lstat (fullname, &file->statbuf))
         {
             gchar *display_name = g_filename_display_name (fullname);
-            g_warning ("%s: file '%s' doesn't exist",
+            g_message ("%s: file '%s' is a broken link",
                        G_STRLOC, display_name);
             g_free (display_name);
-            file->exists = FALSE;
+            file->broken_link = TRUE;
         }
-        else if (g_lstat (fullname, &file->statbuf) != 0)
+        else
         {
             int save_errno = errno;
             gchar *display_name = g_filename_display_name (fullname);
@@ -904,7 +909,6 @@ static MooFileViewFile  *file_new   (MooFileView    *fileview,
                        G_STRLOC, display_name,
                        g_strerror (save_errno));
             g_free (display_name);
-            file->exists = FALSE;
         }
     }
 
@@ -912,6 +916,12 @@ static MooFileViewFile  *file_new   (MooFileView    *fileview,
     {
         if (S_ISDIR (file->statbuf.st_mode))
             file->is_dir = TRUE;
+
+#ifdef USE_XDGMIME
+        file->mime_type = xdg_mime_get_mime_type_for_file (fullname);
+#else
+        file->mime_type = NULL;
+#endif
     }
 
     file->pixbuf = NULL;
@@ -1264,13 +1274,21 @@ static GtkWidget   *create_iconview         (MooFileView    *fileview)
 gconstpointer moo_file_view_file_get_stat   (MooFileViewFile *file)
 {
     g_return_val_if_fail (file != NULL, NULL);
-    if (file->exists)
+
+    if (file->exists || file->broken_link)
         return &file->statbuf;
     else
         return NULL;
 }
 
 
+gboolean    moo_file_view_file_is_broken_link (MooFileViewFile *file)
+{
+    g_return_val_if_fail (file != NULL, FALSE);
+    return file->broken_link;
+}
+
+
 const char *moo_file_view_file_path         (MooFileViewFile *file)
 {
     g_return_val_if_fail (file != NULL, NULL);

moo/mooedit/moofileview.h

@@ -76,6 +76,7 @@ void        moo_file_view_set_view_type     (MooFileView    *fileview,
                                              MooFileViewType type);
 
 gconstpointer moo_file_view_file_get_stat   (MooFileViewFile *file);
+gboolean    moo_file_view_file_is_broken_link (MooFileViewFile *file);
 const char *moo_file_view_file_path         (MooFileViewFile *file);
 const char *moo_file_view_file_mime_type    (MooFileViewFile *file);