gnome-commander r1538 - in trunk: . doc/C src

[epiotr svn gnome org]

Author: epiotr
Date: Mon Jan 21 21:08:19 2008
New Revision: 1538
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1538&view=rev

Log:
Fixed problem #510567 (failed assert when deleting dir)

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/doc/C/gnome-commander.xml
   trunk/src/gnome-cmd-dir.cc

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jan 21 21:08:19 2008
@@ -13,6 +13,7 @@
  * Fixed problem #468685 (crash in python module)
  * Fixed problem #490431 (view files with name containing '%')
  * Fixed problem #508565 (improper utf-8 handling in advanced file rename tool)
+ * Fixed problem #510567 (failed assert when deleting dir)
  * Fixed problem when creating ~/dir
  * Fixed problem with updating of internal viewer status bar
  * Fixed crash when creating dir with absolute path on SMB share

Modified: trunk/doc/C/gnome-commander.xml
==============================================================================
--- trunk/doc/C/gnome-commander.xml	(original)
+++ trunk/doc/C/gnome-commander.xml	Mon Jan 21 21:08:19 2008
@@ -5811,6 +5811,9 @@
                             <para>Fixed problem #508565 (improper utf-8 handling in advanced file rename tool)</para>
                         </listitem>
                         <listitem>
+                            <para>Fixed problem #510567 (failed assert when deleting dir)</para>
+                        </listitem>
+                        <listitem>
                             <para>Fixed problem when creating ~/dir</para>
                         </listitem>
                         <listitem>

Modified: trunk/src/gnome-cmd-dir.cc
==============================================================================
--- trunk/src/gnome-cmd-dir.cc	(original)
+++ trunk/src/gnome-cmd-dir.cc	Mon Jan 21 21:08:19 2008
@@ -780,7 +780,8 @@
 
     GnomeCmdFile *finfo = gnome_cmd_file_collection_lookup (dir->priv->file_collection, uri_str);
 
-    g_return_if_fail (GNOME_CMD_IS_FILE (finfo));
+    if (!GNOME_CMD_IS_FILE (finfo))
+        return;
 
     gtk_signal_emit (GTK_OBJECT (dir), dir_signals[FILE_DELETED], finfo);