[Xfce4-commits] r23288 - terminal/trunk/po xarchiver/trunk/po
Author: piarres Date: 2006-10-05 10:17:31 + (Thu, 05 Oct 2006) New Revision: 23288 Modified: terminal/trunk/po/ChangeLog terminal/trunk/po/eu.po xarchiver/trunk/po/ChangeLog xarchiver/trunk/po/eu.po Log: Basque translation update for terminal and xarchiver Modified: terminal/trunk/po/ChangeLog === --- terminal/trunk/po/ChangeLog 2006-10-04 21:32:03 UTC (rev 23287) +++ terminal/trunk/po/ChangeLog 2006-10-05 10:17:31 UTC (rev 23288) @@ -1,3 +1,7 @@ +2006-10-05 Piarres Beobide [EMAIL PROTECTED] + +* eu.po: Basque translation update. + 2006-10-02 Pau Rul-lan Ferragut [EMAIL PROTECTED] * ru.po: Updated Russian translations by Andrey Fedoseev Modified: terminal/trunk/po/eu.po === --- terminal/trunk/po/eu.po 2006-10-04 21:32:03 UTC (rev 23287) +++ terminal/trunk/po/eu.po 2006-10-05 10:17:31 UTC (rev 23288) @@ -967,9 +967,8 @@ #: ../terminal/terminal-preferences.c:381 #: ../terminal/terminal-preferences.c:382 -#, fuzzy msgid Paste Selection -msgstr bTestua Hautapena/b +msgstr Hautapena Itsatsi #: ../terminal/terminal-preferences.c:392 #: ../terminal/terminal-preferences.c:393 @@ -1269,11 +1268,11 @@ #: ../terminal/terminal-window.c:206 msgid Paste _Selection -msgstr +msgstr _Hautapena Itsatsi #: ../terminal/terminal-window.c:206 msgid Paste from primary selection -msgstr +msgstr Oinarrziko hautapenetik itsatsi #: ../terminal/terminal-window.c:207 msgid _Applications... Modified: xarchiver/trunk/po/ChangeLog === --- xarchiver/trunk/po/ChangeLog2006-10-04 21:32:03 UTC (rev 23287) +++ xarchiver/trunk/po/ChangeLog2006-10-05 10:17:31 UTC (rev 23288) @@ -1,3 +1,6 @@ +2006-10-05 Piarres Beobide [EMAIL PROTECTED] + +* eu.po: Basque translation update. 2006-10-02 Pau Rul-lan Ferragut [EMAIL PROTECTED] * ru.po: Updated Russian translations by Andrey Fedoseev Modified: xarchiver/trunk/po/eu.po === --- xarchiver/trunk/po/eu.po2006-10-04 21:32:03 UTC (rev 23287) +++ xarchiver/trunk/po/eu.po2006-10-05 10:17:31 UTC (rev 23288) @@ -866,7 +866,7 @@ #: src/rar.c:37 msgid CRC -msgstr +msgstr CRC #: src/rar.c:37 src/zip.c:37 msgid Method @@ -923,7 +923,7 @@ #: src/zip.c:37 msgid CRC-32 -msgstr +msgstr CRC-Â32 #~ msgid Extract the archive to the specified folder and quits. #~ msgstr Zehazturiko paketea helburu karpetara atera eta irten. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23289 - in xarchiver/branches/xarchiver-psybsd: libxarchiver src
Author: stephan
Date: 2006-10-05 11:07:34 + (Thu, 05 Oct 2006)
New Revision: 23289
Modified:
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.h
xarchiver/branches/xarchiver-psybsd/src/archive_store.c
xarchiver/branches/xarchiver-psybsd/src/archive_store.h
xarchiver/branches/xarchiver-psybsd/src/main_window.c
Log:
Applied patch from Peter de Ridder [EMAIL PROTECTED]
Fixed segfault.
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c
===
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c 2006-10-05
10:17:31 UTC (rev 23288)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c 2006-10-05
11:07:34 UTC (rev 23289)
@@ -31,7 +31,7 @@
#include internals.h
-#define LXA_ENTRY_CHILD_BUFFER_SIZE 300
+#define LXA_ENTRY_CHILD_BUFFER_SIZE 3
static void
@@ -188,6 +188,7 @@
gchar **path_items;
LXAEntry *tmp_entry = NULL, *parent = NULL;
path_items = g_strsplit_set(path, /\n, -1);
+/*
tmp_entry = lxa_entry_get_child(archive-root_entry, path_items[0]);
if(!tmp_entry)
{
@@ -198,11 +199,12 @@
else
tmp_entry-is_folder = FALSE;
lxa_entry_add_child(archive-root_entry, tmp_entry);
- lxa_entry_flush_buffer(archive-root_entry);
+// lxa_entry_flush_buffer(archive-root_entry);
}
- for(i = 1; path_items[i]?strlen(path_items[i]):0;i++)
+*/
+ parent = archive-root_entry;
+ for(i = 0; path_items[i]?strlen(path_items[i]):0;i++)
{
- parent = tmp_entry;
tmp_entry = lxa_entry_get_child(parent, path_items[i]);
if(!tmp_entry)
{
@@ -212,7 +214,7 @@
if(path[strlen(path)-1] == '/')
{
tmp_entry-is_folder = TRUE;
- lxa_entry_flush_buffer(parent);
+// lxa_entry_flush_buffer(parent);
}
else
tmp_entry-is_folder = FALSE;
@@ -260,21 +262,39 @@
return 0;
}
+//TODO: why does this have a return value?
gboolean
lxa_entry_add_child(LXAEntry *parent, LXAEntry *child)
{
- guint max_children = 0;
- guint begin = 0;
- guint pos = 0;
- gint cmp = 0;
- guint old_i = 0;
- guint new_i = 0;
- guint size = parent-n_children;
- guint org_size = parent-n_children;
- GSList *buffer_iter = NULL;
- LXAEntry **children_old = (LXAEntry **)parent-children;
-
- parent-buffer = g_slist_insert_sorted(parent-buffer, (gpointer)child,
(GCompareFunc)lxa_archive_sort_entry_buffer);
+ gint cmp = 1;
+ GSList *buffer_iter = parent-buffer;
+ GSList *prev_entry = NULL;
+ GSList *new_entry = NULL;
+
+ for(; buffer_iter; buffer_iter = buffer_iter-next)
+ {
+ cmp = strcmp(child-filename,
((LXAEntry*)buffer_iter-data)-filename);
+
+ if(!cmp)
+ {
+ /* TODO: merge same as in flush */
+ return;
+ }
+ if(cmp 0)
+ break;
+
+ prev_entry = buffer_iter;
+ }
+
+ new_entry = g_new(GSList, 1);
+ new_entry-next = buffer_iter;
+ new_entry-data = child;
+
+ if(prev_entry)
+ prev_entry-next = new_entry;
+ else
+ parent-buffer = new_entry;
+
if(g_slist_length(parent-buffer) == LXA_ENTRY_CHILD_BUFFER_SIZE)
lxa_entry_flush_buffer(parent);
}
@@ -282,16 +302,18 @@
LXAEntry *
lxa_entry_get_child(LXAEntry *entry, const gchar *filename)
{
+ GSList *buffer_iter = NULL;
guint size = entry-n_children;
guint pos = 0;
+ guint begin = 0;
gint cmp = 0;
while(size)
{
pos = (size / 2);
- cmp = strcmp(filename, entry-children[pos]-filename);
+ cmp = strcmp(filename, entry-children[pos+begin]-filename);
if(!cmp)
- return entry-children[pos];
+ return entry-children[pos+begin];
if(cmp 0)
{
@@ -300,15 +322,26 @@
else
{
size = size - ++pos;
+ begin += pos;
}
}
+
+ for(buffer_iter = entry-buffer; buffer_iter; buffer_iter =
buffer_iter-next)
+ {
+ cmp = strcmp(filename,
((LXAEntry*)buffer_iter-data)-filename);
+
+ if(!cmp)
+ return buffer_iter-data;
+ if(cmp 0)
+ break;
+ }
+
return NULL;
}
void
[Xfce4-commits] r23290 - in xarchiver/branches/xarchiver-psybsd: libxarchiver src
Author: stephan
Date: 2006-10-05 13:44:18 + (Thu, 05 Oct 2006)
New Revision: 23290
Added:
xarchiver/branches/xarchiver-psybsd/libxarchiver/slist.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/slist.h
Modified:
xarchiver/branches/xarchiver-psybsd/libxarchiver/Makefile.am
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.h
xarchiver/branches/xarchiver-psybsd/src/archive_store.c
xarchiver/branches/xarchiver-psybsd/src/main_window.c
Log:
Added custom (not working) treemodel
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/Makefile.am
===
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/Makefile.am
2006-10-05 11:07:34 UTC (rev 23289)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/Makefile.am
2006-10-05 13:44:18 UTC (rev 23290)
@@ -3,6 +3,7 @@
libxarchiver_a_SOURCES =\
libxarchiver.c libxarchiver.h \
internals.c internals.h \
+ slist.c slist.h \
archive.c archive.h \
archive-support.c archive-support.h \
archive-support-zip.c archive-support-zip.h \
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c
===
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c 2006-10-05
11:07:34 UTC (rev 23289)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c 2006-10-05
13:44:18 UTC (rev 23290)
@@ -31,7 +31,7 @@
#include internals.h
-#define LXA_ENTRY_CHILD_BUFFER_SIZE 3
+#define LXA_ENTRY_CHILD_BUFFER_SIZE 300
static void
@@ -266,43 +266,16 @@
gboolean
lxa_entry_add_child(LXAEntry *parent, LXAEntry *child)
{
- gint cmp = 1;
- GSList *buffer_iter = parent-buffer;
- GSList *prev_entry = NULL;
- GSList *new_entry = NULL;
+ parent-buffer = lxa_slist_insert_sorted_single(parent-buffer, child);
- for(; buffer_iter; buffer_iter = buffer_iter-next)
- {
- cmp = strcmp(child-filename,
((LXAEntry*)buffer_iter-data)-filename);
-
- if(!cmp)
- {
- /* TODO: merge same as in flush */
- return;
- }
- if(cmp 0)
- break;
-
- prev_entry = buffer_iter;
- }
-
- new_entry = g_new(GSList, 1);
- new_entry-next = buffer_iter;
- new_entry-data = child;
-
- if(prev_entry)
- prev_entry-next = new_entry;
- else
- parent-buffer = new_entry;
-
- if(g_slist_length(parent-buffer) == LXA_ENTRY_CHILD_BUFFER_SIZE)
+ if(lxa_slist_length(parent-buffer) == LXA_ENTRY_CHILD_BUFFER_SIZE)
lxa_entry_flush_buffer(parent);
}
LXAEntry *
lxa_entry_get_child(LXAEntry *entry, const gchar *filename)
{
- GSList *buffer_iter = NULL;
+ LXASList *buffer_iter = NULL;
guint size = entry-n_children;
guint pos = 0;
guint begin = 0;
@@ -328,10 +301,10 @@
for(buffer_iter = entry-buffer; buffer_iter; buffer_iter =
buffer_iter-next)
{
- cmp = strcmp(filename,
((LXAEntry*)buffer_iter-data)-filename);
+ cmp = strcmp(filename, buffer_iter-entry-filename);
if(!cmp)
- return buffer_iter-data;
+ return buffer_iter-entry;
if(cmp 0)
break;
}
@@ -342,6 +315,9 @@
void
lxa_entry_flush_buffer(LXAEntry *entry)
{
+ if(!entry-buffer)
+ return;
+
guint max_children = 0;
guint begin = 0;
guint pos = 0;
@@ -349,10 +325,10 @@
guint old_i = 0;
guint new_i = 0;
guint size = entry-n_children;
- GSList *buffer_iter = NULL;
+ LXASList *buffer_iter = NULL;
LXAEntry **children_old = (LXAEntry **)entry-children;
- max_children = (entry-n_children + g_slist_length(entry-buffer));
+ max_children = (entry-n_children + lxa_slist_length(entry-buffer));
entry-children = g_new(LXAEntry *, max_children);
for(buffer_iter = entry-buffer;buffer_iter;buffer_iter =
buffer_iter-next)
@@ -362,7 +338,7 @@
{
pos = (size / 2);
- cmp = strcmp(((LXAEntry *)buffer_iter-data)-filename,
children_old[pos+begin]-filename);
+ cmp = strcmp(buffer_iter-entry-filename,
children_old[pos+begin]-filename);
if(!cmp)
break;
@@ -386,7 +362,7 @@
{
entry-children[new_i++] =
children_old[old_i++];
}
- entry-children[new_i++] = buffer_iter-data;
+ entry-children[new_i++] = buffer_iter-entry;
}
[Xfce4-commits] r23292 - xfwm4/trunk/src
Author: olivier
Date: 2006-10-05 21:24:37 + (Thu, 05 Oct 2006)
New Revision: 23292
Modified:
xfwm4/trunk/src/compositor.c
Log:
Improve unredirection vs. map/unmap
Modified: xfwm4/trunk/src/compositor.c
===
--- xfwm4/trunk/src/compositor.c2006-10-05 20:02:00 UTC (rev 23291)
+++ xfwm4/trunk/src/compositor.c2006-10-05 21:24:37 UTC (rev 23292)
@@ -1077,7 +1077,7 @@
display_info = screen_info-display_info;
free_win_data (cw, FALSE);
-cw-ignore_unmaps = 0;
+cw-ignore_unmaps = 1;
cw-redirected = FALSE;
XCompositeUnredirectWindow (display_info-dpy, cw-id,
display_info-composite_mode);
@@ -1749,13 +1749,6 @@
cw-viewable = TRUE;
cw-damaged = FALSE;
-if (cw-ignore_unmaps)
-{
-cw-ignore_unmaps++;
-TRACE (Mapped window 0x%lx had unmaps pending, increased to %i,
cw-id, cw-ignore_unmaps);
-return;
-}
-
screen_info = cw-screen_info;
if (!WIN_IS_REDIRECTED(cw))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23294 - xfwm4/trunk/src
Author: olivier
Date: 2006-10-05 21:28:56 + (Thu, 05 Oct 2006)
New Revision: 23294
Modified:
xfwm4/trunk/src/compositor.c
Log:
Trivial trace message
Modified: xfwm4/trunk/src/compositor.c
===
--- xfwm4/trunk/src/compositor.c2006-10-05 21:26:38 UTC (rev 23293)
+++ xfwm4/trunk/src/compositor.c2006-10-05 21:28:56 UTC (rev 23294)
@@ -1753,7 +1753,7 @@
if (!WIN_IS_REDIRECTED(cw))
{
screen_info-overlays++;
-TRACE (Mapped window 0x%lx, overlays increased to %i, cw-id,
screen_info-overlays);
+TRACE (Mapping unredirected window 0x%lx, overlays increased to %i,
cw-id, screen_info-overlays);
return;
}
if (!screen_info-params-unredirect_overlays)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
