[Xfce4-commits] r23088 - in thunar/trunk: . thunar thunar-vfs
Author: benny
Date: 2006-09-05 01:57:29 + (Tue, 05 Sep 2006)
New Revision: 23088
Modified:
thunar/trunk/ChangeLog
thunar/trunk/thunar-vfs/thunar-vfs-mime-info.c
thunar/trunk/thunar/thunar-icon-factory.c
thunar/trunk/thunar/thunar-properties-dialog.c
Log:
2006-09-05 Benedikt Meurer <[EMAIL PROTECTED]>
* thunar-vfs/thunar-vfs-mime-info.c: Update the icon mime icon lookup
to try icon names from Icon Naming Spec first, and fallback to
legacy GNOME icon names.
* thunar/thunar-icon-factory.c: Use the thumbnail database to load
SVG icons from the icon theme, because loading SVG is quite slow
and takes a lot more memory than loading and scaling PNG icons
from the thumbnail database.
* thunar/thunar-properties-dialog.c(thunar_properties_dialog_init):
Ellipsize the kind label at the end.
* thunar/thunar-properties-dialog.c: No need to keep the "reload"
signal id around.
Modified: thunar/trunk/ChangeLog
===
--- thunar/trunk/ChangeLog 2006-09-04 23:20:54 UTC (rev 23087)
+++ thunar/trunk/ChangeLog 2006-09-05 01:57:29 UTC (rev 23088)
@@ -1,3 +1,17 @@
+2006-09-05 Benedikt Meurer <[EMAIL PROTECTED]>
+
+ * thunar-vfs/thunar-vfs-mime-info.c: Update the icon mime icon lookup
+ to try icon names from Icon Naming Spec first, and fallback to
+ legacy GNOME icon names.
+ * thunar/thunar-icon-factory.c: Use the thumbnail database to load
+ SVG icons from the icon theme, because loading SVG is quite slow
+ and takes a lot more memory than loading and scaling PNG icons
+ from the thumbnail database.
+ * thunar/thunar-properties-dialog.c(thunar_properties_dialog_init):
+ Ellipsize the kind label at the end.
+ * thunar/thunar-properties-dialog.c: No need to keep the "reload"
+ signal id around.
+
2006-09-02 Benedikt Meurer <[EMAIL PROTECTED]>
* configure.in.in: Post-release version bump.
Modified: thunar/trunk/thunar/thunar-icon-factory.c
===
--- thunar/trunk/thunar/thunar-icon-factory.c 2006-09-04 23:20:54 UTC (rev
23087)
+++ thunar/trunk/thunar/thunar-icon-factory.c 2006-09-05 01:57:29 UTC (rev
23088)
@@ -45,7 +45,7 @@
#define THUNAR_ICON_FACTORY_SWEEP_TIMEOUT (30 * 1000)
/* the maximum length of the recently used list */
-#define MAX_RECENTLY (128u)
+#define MAX_RECENTLY (32u)
@@ -237,6 +237,14 @@
/* allocate the hash table for the icon cache */
factory->icon_cache = g_hash_table_new_full (thunar_icon_key_hash,
thunar_icon_key_equal, g_free, g_object_unref);
+
+ /* allocate the thumbnail factory */
+ factory->thumbnail_factory = thunar_vfs_thumb_factory_new
((THUNAR_THUMBNAIL_SIZE > 128)
+?
THUNAR_VFS_THUMB_SIZE_LARGE
+:
THUNAR_VFS_THUMB_SIZE_NORMAL);
+
+ /* setup the thumbnail generator */
+ factory->thumbnail_generator = thunar_thumbnail_generator_new
(factory->thumbnail_factory);
}
@@ -276,12 +284,10 @@
g_hash_table_destroy (factory->icon_cache);
/* disconnect from the thumbnail factory */
- if (G_LIKELY (factory->thumbnail_factory != NULL))
-g_object_unref (G_OBJECT (factory->thumbnail_factory));
+ g_object_unref (G_OBJECT (factory->thumbnail_factory));
/* disconnect from the thumbnail generator */
- if (G_LIKELY (factory->thumbnail_generator != NULL))
-g_object_unref (G_OBJECT (factory->thumbnail_generator));
+ g_object_unref (G_OBJECT (factory->thumbnail_generator));
/* remove the "changed" emission hook from the GtkIconTheme class */
g_signal_remove_emission_hook (g_signal_lookup ("changed",
GTK_TYPE_ICON_THEME), factory->changed_hook_id);
@@ -528,8 +534,14 @@
{
ThunarIconKey lookup_key;
ThunarIconKey *key;
+ ThunarVfsPath *path;
+ ThunarVfsInfo *info;
+ const gchar *filename;
GtkIconInfo *icon_info;
GdkPixbuf *pixbuf = NULL;
+ GdkPixbuf *scaled;
+ GError*err = NULL;
+ gchar *thumbnail;
_thunar_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
_thunar_return_val_if_fail (name != NULL && *name != '\0', NULL);
@@ -545,6 +557,7 @@
/* check if we have to load a file instead of a themed icon */
if (G_UNLIKELY (g_path_is_absolute (name)))
{
+ /* load the file directly */
pixbuf = thunar_icon_factory_load_from_file (factory, name, size);
}
else
@@ -553,8 +566,68 @@
icon_info = gtk_icon_theme_lookup_icon (factory->icon_theme, name,
size, 0);
if (G_LIKELY (icon_info != NULL))
{
- /* try to load the icon returned from the icon theme */
- pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+
[Xfce4-commits] r23087 - libexo/trunk
Author: benny Date: 2006-09-04 23:20:54 + (Mon, 04 Sep 2006) New Revision: 23087 Modified: libexo/trunk/ChangeLog libexo/trunk/configure.in.in Log: 2006-09-05 Benedikt Meurer <[EMAIL PROTECTED]> * configure.in.in: Post-release version bump. Modified: libexo/trunk/ChangeLog === --- libexo/trunk/ChangeLog 2006-09-04 21:02:56 UTC (rev 23086) +++ libexo/trunk/ChangeLog 2006-09-04 23:20:54 UTC (rev 23087) @@ -1,3 +1,7 @@ +2006-09-05 Benedikt Meurer <[EMAIL PROTECTED]> + + * configure.in.in: Post-release version bump. + 2006-09-02 Benedikt Meurer <[EMAIL PROTECTED]> * === Released 0.3.1.10rc1 === Modified: libexo/trunk/configure.in.in === --- libexo/trunk/configure.in.in2006-09-04 21:02:56 UTC (rev 23086) +++ libexo/trunk/configure.in.in2006-09-04 23:20:54 UTC (rev 23087) @@ -13,9 +13,9 @@ m4_define([libexo_version_major], [0]) m4_define([libexo_version_minor], [3]) m4_define([libexo_version_micro], [1]) -m4_define([libexo_version_nano], [10]) +m4_define([libexo_version_nano], [11]) m4_define([libexo_version_build], [EMAIL PROTECTED]@]) -m4_define([libexo_version_tag], [rc1]) +m4_define([libexo_version_tag], [svn]) m4_define([libexo_version], [libexo_version_major().libexo_version_minor().libexo_version_micro()ifelse(libexo_version_nano(), [], [], [.libexo_version_nano()])ifelse(libexo_version_tag(), [svn], [libexo_version_tag()-libexo_version_build()], [libexo_version_tag()])]) dnl ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23086 - libxfcegui4/trunk/libxfcegui4
Author: olivier
Date: 2006-09-04 21:02:56 + (Mon, 04 Sep 2006)
New Revision: 23086
Modified:
libxfcegui4/trunk/libxfcegui4/xfce_clock.c
Log:
Issue a warning instead of silently ignoring fals params
Modified: libxfcegui4/trunk/libxfcegui4/xfce_clock.c
===
--- libxfcegui4/trunk/libxfcegui4/xfce_clock.c 2006-09-04 21:02:55 UTC (rev
23085)
+++ libxfcegui4/trunk/libxfcegui4/xfce_clock.c 2006-09-04 21:02:56 UTC (rev
23086)
@@ -721,13 +721,16 @@
xfce_clock_format_time_to_utf8 (gchar * dest, gsize dst_size,
const gchar * fmt, struct tm *tm)
{
-if (dest == NULL || fmt == NULL || tm == NULL)
-return;
+gchar *dummy;
-gchar *dummy = g_locale_from_utf8 (fmt, -1, NULL, NULL, NULL);
+g_return_if_fail (dest != NULL);
+g_return_if_fail (fmt != NULL);
+g_return_if_fail (tm != NULL);
-strftime (dest, 256, dummy, tm);
+dummy = g_locale_from_utf8 (fmt, -1, NULL, NULL, NULL);
+strftime (dest, (size_t) dst_size, dummy, tm);
g_free (dummy);
+
dummy = g_locale_to_utf8 (dest, -1, NULL, NULL, NULL);
g_strlcpy (dest, dummy, dst_size);
g_free (dummy);
@@ -754,12 +757,11 @@
case XFCE_CLOCK_DIGITAL:
if (clock->show_formatted)
{
-
time_t ticks = time (0);
struct tm *tm = localtime (&ticks);
-xfce_clock_format_time_to_utf8 (buffer, 256,
clock->format_string, tm);
-
+xfce_clock_format_time_to_utf8 (buffer, sizeof(buffer),
+clock->format_string, tm);
}
else if (clock->military_time)
{
@@ -838,13 +840,11 @@
{
width = ln * DIGITS_HUGE_WIDTH;
height = DIGITS_HUGE_HEIGHT;
-
}
else if (clock->led_size == DIGIT_LARGE)
{
width = ln * DIGITS_LARGE_WIDTH;
height = DIGITS_LARGE_HEIGHT;
-
}
else if (clock->led_size == DIGIT_MEDIUM)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23085 - xarchiver/trunk/po
Author: piarres Date: 2006-09-04 21:02:55 + (Mon, 04 Sep 2006) New Revision: 23085 Modified: xarchiver/trunk/po/ChangeLog xarchiver/trunk/po/eu.po Log: Basque translation update for xarchiver Modified: xarchiver/trunk/po/ChangeLog === --- xarchiver/trunk/po/ChangeLog2006-09-04 20:47:18 UTC (rev 23084) +++ xarchiver/trunk/po/ChangeLog2006-09-04 21:02:55 UTC (rev 23085) @@ -1,3 +1,7 @@ +2006-09-05 Piarres Beobide <[EMAIL PROTECTED]> + +* eu.po: Basque translation update. + 2006-09-03 Jean-François Wauthy <[EMAIL PROTECTED]> * pt_BR.po: Updated Brazilian Portuguese translations Modified: xarchiver/trunk/po/eu.po === --- xarchiver/trunk/po/eu.po2006-09-04 20:47:18 UTC (rev 23084) +++ xarchiver/trunk/po/eu.po2006-09-04 21:02:55 UTC (rev 23085) @@ -1,4 +1,4 @@ -# translation of eu.po to librezale +# translation of eu.po to Basque # translation of eu.po to # translation of xfce4-xarchiver-eu.po to # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -7,16 +7,16 @@ # Piarres Beobide <[EMAIL PROTECTED]>, 2006. msgid "" msgstr "" -"Project-Id-Version: xarchiver 0.3.9.2beta2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-01 11:36+0200\n" -"PO-Revision-Date: 2006-08-25 17:24+0200\n" -"Last-Translator: Piarres Beobide <[EMAIL PROTECTED]>\n" -"Language-Team: librezale <[EMAIL PROTECTED]>\n" +"Project-Id-Version: eu\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2006-09-04 23:05+0200\n" +"PO-Revision-Date: 2006-09-04 23:08+0200\n" +"Last-Translator: \n" +"Language-Team: Basque <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Pootle 0.10rc3\n" +"X-Generator: KBabel 1.11.4\n" #: ../src/7zip.c:37 ../src/arj.c:38 ../src/bzip2.c:57 ../src/gzip.c:54 #: ../src/iso.c:677 ../src/rar.c:37 ../src/rpm.c:56 ../src/tar.c:48 @@ -110,16 +110,15 @@ #: ../src/callbacks.c:109 #, c-format msgid "Please check \"%s\" since some files could have been already extracted." -msgstr "" -"Mesedez egiaztatu \"%s\" zenbait fitxategi ateratak izan dira dagoeneko eta." +msgstr "Mesedez egiaztatu \"%s\" zenbait fitxategi ateratak izan dira dagoeneko eta." #: ../src/callbacks.c:128 ../src/callbacks.c:1591 msgid "An error occurred while accessing the archive." msgstr "Errore bat gertatu da paketea atzitzerakoan." #: ../src/callbacks.c:128 ../src/callbacks.c:1591 ../src/rpm.c:152 -msgid "Do you want to open the error messages window?" -msgstr "Errore mezu leihoa ireki nahi al duzu?" +msgid "Do you want to view the command line output?" +msgstr "Komando lerro irteera ikusi nahi al duzu?" #: ../src/callbacks.c:138 ../src/callbacks.c:1274 ../src/callbacks.c:1596 #: ../src/callbacks.c:1815 ../src/extract_dialog.c:873 ../src/rpm.c:120 @@ -265,8 +264,8 @@ msgstr "Ezin da \"%s\" paketea ireki:" #: ../src/callbacks.c:1053 -msgid "Archiver Output Window" -msgstr "Konpresorre Irteera Leihoa" +msgid "Command line output" +msgstr "Komando lerro irteera" #: ../src/callbacks.c:1085 msgid "Doing so will probably corrupt your archive!" @@ -394,23 +393,19 @@ #: ../src/add_dialog.c:207 msgid "0 = no compression, 5 is default, 9 = best compression but slowest" -msgstr "" -"0 = konpresiorik ez, 5 lehenetsia, 9 = konpresio hoberen baina geldoena" +msgstr "0 = konpresiorik ez, 5 lehenetsia, 9 = konpresio hoberen baina geldoena" #: ../src/add_dialog.c:214 msgid "0 = no compression, 6 is default, 9 = best compression but slowest" -msgstr "" -"0 = konpresiorik ez, 6 lehenetsia, 9 = konpresio hoberen baina geldoena" +msgstr "0 = konpresiorik ez, 6 lehenetsia, 9 = konpresio hoberen baina geldoena" #: ../src/add_dialog.c:221 msgid "0 = no compression, 3 is default, 5 = best compression but slowest" -msgstr "" -"0 = konpresiorik ez, 3 lehenetsia, 5 = konpresio hoberen baina geldoena" +msgstr "0 = konpresiorik ez, 3 lehenetsia, 5 = konpresio hoberen baina geldoena" #: ../src/add_dialog.c:228 msgid "0 = no compression, 1 is default, 4 = fastest but least compression." -msgstr "" -"0 = konpresiorik ez, 1 lehenetsia, 4 = azkarren baina konpresio gutxiena" +msgstr "0 = konpresiorik ez, 1 lehenetsia, 4 = azkarren baina konpresio gutxiena" #: ../src/add_dialog.c:237 ../src/extract_dialog.c:215 ../src/interface.c:408 msgid "Password:" @@ -493,10 +488,8 @@ msgstr "Fitxategia bide osoarekin atera" #: ../src/extract_dialog.c:171 -msgid "" -"The archive's directory structure is recreated in the extraction directory." -msgstr "" -"Paketearen direktorio egitura birsortua izango da ateratze direktorioan." +msgid "The archive's directory structure is recreated in the extraction directory." +msgstr "Paketearen direktorio egitura birsortua izango da ateratze direktorioan." #: ../src/extract_dialog.c:176 msgid "Touch files" @@
[Xfce4-commits] r23084 - libxfcegui4/trunk/libxfcegui4
Author: olivier
Date: 2006-09-04 20:47:18 + (Mon, 04 Sep 2006)
New Revision: 23084
Modified:
libxfcegui4/trunk/libxfcegui4/xfce_clock.c
Log:
Clock's format_string was leaked in previous patch
Modified: libxfcegui4/trunk/libxfcegui4/xfce_clock.c
===
--- libxfcegui4/trunk/libxfcegui4/xfce_clock.c 2006-09-04 20:41:19 UTC (rev
23083)
+++ libxfcegui4/trunk/libxfcegui4/xfce_clock.c 2006-09-04 20:47:18 UTC (rev
23084)
@@ -440,6 +440,11 @@
clock = XFCE_CLOCK (object);
+if (clock->format_string != NULL)
+{
+g_free (clock->format_string);
+clock->format_string = NULL;
+}
if (clock->digits_bmap)
{
@@ -706,7 +711,6 @@
clock->format_string = NULL;
}
-clock->format_string = NULL;
if (format != NULL)
{
clock->format_string = g_strdup (format);
@@ -754,8 +758,7 @@
time_t ticks = time (0);
struct tm *tm = localtime (&ticks);
-xfce_clock_format_time_to_utf8 (buffer, 256,
-clock->format_string, tm);
+xfce_clock_format_time_to_utf8 (buffer, 256,
clock->format_string, tm);
}
else if (clock->military_time)
@@ -1085,8 +1088,9 @@
h = 12;
}
-if (clock->show_formatted &&
-clock->format_string != NULL && strlen (clock->format_string) != 0)
+if ((clock->show_formatted) &&
+(clock->format_string != NULL) &&
+(strlen (clock->format_string) != 0))
{
xfce_clock_format_time_to_utf8 (time_buf, sizeof(time_buf),
clock->format_string, tm);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23081 - xfce-mcs-plugins/trunk/plugins/mouse_plugin
Author: olivier
Date: 2006-09-04 19:22:14 + (Mon, 04 Sep 2006)
New Revision: 23081
Modified:
xfce-mcs-plugins/trunk/plugins/mouse_plugin/mouse_plugin.c
Log:
Apply Stephan Arts <[EMAIL PROTECTED]> patch to enable mouse emulation (bug
#1901)
Modified: xfce-mcs-plugins/trunk/plugins/mouse_plugin/mouse_plugin.c
===
--- xfce-mcs-plugins/trunk/plugins/mouse_plugin/mouse_plugin.c 2006-09-04
19:19:40 UTC (rev 23080)
+++ xfce-mcs-plugins/trunk/plugins/mouse_plugin/mouse_plugin.c 2006-09-04
19:22:14 UTC (rev 23081)
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include "mouse-plugin-internal.h"
@@ -57,6 +58,28 @@
#define DEFAULT_ICON_SIZE 48
#define DEFAULT_PTR_MAP_SIZE 128
+static const char * mouse_tray_image_xpm[] = {
+"16 16 3 1",
+" c None",
+". c #00",
+"+ c #FF",
+"",
+" .. ",
+".+.++.+.",
+".+.++.+.",
+" .++.++.++. ",
+" .++.++.++. ",
+" .. ",
+" .. ",
+" .. ",
+" .. ",
+" .. ",
+" .. ",
+" .. ",
+".++.",
+" .. ",
+""};
+
static void create_channel(McsPlugin * mcs_plugin);
static void run_dialog(McsPlugin * mcs_plugin);
@@ -75,6 +98,8 @@
static int mouse_keys_ttm = 200;
static int mouse_keys_max_speed = 200;
static gboolean xkbpresent = FALSE;
+GtkWidget *mouse_tray_icon = NULL;
+GtkWidget *mouse_tray_image = NULL;
#endif
static void get_mouse_values(int *accel_return, int *denom_return, int
*thresh_return)
@@ -221,7 +246,6 @@
void
create_accessx_page(Itf *dialog)
{
-GtkWidget *frame;
GtkWidget *label;
GtkWidget *vbox;
GtkWidget *hbox;
@@ -231,7 +255,7 @@
gtk_widget_show (vbox);
gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
-dialog->checkbutton_mouse = gtk_check_button_new_with_mnemonic(_("Enable
Mouse keys"));
+dialog->checkbutton_mouse = gtk_check_button_new_with_mnemonic(_("Enable
mouse emulation"));
gtk_widget_show(dialog->checkbutton_mouse);
gtk_box_pack_start(GTK_BOX(vbox), dialog->checkbutton_mouse, FALSE, FALSE,
0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(dialog->checkbutton_mouse), mouse_key);
@@ -530,6 +554,28 @@
#ifdef USE_XKB
static void
+cb_mouse_tray_icon_embedded(GtkWidget *tray_icon, gpointer user_data)
+{
+gtk_container_add(GTK_CONTAINER(tray_icon), mouse_tray_image);
+gtk_widget_show_all(tray_icon);
+}
+
+static void
+mouse_tray_icon_reconnect()
+{
+mouse_tray_icon =
netk_tray_icon_new(DefaultScreenOfDisplay(GDK_DISPLAY()));
+g_signal_connect(G_OBJECT(mouse_tray_icon), "embedded",
G_CALLBACK(cb_mouse_tray_icon_embedded), NULL);
+}
+
+static void
+cb_mouse_tray_icon_destroy(GtkWidget *tray_icon, GtkWidget *image)
+{
+gtk_widget_ref(image);
+gtk_container_remove(GTK_CONTAINER(tray_icon), image);
+mouse_tray_icon_reconnect();
+}
+
+static void
toggle_accessx()
{
if (xkbpresent)
@@ -547,9 +593,24 @@
xkb->ctrls->mk_interval = 1000 / mouse_keys_interval;
xkb->ctrls->mk_time_to_max = mouse_keys_ttm;
xkb->ctrls->mk_max_speed = mouse_keys_max_speed;
+
+
if(!mouse_tray_icon)
+ {
+ GdkPixbuf
*pixbuf = gdk_pixbuf_new_from_xpm_data(mouse_tray_image_xpm);
+
mouse_tray_image = gtk_image_new_from_pixbuf(pixbuf);
+mouse_tray_icon =
netk_tray_icon_new(DefaultScreenOfDisplay(GDK_DISPLAY()));
+gtk_container_add(GTK_CONTAINER(mouse_tray_icon),
mouse_tray_image);
+g_signal_connect(G_OBJECT(mouse_tray_icon), "destroy",
G_CALLBACK(cb_mouse_tray_icon_destroy), mouse_tray_image);
+ }
+
if(mouse_tray_icon)
+gtk_widget_show_all(mouse_tray_icon);
}
else
+ {
xkb->ctrls->enabled_ctrls &= ~XkbMouseKeysMask;
+
if(mouse_tray_icon)
+
gtk_widget_hide(mouse_tray_icon);
+}
XkbSetControls (GDK_DISPLAY (), XkbControlsEnabledMask |
XkbMouseKeysMask | XkbMouseKeysAccelMask, xkb);
XFree (xkb);
@@ -579,6 +640,8 @@
mcs_manager_set_int (mcs_plugin->manager, "Mouse/MouseKeysInterval",
CHANNEL2, mouse_keys_interval);
mcs_manager_set_int (mcs_plugin->manager, "Mouse/MouseKeysTimeToMax",
CHANNEL2, mouse_keys_ttm);
mcs_manager_
[Xfce4-commits] r23080 - xfcalendar/trunk/libical/src/libical
Author: juha
Date: 2006-09-04 19:19:40 + (Mon, 04 Sep 2006)
New Revision: 23080
Modified:
xfcalendar/trunk/libical/src/libical/icalduration.c
xfcalendar/trunk/libical/src/libical/icalmime.c
xfcalendar/trunk/libical/src/libical/icalrecur.c
xfcalendar/trunk/libical/src/libical/icalrecur.h
xfcalendar/trunk/libical/src/libical/icaltime.c
xfcalendar/trunk/libical/src/libical/icaltime.h
Log:
Fixes to libical:
1) start of weekday fix. Monday is now default (like the standard says) instead
of Sunday and it can be defined as any day (=WKST now works).
2) minor fixes for string handling here and there
3) monthday processing fix (although orage does not (yet?) allow to define it.
These fixes came from libical SVN, but they were modified a little since we had
some fixes already, which are not in SVN.
Modified: xfcalendar/trunk/libical/src/libical/icalduration.c
===
--- xfcalendar/trunk/libical/src/libical/icalduration.c 2006-09-04 19:18:10 UTC
(rev 23079)
+++ xfcalendar/trunk/libical/src/libical/icalduration.c 2006-09-04 19:19:40 UTC
(rev 23080)
@@ -40,9 +40,11 @@
#include "icalmemory.h"
#include "icalvalue.h"
+#ifdef WIN32
+#define snprintf _snprintf
+#endif
-
/* From Seth Alves, <[EMAIL PROTECTED]> */
struct icaldurationtype icaldurationtype_from_int(int t)
{
@@ -183,14 +185,13 @@
return icaldurationtype_bad_duration();
}
-#define TMP_BUF_SIZE 1024
static
void append_duration_segment(char** buf, char** buf_ptr, size_t* buf_size,
char* sep, unsigned int value) {
-char temp[TMP_BUF_SIZE];
+char temp[32];
-sprintf(temp,"%d",value);
+snprintf(temp,sizeof(temp),"%d",value);
icalmemory_append_string(buf, buf_ptr, buf_size, temp);
icalmemory_append_string(buf, buf_ptr, buf_size, sep);
Modified: xfcalendar/trunk/libical/src/libical/icalmime.c
===
--- xfcalendar/trunk/libical/src/libical/icalmime.c 2006-09-04 19:18:10 UTC
(rev 23079)
+++ xfcalendar/trunk/libical/src/libical/icalmime.c 2006-09-04 19:19:40 UTC
(rev 23080)
@@ -199,7 +199,7 @@
minor = parts[i].header.minor_text;
}
- sprintf(mimetype,"%s/%s",major,minor);
+ snprintf(mimetype,sizeof(mimetype),"%s/%s",major,minor);
comp = icalcomponent_new(ICAL_XLICMIMEPART_COMPONENT);
@@ -209,9 +209,13 @@
}
if(parts[i].header.error!=SSPM_NO_ERROR){
- char *str = NULL;
- char* temp[256];
+ char *str = "Unknown error";
+ char temp[256];
+ if(parts[i].header.error==SSPM_MALFORMED_HEADER_ERROR){
+ str = "Malformed header, possibly due to input not in MIME
format";
+ }
+
if(parts[i].header.error==SSPM_UNEXPECTED_BOUNDARY_ERROR){
str = "Got an unexpected boundary, possibly due to a MIME
header for a MULTIPART part that is missing the Content-Type line";
}
@@ -231,16 +235,16 @@
}
if(parts[i].header.error_text != 0){
- snprintf((char*)temp,256,
+ snprintf(temp,sizeof(temp),
"%s: %s",str,parts[i].header.error_text);
} else {
- strcpy((char*)temp,str);
+ strcpy(temp,str);
}
icalcomponent_add_property
(comp,
icalproperty_vanew_xlicerror(
-(char*)temp,
+temp,
icalparameter_new_xlicerrortype(
ICAL_XLICERRORTYPE_MIMEPARSEERROR),
0));
Modified: xfcalendar/trunk/libical/src/libical/icalrecur.c
===
--- xfcalendar/trunk/libical/src/libical/icalrecur.c2006-09-04 19:18:10 UTC
(rev 23079)
+++ xfcalendar/trunk/libical/src/libical/icalrecur.c2006-09-04 19:19:40 UTC
(rev 23080)
@@ -4,7 +4,7 @@
CREATOR: eric 16 May 2000
$Id$
- $Locker$
+ $Locker: $
(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -19,6 +19,9 @@
The Mozilla Public License Version 1.0. You may obtain a copy of
the License at http://www.mozilla.org/MPL/
+
+2006-09-04 week start day fixes **Juha
+based on CVS code
*/
/**
@@ -138,6 +141,12 @@
#include
#endif
+#ifndef HAVE_INTPTR_T
+#ifdef WIN32
+typedef long intptr_t;
+#endif
+#endif
+
#include "icalrecur.h"
#include "icalerror.h"
@@ -149,6 +158,10 @@
#include
#include /* For offsetof() macro */
+#ifdef WIN32
+#define snprintf _snprintf
+#endif
+
#include "pvl.h"
/** This is the last year we will go up to, since 32-bit time_t values
@@ -300,6 +313,38 @@
}
+/*
+ * Days in the BYDAY rule are expected by the code to be sorted, and while
+ * this may be the common case, the RFC doesn't actually mandate it. This
+ *
[Xfce4-commits] r23079 - in installit/trunk: . tools
Author: jannis
Date: 2006-09-04 19:18:10 + (Mon, 04 Sep 2006)
New Revision: 23079
Modified:
installit/trunk/ChangeLog
installit/trunk/tools/pkgconfig.py
Log:
* tools/pkgconfig.py: Move getCompilerFlags and getLinkerFlags methods
to the correct class.
Modified: installit/trunk/ChangeLog
===
--- installit/trunk/ChangeLog 2006-09-04 19:15:02 UTC (rev 23078)
+++ installit/trunk/ChangeLog 2006-09-04 19:18:10 UTC (rev 23079)
@@ -1,5 +1,10 @@
2006-09-04 Jannis Pohlmann <[EMAIL PROTECTED]>
+ * tools/pkgconfig.py: Move getCompilerFlags and getLinkerFlags methods
+ to the correct class.
+
+2006-09-04 Jannis Pohlmann <[EMAIL PROTECTED]>
+
* components/packages.py, backends/Source.py: Use PkgConfigModule class
properly. Fixes several errors.
Modified: installit/trunk/tools/pkgconfig.py
===
--- installit/trunk/tools/pkgconfig.py 2006-09-04 19:15:02 UTC (rev 23078)
+++ installit/trunk/tools/pkgconfig.py 2006-09-04 19:18:10 UTC (rev 23079)
@@ -29,7 +29,13 @@
self.name = name
self.version = version
+def getCompilerFlags(self):
+return getstatusoutput("pkg-config --cflags %s" % self.name)[1]
+def getLinkerFlags(self):
+return getstatusoutput("pkg-config --libs %s" % self.name)[1]
+
+
class PkgConfigModuleNotFound:
def __init__(self, name, version):
@@ -40,13 +46,7 @@
return _("pkg-config module missing: %(name)s (%(version)s).") \
% {"name": self.name, "version": self.version }
-def getCompilerFlags(self):
-return getstatusoutput("pkg-config --cflags %s" % self.name)[1]
-def getLinkerFlags(self):
-return getstatusoutput("pkg-config --libs %s" % self.name)[1]
-
-
class PkgConfig:
def __call__(self):
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23078 - installit/trunk/components
Author: jannis Date: 2006-09-04 19:15:02 + (Mon, 04 Sep 2006) New Revision: 23078 Modified: installit/trunk/components/packages.py Log: Same commit reason as before. Modified: installit/trunk/components/packages.py === --- installit/trunk/components/packages.py 2006-09-04 19:13:35 UTC (rev 23077) +++ installit/trunk/components/packages.py 2006-09-04 19:15:02 UTC (rev 23078) @@ -130,7 +130,9 @@ results = set() for dep in self.dependencies.libraries: -if not isinstance(dep, Package) and not dep.isResolved(): +if not isinstance(dep, Package) and \ + not isinstance(dep, PkgConfigModule) and \ + not dep.isResolved(): results.add(dep) return results ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23077 - in installit/trunk: . backends components tools
Author: jannis
Date: 2006-09-04 19:13:35 + (Mon, 04 Sep 2006)
New Revision: 23077
Modified:
installit/trunk/ChangeLog
installit/trunk/backends/Source.py
installit/trunk/components/packages.py
installit/trunk/tools/shell.py
Log:
* components/packages.py, backends/Source.py: Use PkgConfigModule class
properly. Fixes several errors.
Modified: installit/trunk/ChangeLog
===
--- installit/trunk/ChangeLog 2006-09-04 19:11:27 UTC (rev 23076)
+++ installit/trunk/ChangeLog 2006-09-04 19:13:35 UTC (rev 23077)
@@ -1,5 +1,10 @@
2006-09-04 Jannis Pohlmann <[EMAIL PROTECTED]>
+ * components/packages.py, backends/Source.py: Use PkgConfigModule class
+ properly. Fixes several errors.
+
+2006-09-04 Jannis Pohlmann <[EMAIL PROTECTED]>
+
* components/packages.py, tools/pkgconfig.py: Add support for pkg-config
--cflags and --libs arguments.
* backends/Source.py: Fix requirements page, which only worked properly
Modified: installit/trunk/backends/Source.py
===
--- installit/trunk/backends/Source.py 2006-09-04 19:11:27 UTC (rev 23076)
+++ installit/trunk/backends/Source.py 2006-09-04 19:13:35 UTC (rev 23077)
@@ -28,6 +28,7 @@
from tools.shell import Command
from tools.env import Environment
+from tools.pkgconfig import PkgConfigModule
from components.mirrors import MirrorList
from components.config import Config
from components.packages import Program, Library, Package
@@ -770,7 +771,9 @@
status.connect("clicked", lambda button:
self._locateLibrary(library))
status.set_relief(gtk.RELIEF_NONE)
-if isinstance(library, Package) or library.isResolved():
+if isinstance(library, Package) or \
+ isinstance(library, PkgConfigModule) or \
+ library.isResolved():
status.set_image(gtk.image_new_from_stock(gtk.STOCK_YES,
gtk.ICON_SIZE_BUTTON))
else:
@@ -789,7 +792,9 @@
label.show()
# Locate manually via file chooser
-if not isinstance(library, Package) and not
library.isResolved():
+if not isinstance(library, Package) and \
+ not isinstance(library, PkgConfigModule) and \
+ not library.isResolved():
button = gtk.Button(_("Locate manually..."))
button.connect("clicked", lambda button:
self._locateLibrary(library))
Modified: installit/trunk/components/packages.py
===
--- installit/trunk/components/packages.py 2006-09-04 19:11:27 UTC (rev
23076)
+++ installit/trunk/components/packages.py 2006-09-04 19:13:35 UTC (rev
23077)
@@ -165,6 +165,8 @@
if isinstance(library, PkgConfigModule):
flags.add(library.getCompilerFlags())
+print flags
+
return " " + " ".join(flags)
def getEnvironmentVars(self):
@@ -605,11 +607,11 @@
pkg = self.getPackage(dep["name"], dep["version"],
package.backend, True)
except PackageNotFoundError, e:
-pkg = Library(dep["name"], dep["version"])
try:
-PkgConfig.resolve(dep["name"], dep["version"])
+pkg = PkgConfig.resolve(dep["name"], dep["version"])
pkg.resolved = True
except PkgConfigModuleNotFound:
+pkg = Library(dep["name"], dep["version"])
if Config.get("UseLibrarySearch"):
if Environment.hasLibrary(library):
pkg.resolved = True
Modified: installit/trunk/tools/shell.py
===
--- installit/trunk/tools/shell.py 2006-09-04 19:11:27 UTC (rev 23076)
+++ installit/trunk/tools/shell.py 2006-09-04 19:13:35 UTC (rev 23077)
@@ -81,6 +81,8 @@
#print "CPPFLAGS=%s" % env["CPPFLAGS"]
#print
+print env["LDFLAGS"]
+
# Start subprocess
process = subprocess.Popen(self.command, bufsize=1, shell=True,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23075 - installit/trunk/components
Author: jannis Date: 2006-09-04 17:54:32 + (Mon, 04 Sep 2006) New Revision: 23075 Modified: installit/trunk/components/packages.py Log: This was missing, too. Modified: installit/trunk/components/packages.py === --- installit/trunk/components/packages.py 2006-09-04 17:52:17 UTC (rev 23074) +++ installit/trunk/components/packages.py 2006-09-04 17:54:32 UTC (rev 23075) @@ -27,7 +27,7 @@ from standards.xdg import BaseDir from tools.logger import Logger from tools.shell import Command -from tools.pkgconfig import PkgConfig, PkgConfigModuleNotFound +from tools.pkgconfig import * from components.config import Config from components.mirrors import MirrorList from components.backends import Backends, BackendNotFoundError, \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23074 - installit/trunk/backends
Author: jannis
Date: 2006-09-04 17:52:17 + (Mon, 04 Sep 2006)
New Revision: 23074
Modified:
installit/trunk/backends/Source.py
Log:
Oops.
Modified: installit/trunk/backends/Source.py
===
--- installit/trunk/backends/Source.py 2006-09-04 17:50:06 UTC (rev 23073)
+++ installit/trunk/backends/Source.py 2006-09-04 17:52:17 UTC (rev 23074)
@@ -800,11 +800,11 @@
i += 1
-#if len(self.programs) == 0 and len(self.libraries) == 0:
-#self.emit("page-success")
+if len(self.programs) == 0 and len(self.libraries) == 0:
+self.emit("page-success")
-#if self.validate():
-#wizard.forwardButton.set_sensitive(True)
+if self.validate():
+wizard.forwardButton.set_sensitive(True)
def validate(self):
# We're done when there are no missing depdendencies left
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23073 - in installit/trunk: . backends components tools
Author: jannis
Date: 2006-09-04 17:50:06 + (Mon, 04 Sep 2006)
New Revision: 23073
Modified:
installit/trunk/ChangeLog
installit/trunk/backends/Source.py
installit/trunk/components/packages.py
installit/trunk/tools/env.py
installit/trunk/tools/pkgconfig.py
Log:
* components/packages.py, tools/pkgconfig.py: Add support for pkg-config
--cflags and --libs arguments.
* backends/Source.py: Fix requirements page, which only worked properly
the first time - on next "activate" call, it completely removed all
dependencies from the package (I'm still not sure why, but it's
fixed).
* tools/env.py: Fix typo. It has to be "-Wl", not "-W1".
Modified: installit/trunk/ChangeLog
===
--- installit/trunk/ChangeLog 2006-09-04 12:39:37 UTC (rev 23072)
+++ installit/trunk/ChangeLog 2006-09-04 17:50:06 UTC (rev 23073)
@@ -1,5 +1,15 @@
2006-09-04 Jannis Pohlmann <[EMAIL PROTECTED]>
+ * components/packages.py, tools/pkgconfig.py: Add support for pkg-config
+ --cflags and --libs arguments.
+ * backends/Source.py: Fix requirements page, which only worked properly
+ the first time - on next "activate" call, it completely removed all
+ dependencies from the package (I'm still not sure why, but it's
+ fixed).
+ * tools/env.py: Fix typo. It has to be "-Wl", not "-W1".
+
+2006-09-04 Jannis Pohlmann <[EMAIL PROTECTED]>
+
* examples/packages.list, examples/Packages/*.*: Added the first bunch
of Xfce 4.4 RC1 packages. To be continued ...
* setup.py: Use Environment.hasLibtool for detecting libtool in $PATH.
Modified: installit/trunk/backends/Source.py
===
--- installit/trunk/backends/Source.py 2006-09-04 12:39:37 UTC (rev 23072)
+++ installit/trunk/backends/Source.py 2006-09-04 17:50:06 UTC (rev 23073)
@@ -30,7 +30,7 @@
from tools.env import Environment
from components.mirrors import MirrorList
from components.config import Config
-from components.packages import Program, Library
+from components.packages import Program, Library, Package
from ui.installation import BackendInstallationWizard, \
BackendDeinstallationWizard
from ui.extensions import showMessage, forceRefresh
@@ -679,8 +679,6 @@
self.box.add(container)
container.show()
-self.programs.clear()
-self.libraries.clear()
self.locations.clear()
self.statusButtons.clear()
@@ -772,7 +770,7 @@
status.connect("clicked", lambda button:
self._locateLibrary(library))
status.set_relief(gtk.RELIEF_NONE)
-if library.isResolved():
+if isinstance(library, Package) or library.isResolved():
status.set_image(gtk.image_new_from_stock(gtk.STOCK_YES,
gtk.ICON_SIZE_BUTTON))
else:
@@ -791,7 +789,7 @@
label.show()
# Locate manually via file chooser
-if not library.isResolved():
+if not isinstance(library, Package) and not
library.isResolved():
button = gtk.Button(_("Locate manually..."))
button.connect("clicked", lambda button:
self._locateLibrary(library))
@@ -802,11 +800,11 @@
i += 1
-if len(self.programs) == 0 and len(self.libraries) == 0:
-self.emit("page-success")
+#if len(self.programs) == 0 and len(self.libraries) == 0:
+#self.emit("page-success")
-if self.validate():
-wizard.forwardButton.set_sensitive(True)
+#if self.validate():
+#wizard.forwardButton.set_sensitive(True)
def validate(self):
# We're done when there are no missing depdendencies left
Modified: installit/trunk/components/packages.py
===
--- installit/trunk/components/packages.py 2006-09-04 12:39:37 UTC (rev
23072)
+++ installit/trunk/components/packages.py 2006-09-04 17:50:06 UTC (rev
23073)
@@ -130,7 +130,7 @@
results = set()
for dep in self.dependencies.libraries:
-if not dep.isResolved():
+if not isinstance(dep, Package) and not dep.isResolved():
results.add(dep)
return results
@@ -147,17 +147,26 @@
flags = set()
for library in self.dependencies.libraries:
-if library.path:
-flags.add("-L%s" % library.path)
+if isinstance(library, PkgConfigModule):
+flags.add(library.getLinkerFlags())
+elif isinstance(library, Library):
+if library.path:
+flags.add("-L%s" % l
[Xfce4-commits] r23072 - in xarchiver/trunk: . po src
Author: colossus Date: 2006-09-04 12:39:37 + (Mon, 04 Sep 2006) New Revision: 23072 Modified: xarchiver/trunk/TODO xarchiver/trunk/po/xarchiver.pot xarchiver/trunk/src/callbacks.c xarchiver/trunk/src/interface.c xarchiver/trunk/src/rar.c xarchiver/trunk/src/rpm.c xarchiver/trunk/src/zip.c Log: Changed some strings in the program for better usability. Updated xarchiver.pot. Updated TODO. Modified: xarchiver/trunk/TODO === --- xarchiver/trunk/TODO2006-09-04 09:52:56 UTC (rev 23071) +++ xarchiver/trunk/TODO2006-09-04 12:39:37 UTC (rev 23072) @@ -1,6 +1,4 @@ - fix bug #1736, #2176, #2247. -- change CRC with Checksum in rar.c and zip.c -- change Bytes to bytes in callbacks.c - have a GTK_STOCK_DIRECTORY for directories and GTK_STOCK_FILE for files in the rows before the filename. - allow switching by right click on the toolbar to icons with text/ no text/ small icons. - add a small progress window when using Xarchiver cmd-line switches. @@ -10,3 +8,5 @@ - support tar on *BSD. - to remove StriPathFromFilename() - avoid reset of extract dialog options when loading a new archive. +- fix view and delete when filename contains [] in zip archives. +- fix creation of filename with "\ " when extracting an iso whose filename has spaces. Modified: xarchiver/trunk/po/xarchiver.pot === --- xarchiver/trunk/po/xarchiver.pot2006-09-04 09:52:56 UTC (rev 23071) +++ xarchiver/trunk/po/xarchiver.pot2006-09-04 12:39:37 UTC (rev 23072) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-01 11:36+0200\n" +"POT-Creation-Date: 2006-09-04 14:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n" "Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n" @@ -16,925 +16,882 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/7zip.c:37 ../src/arj.c:38 ../src/bzip2.c:57 ../src/gzip.c:54 -#: ../src/iso.c:677 ../src/rar.c:37 ../src/rpm.c:56 ../src/tar.c:48 -#: ../src/zip.c:37 +#: src/7zip.c:37 src/arj.c:38 src/bzip2.c:57 src/gzip.c:54 src/iso.c:677 +#: src/rar.c:37 src/rpm.c:56 src/tar.c:48 src/zip.c:37 msgid "Filename" msgstr "" -#: ../src/7zip.c:37 ../src/arj.c:38 ../src/rar.c:37 ../src/zip.c:37 +#: src/7zip.c:37 src/arj.c:38 src/rar.c:37 src/zip.c:37 msgid "Original" msgstr "" -#: ../src/7zip.c:37 ../src/arj.c:38 ../src/rar.c:37 ../src/zip.c:37 +#: src/7zip.c:37 src/arj.c:38 src/rar.c:37 src/zip.c:37 msgid "Compressed" msgstr "" -#: ../src/7zip.c:37 +#: src/7zip.c:37 msgid "Attr" msgstr "" -#: ../src/7zip.c:37 ../src/arj.c:38 ../src/bzip2.c:57 ../src/gzip.c:54 -#: ../src/rar.c:37 ../src/tar.c:48 ../src/zip.c:37 +#: src/7zip.c:37 src/arj.c:38 src/bzip2.c:57 src/gzip.c:54 src/rar.c:37 +#: src/tar.c:48 src/zip.c:37 msgid "Time" msgstr "" -#: ../src/7zip.c:37 ../src/arj.c:38 ../src/bzip2.c:57 ../src/gzip.c:54 -#: ../src/iso.c:677 ../src/rar.c:37 ../src/tar.c:48 ../src/zip.c:37 +#: src/7zip.c:37 src/arj.c:38 src/bzip2.c:57 src/gzip.c:54 src/iso.c:677 +#: src/rar.c:37 src/tar.c:48 src/zip.c:37 msgid "Date" msgstr "" -#: ../src/arj.c:38 ../src/rar.c:37 ../src/zip.c:37 +#: src/arj.c:38 src/rar.c:37 src/zip.c:37 msgid "Ratio" msgstr "" -#: ../src/arj.c:38 +#: src/arj.c:38 msgid "Attributes" msgstr "" -#: ../src/arj.c:38 +#: src/arj.c:38 msgid "GUA" msgstr "" -#: ../src/arj.c:38 +#: src/arj.c:38 msgid "BPMGS" msgstr "" -#: ../src/archive.c:68 +#: src/archive.c:68 msgid "Can't run the archiver executable:" msgstr "" -#: ../src/bzip2.c:57 ../src/gzip.c:54 ../src/rar.c:37 ../src/tar.c:48 +#: src/bzip2.c:57 src/gzip.c:54 src/rar.c:37 src/tar.c:48 msgid "Permissions" msgstr "" -#: ../src/bzip2.c:57 ../src/gzip.c:54 ../src/rpm.c:56 ../src/tar.c:48 +#: src/bzip2.c:57 src/gzip.c:54 src/rpm.c:56 src/tar.c:48 msgid "Symbolic Link" msgstr "" -#: ../src/bzip2.c:57 ../src/gzip.c:54 ../src/tar.c:48 +#: src/bzip2.c:57 src/gzip.c:54 src/tar.c:48 msgid "Owner/Group" msgstr "" -#: ../src/bzip2.c:57 ../src/gzip.c:54 ../src/iso.c:677 ../src/rpm.c:56 -#: ../src/tar.c:48 +#: src/bzip2.c:57 src/gzip.c:54 src/iso.c:677 src/rpm.c:56 src/tar.c:48 msgid "Size" msgstr "" -#: ../src/bzip2.c:87 +#: src/bzip2.c:87 #, c-format msgid "Extracting gzip file to %s" msgstr "" -#: ../src/bzip2.c:89 +#: src/bzip2.c:89 #, c-format msgid "Extracting bzip2 file to %s" msgstr "" -#: ../src/bzip2.c:146 ../src/callbacks.c:106 ../src/extract_dialog.c:305 +#: src/bzip2.c:146 src/callbacks.c:106 src/extract_dialog.c:305 msgid "Operation canceled." msgstr "" -#: ../src/bzip2.c:160 +#: src/bzip2.c:160 #, c-format msgid "Decompressing tar file with %s, please wait..." msgstr "" -#: ../src/bzip2.c:235 +#: src/bzip2.c:235 #, c-format msgid "Recompressing tar file with %s,
[Xfce4-commits] r23071 - in installit/trunk: . examples examples/Packages
Author: jannis Date: 2006-09-04 09:52:56 + (Mon, 04 Sep 2006) New Revision: 23071 Added: installit/trunk/examples/Packages/exo-0.3.1.10rc1 installit/trunk/examples/Packages/gtk-xfce-engine-2.3.99.1 installit/trunk/examples/Packages/libxfce4mcs-4.3.99.1 installit/trunk/examples/Packages/libxfce4util-4.3.99.1 installit/trunk/examples/Packages/libxfcegui4-4.3.99.1 installit/trunk/examples/Packages/mousepad-0.2.8 installit/trunk/examples/Packages/orage-4.3.99.1 installit/trunk/examples/Packages/thunar-0.4.0rc1 installit/trunk/examples/Packages/xfce-mcs-manager-4.3.99.1 installit/trunk/examples/Packages/xfce-mcs-plugins-4.3.99.1 installit/trunk/examples/Packages/xfce-utils-4.3.99.1 installit/trunk/examples/Packages/xfce4-dev-tools-4.3.99.1 installit/trunk/examples/Packages/xfce4-panel-4.3.99.1 installit/trunk/examples/Packages/xfce4-session-4.3.99.1 installit/trunk/examples/packages.list Removed: installit/trunk/examples/Packages/exo-0.3.1.6beta1 installit/trunk/examples/Packages/libxfce4mcs-4.3.90.1 installit/trunk/examples/Packages/libxfce4util-4.3.90.1 installit/trunk/examples/Packages/libxfcegui4-4.3.90.1 installit/trunk/examples/Packages/xfce-mcs-manager-4.3.90.1 installit/trunk/examples/Packages/xfce4-dev-tools-4.3.90.1 Modified: installit/trunk/ChangeLog installit/trunk/setup.py Log: * examples/packages.list, examples/Packages/*.*: Added the first bunch of Xfce 4.4 RC1 packages. To be continued ... * setup.py: Use Environment.hasLibtool for detecting libtool in $PATH. Modified: installit/trunk/ChangeLog === --- installit/trunk/ChangeLog 2006-09-04 08:52:53 UTC (rev 23070) +++ installit/trunk/ChangeLog 2006-09-04 09:52:56 UTC (rev 23071) @@ -1,3 +1,9 @@ +2006-09-04 Jannis Pohlmann <[EMAIL PROTECTED]> + + * examples/packages.list, examples/Packages/*.*: Added the first bunch + of Xfce 4.4 RC1 packages. To be continued ... + * setup.py: Use Environment.hasLibtool for detecting libtool in $PATH. + 2006-09-03 Jannis Pohlmann <[EMAIL PROTECTED]> * tools/pkgconfig.py: Add i18n support. Added: installit/trunk/examples/Packages/exo-0.3.1.10rc1 === --- installit/trunk/examples/Packages/exo-0.3.1.10rc1 (rev 0) +++ installit/trunk/examples/Packages/exo-0.3.1.10rc1 2006-09-04 09:52:56 UTC (rev 23071) @@ -0,0 +1,67 @@ + + +http://installit.xfce.org/dtd/package/1.0";> + + + exo + 0.3.1.10rc1 + Source + + exo + Xfce 4.4 RC1 + LGPL + Benedikt Meurer ([EMAIL PROTECTED]) + http://xfce.org + Xfce extensions library + + Jannis Pohlmann + + + + + + + + + + + + + exo-0.3.1.10rc1.tar.bz2 + exo-0.3.1.10rc1 + + + + + Generate Xfce API documentation + + + + Build exo bindings for the Python scripting language + + + + Enable debug signals + + + + Property changes on: installit/trunk/examples/Packages/exo-0.3.1.10rc1 ___ Name: svn:keywords + Id Author Date Revision Deleted: installit/trunk/examples/Packages/exo-0.3.1.6beta1 Added: installit/trunk/examples/Packages/gtk-xfce-engine-2.3.99.1 === --- installit/trunk/examples/Packages/gtk-xfce-engine-2.3.99.1 (rev 0) +++ installit/trunk/examples/Packages/gtk-xfce-engine-2.3.99.1 2006-09-04 09:52:56 UTC (rev 23071) @@ -0,0 +1,48 @@ + + +http://installit.xfce.org/dtd/package/1.0";> + + + gtk-xfce-engine + 2.3.99.1 + Source + + gtk-xfce-engine + Xfce 4.4 RC1 + GPL + Olivier Fourdan ([EMAIL PROTECTED]) + http://xfce.org + Xfce theme engine for GTK+ + + Jannis Pohlmann + + + + + + + + + gtk-xfce-engine-2.3.99.1.tar.bz2 + gtk-xfce-engine-2.3.99.1 + + Property changes on: installit/trunk/examples/Packages/gtk-xfce-engine-2.3.99.1 ___ Name: svn:keywords + Id Author Date Revision Deleted: installit/trunk/examples/Packages/libxfce4mcs-4.3.90.1 Added: installit/trunk/examples/Packages/libxfce4mcs-4.3.99.1 === --- installit/trunk/examples/Packages/libxfce4mcs-4.3.99.1 (rev 0) +++ installit/trunk/examples/Packages/libxfce4mcs-4.3.99.1 2006-09-04 09:52:56 UTC (rev 23071) @@ -0,0 +1,65 @@ + + +http://installit.xfce.org/dtd/package/1.0";> + + + libxfce4mcs + 4.3.99.1 + Source + + libxfce4mcs + Xfce 4.4 RC1 + LGPL + Benedikt Meurer ([EMAIL PROTECTED]), Jasper Huijsmans ([EMAIL PROTECTED]), Olivier Fourdan ([EMAIL PROTECTED]) + http://xfce.org + Xfce settings manager library + + Jannis Pohlmann + + + + + +
[Xfce4-commits] r23070 - in xarchiver/trunk: . po
Author: colossus Date: 2006-09-04 08:52:53 + (Mon, 04 Sep 2006) New Revision: 23070 Modified: xarchiver/trunk/TODO xarchiver/trunk/po/fr.po Log: Updated french translation and TODO file. Modified: xarchiver/trunk/TODO === --- xarchiver/trunk/TODO2006-09-03 23:19:48 UTC (rev 23069) +++ xarchiver/trunk/TODO2006-09-04 08:52:53 UTC (rev 23070) @@ -8,4 +8,5 @@ - better handling of current installed archivers. - loading and saving of add/extraction options and window size. - support tar on *BSD. -- to remove StriPathFromFilename. +- to remove StriPathFromFilename() +- avoid reset of extract dialog options when loading a new archive. Modified: xarchiver/trunk/po/fr.po === --- xarchiver/trunk/po/fr.po2006-09-03 23:19:48 UTC (rev 23069) +++ xarchiver/trunk/po/fr.po2006-09-04 08:52:53 UTC (rev 23070) @@ -1,31 +1,44 @@ # xarchiver french translation. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2006 THE xarchiver'S COPYRIGHT HOLDER # This file is distributed under the same license as the xarchiver package. # Maximilian Schleiss <[EMAIL PROTECTED]>, 2006. +# Gérald Barré <[EMAIL PROTECTED]>, 2006. # msgid "" msgstr "" "Project-Id-Version: xarchiver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-01 11:36+0200\n" -"PO-Revision-Date: 2006-07-28 11:35+0100\n" +"PO-Revision-Date: 2006-09-03 23:02+0100\n" "Last-Translator: Maximilian Schleiss <[EMAIL PROTECTED]>\n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/7zip.c:37 ../src/arj.c:38 ../src/bzip2.c:57 ../src/gzip.c:54 -#: ../src/iso.c:677 ../src/rar.c:37 ../src/rpm.c:56 ../src/tar.c:48 +#: ../src/7zip.c:37 +#: ../src/arj.c:38 +#: ../src/bzip2.c:57 +#: ../src/gzip.c:54 +#: ../src/iso.c:677 +#: ../src/rar.c:37 +#: ../src/rpm.c:56 +#: ../src/tar.c:48 #: ../src/zip.c:37 msgid "Filename" msgstr "Nom de fichier" -#: ../src/7zip.c:37 ../src/arj.c:38 ../src/rar.c:37 ../src/zip.c:37 +#: ../src/7zip.c:37 +#: ../src/arj.c:38 +#: ../src/rar.c:37 +#: ../src/zip.c:37 msgid "Original" msgstr "Original" -#: ../src/7zip.c:37 ../src/arj.c:38 ../src/rar.c:37 ../src/zip.c:37 +#: ../src/7zip.c:37 +#: ../src/arj.c:38 +#: ../src/rar.c:37 +#: ../src/zip.c:37 msgid "Compressed" msgstr "Compressé" @@ -33,17 +46,30 @@ msgid "Attr" msgstr "Attr." -#: ../src/7zip.c:37 ../src/arj.c:38 ../src/bzip2.c:57 ../src/gzip.c:54 -#: ../src/rar.c:37 ../src/tar.c:48 ../src/zip.c:37 +#: ../src/7zip.c:37 +#: ../src/arj.c:38 +#: ../src/bzip2.c:57 +#: ../src/gzip.c:54 +#: ../src/rar.c:37 +#: ../src/tar.c:48 +#: ../src/zip.c:37 msgid "Time" msgstr "Temps" -#: ../src/7zip.c:37 ../src/arj.c:38 ../src/bzip2.c:57 ../src/gzip.c:54 -#: ../src/iso.c:677 ../src/rar.c:37 ../src/tar.c:48 ../src/zip.c:37 +#: ../src/7zip.c:37 +#: ../src/arj.c:38 +#: ../src/bzip2.c:57 +#: ../src/gzip.c:54 +#: ../src/iso.c:677 +#: ../src/rar.c:37 +#: ../src/tar.c:48 +#: ../src/zip.c:37 msgid "Date" msgstr "Date" -#: ../src/arj.c:38 ../src/rar.c:37 ../src/zip.c:37 +#: ../src/arj.c:38 +#: ../src/rar.c:37 +#: ../src/zip.c:37 msgid "Ratio" msgstr "Ratio" @@ -60,23 +86,33 @@ msgstr "BPMGS" #: ../src/archive.c:68 -#, fuzzy msgid "Can't run the archiver executable:" -msgstr "Échec à la décompression de l'archive:" +msgstr "Échec à l'exécution d'archiver :" -#: ../src/bzip2.c:57 ../src/gzip.c:54 ../src/rar.c:37 ../src/tar.c:48 +#: ../src/bzip2.c:57 +#: ../src/gzip.c:54 +#: ../src/rar.c:37 +#: ../src/tar.c:48 msgid "Permissions" msgstr "Permissions" -#: ../src/bzip2.c:57 ../src/gzip.c:54 ../src/rpm.c:56 ../src/tar.c:48 +#: ../src/bzip2.c:57 +#: ../src/gzip.c:54 +#: ../src/rpm.c:56 +#: ../src/tar.c:48 msgid "Symbolic Link" msgstr "Lien symbolique" -#: ../src/bzip2.c:57 ../src/gzip.c:54 ../src/tar.c:48 +#: ../src/bzip2.c:57 +#: ../src/gzip.c:54 +#: ../src/tar.c:48 msgid "Owner/Group" msgstr "Propriétaire/Groupe" -#: ../src/bzip2.c:57 ../src/gzip.c:54 ../src/iso.c:677 ../src/rpm.c:56 +#: ../src/bzip2.c:57 +#: ../src/gzip.c:54 +#: ../src/iso.c:677 +#: ../src/rpm.c:56 #: ../src/tar.c:48 msgid "Size" msgstr "Taille" @@ -91,7 +127,9 @@ msgid "Extracting bzip2 file to %s" msgstr "Extraction du fichier bzip2 vers %s" -#: ../src/bzip2.c:146 ../src/callbacks.c:106 ../src/extract_dialog.c:305 +#: ../src/bzip2.c:146 +#: ../src/callbacks.c:106 +#: ../src/extract_dialog.c:305 msgid "Operation canceled." msgstr "Opération annulée." @@ -110,22 +148,33 @@ msgid "Please check \"%s\" since some files could have been already extracted." msgstr "Vérifier \"%s\" car certains fichiers auraient pu être déjà extraits." -#: ../src/callbacks.c:128 ../src/callbacks.c:1591 +#: ../src/callbacks.c:128 +#: ../src/callbacks.c:1591 msgid "An error occurred while accessing the archive." msgstr "Une erreur s'est produite
