Author: stephan
Date: 2006-11-30 23:00:50 +0000 (Thu, 30 Nov 2006)
New Revision: 24020
Modified:
xarchiver/branches/xarchiver-psybsd/TODO
xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-zip.c
xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.c
xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.h
xarchiver/branches/xarchiver-psybsd/libsqueeze/archive.c
xarchiver/branches/xarchiver-psybsd/po/POTFILES.in
xarchiver/branches/xarchiver-psybsd/po/nl.po
xarchiver/branches/xarchiver-psybsd/src/archive_store.c
xarchiver/branches/xarchiver-psybsd/src/widget_factory.c
Log:
Fixed archive-store sync issue (signedness bug in libsqueeze)
updated TODO
changed stuff to custom-actions
Modified: xarchiver/branches/xarchiver-psybsd/TODO
===================================================================
--- xarchiver/branches/xarchiver-psybsd/TODO 2006-11-30 20:46:52 UTC (rev
24019)
+++ xarchiver/branches/xarchiver-psybsd/TODO 2006-11-30 23:00:50 UTC (rev
24020)
@@ -62,6 +62,8 @@
History inside the archive-store is bugged. This shows in
archive_store_get_pwd.
archive-store out-of-sync is buffer-flush... breaks on index 499800:
499800.0 / 300.0 (buffer-size) == 1666.0 remaining 199 items are not flushed
+ - entire buffer is emptied into array
+ - seems fixed, is a signed/unsigned conversion error
DONE:
Modified: xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-zip.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-zip.c
2006-11-30 20:46:52 UTC (rev 24019)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-zip.c
2006-11-30 23:00:50 UTC (rev 24020)
@@ -64,7 +64,7 @@
static gint lsq_archive_support_zip_remove(LSQArchive *, GSList *);
static gint lsq_archive_support_zip_refresh(LSQArchive *);
-static void lsq_archive_support_zip_integrity_test(LSQArchiveSupport *,
LSQArchive *, gpointer);
+static gboolean lsq_archive_support_zip_integrity_test(LSQArchiveSupport *,
LSQArchive *, gpointer);
GType
lsq_archive_support_zip_get_type ()
@@ -481,12 +481,14 @@
return TRUE;
}
-static void
+static gboolean
lsq_archive_support_zip_integrity_test(LSQArchiveSupport *support, LSQArchive
*archive, gpointer user_data)
{
#ifdef DEBUG
g_debug("Custom action %s called", __FUNCTION__);
#endif /* DEBUG */
+
+ return FALSE;
}
static void
Modified: xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.c
2006-11-30 20:46:52 UTC (rev 24019)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.c
2006-11-30 23:00:50 UTC (rev 24020)
@@ -323,7 +323,14 @@
}
void
-lsq_custom_action_execute(LSQCustomAction *action, LSQArchive *archive)
+lsq_custom_action_execute(LSQCustomAction *action, LSQArchive *archive,
LSQCustomActionPreFunc pre_func, LSQCustomActionPostFunc post_func)
{
+ if(pre_func)
+ {
+ if(pre_func(action) == FALSE)
+ return;
+ }
+ /* set post-condition-callback */
+ action->post_func = post_func;
action->func(action->support, archive, action->user_data);
}
Modified: xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.h
2006-11-30 20:46:52 UTC (rev 24019)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.h
2006-11-30 23:00:50 UTC (rev 24020)
@@ -44,7 +44,9 @@
typedef struct _LSQCustomAction LSQCustomAction;
typedef struct _LSQArchiveSupport LSQArchiveSupport;
-typedef void (*LSQCustomActionFunc) (LSQArchiveSupport *support, LSQArchive *,
gpointer user_data);
+typedef gboolean (*LSQCustomActionPreFunc) (LSQCustomAction *);
+typedef gboolean (*LSQCustomActionFunc) (LSQArchiveSupport *support,
LSQArchive *, gpointer user_data);
+typedef gboolean (*LSQCustomActionPostFunc) (LSQCustomAction *, gboolean);
struct _LSQCustomAction
{
@@ -53,6 +55,7 @@
gchar *blurb;
gchar *icon;
LSQCustomActionFunc func;
+ LSQCustomActionPostFunc post_func;
LSQArchiveSupport *support;
gpointer user_data;
};
@@ -120,7 +123,7 @@
const gchar* lsq_custom_action_get_nick(LSQCustomAction*);
const gchar* lsq_custom_action_get_blurb(LSQCustomAction*);
const gchar* lsq_custom_action_get_icon_name(LSQCustomAction*);
-void lsq_custom_action_execute(LSQCustomAction*, LSQArchive *);
+void lsq_custom_action_execute(LSQCustomAction*, LSQArchive *,
LSQCustomActionPreFunc, LSQCustomActionPostFunc);
G_END_DECLS
Modified: xarchiver/branches/xarchiver-psybsd/libsqueeze/archive.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/archive.c 2006-11-30
20:46:52 UTC (rev 24019)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/archive.c 2006-11-30
23:00:50 UTC (rev 24020)
@@ -565,7 +565,7 @@
static void
lsq_archive_entry_free(LSQArchive *archive, LSQEntry *entry)
{
- gint i = 0;
+ guint i = 0;
gpointer props_iter = entry->props;
LSQSList *buffer_iter = entry->buffer;
@@ -579,7 +579,7 @@
if(entry->children)
{
/* first element of the array (*entry->children) contains the
size of the array */
- for(i = 1; i <= GPOINTER_TO_INT(*entry->children); ++i)
+ for(i = 1; i <= GPOINTER_TO_UINT(*entry->children); ++i)
lsq_archive_entry_free(archive, entry->children[i]);
g_free(entry->children);
@@ -623,7 +623,7 @@
{
LSQSList *buffer_iter = NULL;
/* the first element of the array (*entry->children) contains the size
of the array */
- guint size = entry->children?GPOINTER_TO_INT(*entry->children):0;
+ guint size = entry->children?GPOINTER_TO_UINT(*entry->children):0;
guint pos = 0;
guint begin = 1;
gint cmp = 0;
@@ -699,8 +699,8 @@
guint old_i = 1;
guint new_i = 1;
/* the first element of the array (*entry->children) contains the size
of the array */
- guint size = entry->children?GPOINTER_TO_INT(*entry->children):0;
- gint n_children = size;
+ guint size = entry->children?GPOINTER_TO_UINT(*entry->children):0;
+ guint n_children = size;
LSQSList *buffer_iter = NULL;
LSQEntry **children_old = (LSQEntry **)entry->children;
@@ -748,7 +748,7 @@
}
n_children = new_i - 1;
/* the first element of the array (*entry->children) contains the size
of the array */
- *entry->children = GINT_TO_POINTER(n_children);
+ *entry->children = GUINT_TO_POINTER(n_children);
lsq_slist_free(entry->buffer);
entry->buffer = NULL;
@@ -818,7 +818,7 @@
#endif
/* g_debug("%d: %d", iter->children?GPOINTER_TO_INT(*iter->children):0,
lsq_slist_length(iter->buffer)); */
/* the first element of the array (*iter->children) contains the size
of the array */
- return (iter->children?GPOINTER_TO_INT(*iter->children):0 +
lsq_slist_length(iter->buffer));
+ return (iter->children?GPOINTER_TO_UINT(*iter->children):0 +
lsq_slist_length(iter->buffer));
}
/**
Modified: xarchiver/branches/xarchiver-psybsd/po/POTFILES.in
===================================================================
--- xarchiver/branches/xarchiver-psybsd/po/POTFILES.in 2006-11-30 20:46:52 UTC
(rev 24019)
+++ xarchiver/branches/xarchiver-psybsd/po/POTFILES.in 2006-11-30 23:00:50 UTC
(rev 24020)
@@ -1,4 +1,4 @@
-libsqueeze/libxarchiver.c
+libsqueeze/libsqueeze.c
libsqueeze/archive.c
libsqueeze/archive-support.c
libsqueeze/archive-support-gnu-tar.c
Modified: xarchiver/branches/xarchiver-psybsd/po/nl.po
===================================================================
--- xarchiver/branches/xarchiver-psybsd/po/nl.po 2006-11-30 20:46:52 UTC
(rev 24019)
+++ xarchiver/branches/xarchiver-psybsd/po/nl.po 2006-11-30 23:00:50 UTC
(rev 24020)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Squeeze 0.0.1-svn-r24005\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-11-29 00:27+0100\n"
+"POT-Creation-Date: 2006-11-30 16:35+0100\n"
"PO-Revision-Date: 2006-11-28 22:52+0100\n"
"Last-Translator: Stephan Arts <[EMAIL PROTECTED]>\n"
"Language-Team: Dutch <[EMAIL PROTECTED]>\n"
@@ -16,11 +16,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../libsqueeze/archive.c:424
+#: ../libsqueeze/archive.c:423
msgid "Filename"
msgstr "Bestandsnaam"
-#: ../libsqueeze/archive.c:427
+#: ../libsqueeze/archive.c:426
msgid "Mime type"
msgstr "Mime type"
@@ -250,7 +250,7 @@
#: ../src/main_window.c:798
msgid "Which action do you want to perform on the selected file(s)?"
-msgstr ""
+msgstr "Welke actie wil je uitvoeren op de geselecteerde bestand(en)?"
#: ../src/main_window.c:799
msgid "View"
@@ -258,7 +258,7 @@
#: ../src/main_window.c:862
msgid "Failed to open file"
-msgstr ""
+msgstr "Kan bestand niet openen"
#: ../src/main_window.c:863
#, c-format
@@ -266,7 +266,24 @@
"'%s'\n"
"Could not be opened"
msgstr ""
+"'%s'\n"
+"Kan niet worden geopend"
+#.
+#. * Could not create archive (mime type unsupported)
+#.
+#: ../src/application.c:223
+msgid "Could not create archive, MIME-type unsupported"
+msgstr "Kan archief niet maken, MIME-type niet ondersteund"
+
+#.
+#. * Could not open archive (mime type not supported or file did not exist)
+#. * Should be a more specific error message.
+#.
+#: ../src/application.c:240
+msgid "Could not open archive, MIME-type unsupported or file did not exist"
+msgstr "Kan archief niet openen, MIME-type niet ondersteund of bestand bestaat
niet"
+
#: ../src/new_dialog.c:87
msgid "Create new archive"
msgstr "Nieuw archief maken"
@@ -317,12 +334,40 @@
#: ../src/path_bar.c:141
msgid "Spacing"
-msgstr ""
+msgstr "Spatiering"
#: ../src/path_bar.c:142
msgid "The amount of space between the path buttons"
-msgstr ""
+msgstr "De ruimte tussen de pad knoppen"
+#: ../src/archive_store.c:242
+msgid "Show mime icons"
+msgstr "Mime iconen weergeven"
+
+#: ../src/archive_store.c:243
+msgid "Show the mime type icons for each entry"
+msgstr "Mime type iconen weergeven voor elk item"
+
+#: ../src/archive_store.c:249
+msgid "Show up dir entry"
+msgstr "Toon map-omhoog item"
+
+#: ../src/archive_store.c:250
+msgid "Show '..' to go to the parent directory"
+msgstr "Toon '..' om naar de bovenliggende map te gaan"
+
+#: ../src/archive_store.c:256
+msgid "Sort folders before files"
+msgstr "Mappen voor bestanden sorteren"
+
+#: ../src/archive_store.c:257
+msgid "The folders will be put at the top of the list"
+msgstr "De mappen zullen boven aan de lijst geplaatst worden"
+
+#: ../src/archive_store.c:263 ../src/archive_store.c:264
+msgid "Sort text case sensitive"
+msgstr "Tekst hoofdlettergevoelig sorteren"
+
#: ../squeeze.desktop.in.h:1
msgid "Archive manager"
msgstr "Archief beheerder"
Modified: xarchiver/branches/xarchiver-psybsd/src/archive_store.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/archive_store.c 2006-11-30
20:46:52 UTC (rev 24019)
+++ xarchiver/branches/xarchiver-psybsd/src/archive_store.c 2006-11-30
23:00:50 UTC (rev 24020)
@@ -862,8 +862,6 @@
if(psize <= 1)
return;
- g_debug("PSIZE = %d", psize);
-
store->sort_list = g_new(LSQArchiveIter*, psize);
for(i = 0; i < psize; ++i)
Modified: xarchiver/branches/xarchiver-psybsd/src/widget_factory.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/widget_factory.c 2006-11-30
20:46:52 UTC (rev 24019)
+++ xarchiver/branches/xarchiver-psybsd/src/widget_factory.c 2006-11-30
23:00:50 UTC (rev 24020)
@@ -966,6 +966,6 @@
{
LSQArchive *archive = LSQ_ARCHIVE(user_data);
- lsq_custom_action_execute(g_object_get_data(G_OBJECT(widget),
SQ_ACTION_CUSTOM_DATA), archive);
+ lsq_custom_action_execute(g_object_get_data(G_OBJECT(widget),
SQ_ACTION_CUSTOM_DATA), archive, NULL, NULL);
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
