Author: stephan
Date: 2007-02-28 13:35:24 +0000 (Wed, 28 Feb 2007)
New Revision: 25042
Modified:
squeeze/trunk/libsqueeze/archive-iter.c
squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
squeeze/trunk/libsqueeze/archive-support-zip.c
Log:
Binary search inside iter-pool made squeeze hang.
Added property-support for gnu-tar refresh.
Modified: squeeze/trunk/libsqueeze/archive-iter.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-iter.c 2007-02-28 12:01:15 UTC (rev
25041)
+++ squeeze/trunk/libsqueeze/archive-iter.c 2007-02-28 13:35:24 UTC (rev
25042)
@@ -172,8 +172,8 @@
}
if(cmp > 0)
{
+ size -= ++pos;
off += pos;
- size -= pos;
}
if(cmp < 0)
{
Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2007-02-28 12:01:15 UTC
(rev 25041)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2007-02-28 13:35:24 UTC
(rev 25042)
@@ -387,6 +387,31 @@
{
lsq_archive_clear_entry_property_types(archive);
i = LSQ_ARCHIVE_PROP_USER;
+ if(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_view_rights)
+ {
+ lsq_archive_set_entry_property_type(archive, i,
G_TYPE_STRING, _("Permissions"));
+ i++;
+ }
+ if(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_view_owner)
+ {
+ lsq_archive_set_entry_property_type(archive, i,
G_TYPE_STRING,_("Owner/Group"));
+ i++;
+ }
+ if(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_view_size)
+ {
+ lsq_archive_set_entry_property_type(archive, i,
G_TYPE_UINT64, _("Size"));
+ i++;
+ }
+ if(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_view_date)
+ {
+ lsq_archive_set_entry_property_type(archive, i,
G_TYPE_STRING, _("Date"));
+ i++;
+ }
+ if(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->_view_time)
+ {
+ lsq_archive_set_entry_property_type(archive, i,
G_TYPE_STRING, _("Time"));
+ i++;
+ }
gchar *command_skeleton = g_strconcat(GNU_TAR_APP_NAME, " -tvvf
%1$s", NULL);
archive_command = lsq_archive_command_new("", archive,
command_skeleton, TRUE);
@@ -478,6 +503,7 @@
}
n++;
+ props[i] = NULL;
gchar *temp = g_strrstr (&line[n],"->");
if (temp )
{
Modified: squeeze/trunk/libsqueeze/archive-support-zip.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-zip.c 2007-02-28 12:01:15 UTC
(rev 25041)
+++ squeeze/trunk/libsqueeze/archive-support-zip.c 2007-02-28 13:35:24 UTC
(rev 25042)
@@ -185,14 +185,14 @@
LSQArchiveSupportZip *support;
support = g_object_new(LSQ_TYPE_ARCHIVE_SUPPORT_ZIP,
-
"view-uncompressed-size", TRUE,
+ "view-uncompressed-size", TRUE,
"view-compressed-size", TRUE,
-
"view-time", TRUE,
-
"view-date", TRUE,
-
"view-ratio", TRUE,
-
"view-crc32", TRUE,
-
"view-method", TRUE,
-
NULL);
+ "view-time", TRUE,
+ "view-date", TRUE,
+ "view-ratio", TRUE,
+ "view-crc32", TRUE,
+ "view-method", TRUE,
+ NULL);
return LSQ_ARCHIVE_SUPPORT(support);
}
@@ -468,6 +468,7 @@
line[linesize-1] = '\0';
temp_filename = line+n;
+ props[i] = NULL;
entry = lsq_archive_add_file(archive, temp_filename);
lsq_archive_iter_set_propsv(entry, (gconstpointer*)props);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
