Yasumichi Akahoshi
yasum****@users*****
2005年 10月 2日 (日) 02:23:58 JST
Index: cxplorer/src/cxp-file-list-store.c
diff -u cxplorer/src/cxp-file-list-store.c:1.5 cxplorer/src/cxp-file-list-store.c:1.6
--- cxplorer/src/cxp-file-list-store.c:1.5 Sun Oct 2 01:45:03 2005
+++ cxplorer/src/cxp-file-list-store.c Sun Oct 2 02:23:58 2005
@@ -95,7 +95,9 @@
static gboolean cxp_file_list_store_sortable_has_default_sort_func (GtkTreeSortable *
sortable);
+/*
static void cxp_file_list_store_resort (CxpFileListStore * cxp_file_list_store);
+*/
static void cxp_file_list_store_sortable_init (GtkTreeSortableIface * iface);
@@ -878,7 +880,8 @@
}
-static void cxp_file_list_store_resort (CxpFileListStore * obj)
+/* static */
+void cxp_file_list_store_resort (CxpFileListStore * obj)
{
GtkTreePath *path;
gint *neworder, i;
Index: cxplorer/src/cxp-file-list-store.h
diff -u cxplorer/src/cxp-file-list-store.h:1.2 cxplorer/src/cxp-file-list-store.h:1.3
--- cxplorer/src/cxp-file-list-store.h:1.2 Tue Sep 6 20:45:11 2005
+++ cxplorer/src/cxp-file-list-store.h Sun Oct 2 02:23:58 2005
@@ -101,4 +101,6 @@
gboolean cxp_file_list_store_remove (CxpFileListStore * obj,
GtkTreeIter * iter);
+void cxp_file_list_store_resort (CxpFileListStore * cxp_file_list_store); /* test */
+
#endif /* CXP_FILE_LIST_STORE_H */
Index: cxplorer/src/cxp-right-pane.c
diff -u cxplorer/src/cxp-right-pane.c:1.78 cxplorer/src/cxp-right-pane.c:1.79
--- cxplorer/src/cxp-right-pane.c:1.78 Sun Oct 2 01:45:03 2005
+++ cxplorer/src/cxp-right-pane.c Sun Oct 2 02:23:58 2005
@@ -561,6 +561,7 @@
gchar *linkend;
gchar *linkmime;
GdkPixbuf *icon;
+ GdkPixbuf *mask;
gint length;
mode_t mode;
@@ -576,7 +577,9 @@
{
buf[length] = '\0';
linkmime = cxp_get_mime_type_for_file (buf);
- icon = cxp_lookup_icon_from_mime (linkmime);
+ icon = gdk_pixbuf_copy (cxp_lookup_icon_from_mime (linkmime));
+ mask = cxp_lookup_icon_from_mime (mimetype);
+ gdk_pixbuf_composite (mask, icon, 0, 0, 16, 16, 0.0, 0.0, 1.0, 1.0, GDK_INTERP_NEAREST, 255);
g_free (linkmime);
}
else
@@ -1079,6 +1082,7 @@
}
g_dir_close (dir);
}
+ cxp_file_list_store_resort (CXP_FILE_LIST_STORE(model));
gtk_tree_view_set_model (file_list, model);
g_object_unref (model);