Yasumichi Akahoshi
yasum****@users*****
2005年 5月 15日 (日) 01:22:29 JST
Index: cxplorer/src/Makefile.in
diff -u cxplorer/src/Makefile.in:1.25 cxplorer/src/Makefile.in:1.26
--- cxplorer/src/Makefile.in:1.25 Thu May 12 02:57:58 2005
+++ cxplorer/src/Makefile.in Sun May 15 01:22:28 2005
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Index: cxplorer/src/cxp-right-pane.c
diff -u cxplorer/src/cxp-right-pane.c:1.46 cxplorer/src/cxp-right-pane.c:1.47
--- cxplorer/src/cxp-right-pane.c:1.46 Sun May 15 00:35:10 2005
+++ cxplorer/src/cxp-right-pane.c Sun May 15 01:22:28 2005
@@ -777,6 +777,7 @@
if (g_file_test(fullpath, G_FILE_TEST_IS_DIR) && !g_file_test(fullpath, G_FILE_TEST_IS_SYMLINK))
{
+ errno = 0;
if(rmdir(fullpath) == -1)
{
switch(errno)
@@ -811,31 +812,16 @@
gtk_widget_destroy (dialog);
break;
default:
- dialog = gtk_message_dialog_new (NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "%s:%s",
- filename,
- g_strerror (errno));
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
+ cxp_error_dialog_run_about_file (filename);
}
}
}
else
{
+ errno = 0;
if (unlink (fullpath) != 0)
{
- dialog = gtk_message_dialog_new (NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "%s:%s",
- filename,
- g_strerror (errno));
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
+ cxp_error_dialog_run_about_file (filename);
}
}