Author: colossus
Date: 2006-07-28 11:02:08 +0000 (Fri, 28 Jul 2006)
New Revision: 22543
Modified:
xarchiver/trunk/src/callbacks.c
xarchiver/trunk/src/iso.c
Log:
Fixed a crash when extracting to the Trash bin. Thanks to Benny for reporting
this.
Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c 2006-07-28 10:39:56 UTC (rev 22542)
+++ xarchiver/trunk/src/callbacks.c 2006-07-28 11:02:08 UTC (rev 22543)
@@ -1757,6 +1757,8 @@
no_uri_path = g_filename_from_uri ( (gchar*)fm_path, NULL, NULL
);
//g_message ("%s - %s",fm_path,no_uri_path);
g_free ( fm_path );
+ if (no_uri_path == NULL)
+ gtk_drag_finish (dc, FALSE, FALSE, t);
gtk_tree_model_get_iter(model, &iter,
(GtkTreePath*)(_row_list->data));
gtk_tree_model_get (model, &iter, 0, &name, -1);
Modified: xarchiver/trunk/src/iso.c
===================================================================
--- xarchiver/trunk/src/iso.c 2006-07-28 10:39:56 UTC (rev 22542)
+++ xarchiver/trunk/src/iso.c 2006-07-28 11:02:08 UTC (rev 22543)
@@ -333,21 +333,19 @@
g_file_offset = extent;
g_file_size = fstat_buf.st_size;
-
-
if ( (!use_rock) && (!use_joilet) )
strcpy (name_buf + strlen (name_buf)- 2, " "); /* remove ";1"
from file name */
if (strcmp (name_buf,"..") == 0 || strcmp (name_buf,".") == 0)
return;
-
+
if (outline[0] == 'd')
archive->nr_of_dirs++;
else
archive->nr_of_files++;
-
- g_file_name = g_strconcat (dir_name, name_buf , NULL);
+ g_file_name = g_strconcat (dir_name, name_buf , NULL);
+
filename = g_new0(GValue, 1);
permissions = g_new0(GValue, 1);
size = g_new0(GValue, 1);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
