keep raw mime for sorting

2 files changed, 21 insertions, 17 deletions

diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index 8e567071..9ab34778 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -58,6 +58,7 @@ enum
   SEARCH_SIZE,
   SEARCH_HSIZE,
   SEARCH_MIME,
+  SEARCH_RAW_MIME,
   SEARCH_DESC,
   SEARCH_PIXBUF,
   SEARCH_URI,
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index b6fc58b2..0d000a60 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -262,7 +262,8 @@ addEntryToSearchTree (SearchList * searchContext,
                       SEARCH_ICON, icon,
 #endif
                       SEARCH_NAME, name, SEARCH_SIZE, size, SEARCH_HSIZE,
-                      size_h, SEARCH_MIME, mime, SEARCH_DESC, desc,
+                      size_h, SEARCH_MIME, mime, 
+                      SEARCH_RAW_MIME, rawMime, SEARCH_DESC, desc,
                       SEARCH_PIXBUF, pixbuf, SEARCH_URI,
                       GNUNET_ECRS_uri_duplicate (info->uri), SEARCH_META,
                       GNUNET_meta_data_duplicate (info->meta),
@@ -416,7 +417,7 @@ on_search_display_metadata_activate (void *cls, GtkWidget * searchEntry)
                                               list->last_y,
                                               &path, NULL, NULL, NULL))
     {
-      GNUNET_GE_BREAK (NULL, 0);
+      /* nothing selected */
       return FALSE;
     }
   if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (list->tree),
@@ -723,6 +724,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
                                    G_TYPE_UINT64,       /* size */
                                    G_TYPE_STRING,       /* human-readable size */
                                    G_TYPE_STRING,       /* mime-type */
+                                   G_TYPE_STRING,       /* raw mime-type */
                                    G_TYPE_STRING,       /* meta-data (some) */
                                    GDK_TYPE_PIXBUF,     /* preview */
                                    G_TYPE_POINTER,      /* url */
@@ -765,20 +767,6 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   gtk_tree_view_column_set_sort_column_id (column, SEARCH_STATUS);
   gtk_tree_view_column_set_min_width (column, 0);
 
-#ifdef HAVE_GIO
-  renderer = gtk_cell_renderer_pixbuf_new ();
-  col = gtk_tree_view_insert_column_with_attributes (list->treeview,
-                                                     -1,
-                                                     NULL,
-                                                     renderer,
-                                                     "pixbuf",
-                                                     SEARCH_ICON, NULL);
-  column = gtk_tree_view_get_column (list->treeview, col - 1);
-  gtk_tree_view_column_set_resizable (column, TRUE);
-  gtk_tree_view_column_set_reorderable (column, FALSE);
-  gtk_tree_view_column_set_min_width (column, 20);
-#endif
-
   renderer = gtk_cell_renderer_text_new ();
   col = gtk_tree_view_insert_column_with_attributes (list->treeview,
                                                      -1,
@@ -809,6 +797,20 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   gtk_tree_view_column_set_reorderable (column, TRUE);
   gtk_tree_view_column_set_sort_column_id (column, SEARCH_SIZE);
 
+#ifdef HAVE_GIO
+  renderer = gtk_cell_renderer_pixbuf_new ();
+  col = gtk_tree_view_insert_column_with_attributes (list->treeview,
+                                                     -1,
+                                                     _("Type"),
+                                                     renderer,
+                                                     "pixbuf",
+                                                     SEARCH_ICON, NULL);
+  column = gtk_tree_view_get_column (list->treeview, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, SEARCH_RAW_MIME);
+  gtk_tree_view_column_set_min_width (column, 20);
+#else
   renderer = gtk_cell_renderer_text_new ();
   col = gtk_tree_view_insert_column_with_attributes (list->treeview,
                                                      -1,
@@ -823,7 +825,8 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   gtk_tree_view_column_set_resizable (column, TRUE);
   gtk_tree_view_column_set_clickable (column, TRUE);
   gtk_tree_view_column_set_reorderable (column, TRUE);
-  gtk_tree_view_column_set_sort_column_id (column, SEARCH_MIME);
+  gtk_tree_view_column_set_sort_column_id (column, SEARCH_RAW_MIME);
+#endif
 
 #if 0
   /* colums for data visualized graphically */