Yasumichi Akahoshi
yasum****@users*****
2005年 9月 3日 (土) 22:35:08 JST
Index: cxplorer/src/cxp-right-pane.c
diff -u cxplorer/src/cxp-right-pane.c:1.56 cxplorer/src/cxp-right-pane.c:1.57
--- cxplorer/src/cxp-right-pane.c:1.56 Sat Sep 3 02:55:15 2005
+++ cxplorer/src/cxp-right-pane.c Sat Sep 3 22:35:08 2005
@@ -32,8 +32,6 @@
GtkWidget *popup_menu;
gboolean dispose_has_run;
gchar *cur_dir;
- GdkPixbuf *cxp_dir;
- GdkPixbuf *cxp_unknown;
CxpHandler *handler;
} CxpRightPanePrivate;
@@ -205,9 +203,6 @@
//gtk_paned_set_position (GTK_PANED (self), 250);
- priv->cxp_dir = create_pixbuf ("cxp_dir.png");
- priv->cxp_unknown = create_pixbuf ("cxp_unknown.png");
-
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (GTK_WIDGET (scrolled_window), 300, 200);
gtk_box_pack_start (GTK_BOX (self), scrolled_window, TRUE, TRUE, 0);
@@ -525,7 +520,6 @@
GtkTreeModel * tree_model,
GtkTreeIter * iter, gpointer data)
{
- CxpRightPanePrivate *priv = CXP_RIGHT_PANE_GET_PRIVATE (data);
gchar *filename;
gchar *mimetype;
GdkPixbuf *icon;
@@ -699,11 +693,7 @@
COL_FILE_MODE, &mode_b, COL_TERMINATOR);
mode_a &= S_IFMT;
mode_b &= S_IFMT;
- if (mode_a < mode_b)
- {
- result = -1;
- }
- else if (mode_a == mode_b)
+ if (mode_a == mode_b)
{
if (name_a == NULL || name_b == NULL)
{
@@ -717,9 +707,9 @@
result = g_utf8_collate (name_a, name_b);
}
}
- else /* mode_a > mode_b */
+ else
{
- result = 1;
+ result = mode_a - mode_b;
}
g_free (name_a);
Index: cxplorer/src/cxplorer.c
diff -u cxplorer/src/cxplorer.c:1.25 cxplorer/src/cxplorer.c:1.26
--- cxplorer/src/cxplorer.c:1.25 Sat Apr 9 02:58:19 2005
+++ cxplorer/src/cxplorer.c Sat Sep 3 22:35:08 2005
@@ -5,7 +5,7 @@
* This file contains functions which related struct Cxplorer.
* @author Yasumichi Akahoshi <yasum****@users*****>
* @date Mon Jun 14 13:26:05 2004
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
****************************************************************************/
#ifdef HAVE_CONFIG_H
@@ -25,7 +25,6 @@
{
Cxplorer *cxplorer;
gchar *gcCurrentDirectory;
- GdkPixbuf *pixbuf;
cxplorer = g_new (Cxplorer, 1);
@@ -38,10 +37,7 @@
cxplorer->gbShowDotFile =
cxp_profile_get_integer (cxplorer->profile, "ShowDotFile");
- pixbuf = create_pixbuf ("cxp_dir.png");
- cxplorer->dirview =
- CXP_DIR_VIEW (cxp_dir_view_new
- (cxplorer->gbShowDotFile, pixbuf));
+ cxplorer->dirview = CXP_DIR_VIEW (cxp_dir_view_new (cxplorer->gbShowDotFile));
cxp_dir_view_change_directory (cxplorer->dirview, g_get_current_dir ());
g_signal_connect (cxplorer->dirview, "directory_changed",
G_CALLBACK (on_directory_changed),