[Xfce4-commits] r26830 - xfce-utils/trunk/xfce4-about
Author: pollux Date: 2008-04-12 18:00:33 + (Sat, 12 Apr 2008) New Revision: 26830 Added: xfce-utils/trunk/xfce4-about/INFO.de Modified: xfce-utils/trunk/xfce4-about/Makefile.am Log: add German translation of INFO by Enrico Tr?\195?\182ger [EMAIL PROTECTED] Added: xfce-utils/trunk/xfce4-about/INFO.de === --- xfce-utils/trunk/xfce4-about/INFO.de(rev 0) +++ xfce-utils/trunk/xfce4-about/INFO.de2008-04-12 18:00:33 UTC (rev 26830) @@ -0,0 +1,44 @@ +Xfce 4 Desktopumgebung +Version @VERSION@ + +Xfce ist eine Sammlung von Programmen, die zusammen eine vollständige +Desktopumgebung bilden. Die folgenden Programme sind Teil von Xfce: + +o Fenstermanager (xfwm4) + Kümmert sich um die Platzierung und Verwaltung von Fenstern auf + dem Bildschirm. + +o Programmleiste (xfce4-panel) + Programmstarter, Popupmenüs, Uhr, Arbeitsflächenumschalter und mehr. + +o Desktopmanager (xfdesktop) + Setzt eine Hintergrundfarbe oder ein Hintergrundbild für die + Arbeitsoberfläche und bietet ein Programmmenü bei Klick auf + die Arbeitsoberfläche. + +o Dateimanager (thunar) + Ein schneller Dateimanager. + +o Sitzungsmanager (xfce4-session) + Stellt die letzte Sitzung beim Start wieder her und ermöglicht es, den + Computer aus Xfce heraus herunterzufahren. + +o Hilfsprogramme + xfprint4:Kann Dateien ausdrucken. + xfrun4: Führt Programme aus. + + +Xfce 4 ist auch eine Entwicklungsplattform, die einige Bibliotheken bietet, +um Entwicklern zu helfen passende Anwendungen für die Desktopumgebung zu +schreiben. + +Xfce 4 Komponenten sind unter freien oder Open-Source Lizenzen veröffentlicht. +Die GPL oder BSD-Lizenz für Programme, die LGPL oder BSD-Lizenz für Bibliotheken. +Konsultieren Sie die Dokumentation, den Quellcode oder die Xfce Webseite +(http://www.xfce.org), um mehr Information zu erhalten. + + +Vielen Dank für das Interesse an Xfce. + +-- Das Xfce-Entwicklerteam -- + Modified: xfce-utils/trunk/xfce4-about/Makefile.am === --- xfce-utils/trunk/xfce4-about/Makefile.am2008-04-12 17:28:50 UTC (rev 26829) +++ xfce-utils/trunk/xfce4-about/Makefile.am2008-04-12 18:00:33 UTC (rev 26830) @@ -7,6 +7,7 @@ GPL \ INFO\ INFO.ca \ + INFO.de \ INFO.es \ INFO.fi \ INFO.fr \ @@ -15,7 +16,7 @@ INFO.ru \ INFO.uk \ INFO.vi \ - LGPL + LGPL bin_PROGRAMS = xfce4-about ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26809 - in modules: . trunk-doc
Author: pollux Date: 2008-04-09 13:46:09 + (Wed, 09 Apr 2008) New Revision: 26809 Added: modules/trunk-doc/ Log: first quick trial of a trunk-doc module Property changes on: modules/trunk-doc ___ Name: svn:externals + xfwm4/doc http://svn.xfce.org/svn/xfce/xfwm4/trunk/doc xfcalender/doc http://svn.xfce.org/svn/xfce/xfcalendar/trunk/doc xfce-mcs-plugins/doc http://svn.xfce.org/svn/xfce/xfce-mcs-plugins/trunk/doc xfce4-session/doc http://svn.xfce.org/svn/xfce/xfce4-session/trunk/doc xfce-utils/doc http://svn.xfce.org/svn/xfce/xfce-utils/trunk/doc libexo/docs http://svn.xfce.org/svn/xfce/libexo/trunk/docs xfmedia/doc http://svn.xfce.org/svn/xfce/xfmedia/trunk/doc libxfcegui4/docs http://svn.xfce.org/svn/xfce/libxfcegui4/trunk/docs xarchiver/doc http://svn.xfce.org/svn/xfce/xarchiver/trunk/doc xfdesktop/doc http://svn.xfce.org/svn/xfce/xfdesktop/trunk/doc libxfce4util/docs http://svn.xfce.org/svn/xfce/libxfce4util/trunk/docs libxfce4menu/docs http://svn.xfce.org/svn/xfce/libxfce4menu/trunk/docs terminal/doc http://svn.xfce.org/svn/xfce/terminal/trunk/doc xfce4-panel/docs http://svn.xfce.org/svn/xfce/xfce4-panel/trunk/docs thunar/docs http://svn.xfce.org/svn/xfce/thunar/trunk/docs libxfce4mcs/docs http://svn.xfce.org/svn/xfce/libxfce4mcs/trunk/docs xfce-mcs-manager/doc http://svn.xfce.org/svn/xfce/xfce-mcs-manager/trunk/doc xfprint/doc http://svn.xfce.org/svn/xfce/xfprint/trunk/doc ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26695 - /
Author: pollux Date: 2008-03-30 15:33:36 + (Sun, 30 Mar 2008) New Revision: 26695 Removed: xfburn/ Log: Xfburn has been moved to the Goodies repository ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26679 - in xfburn/trunk: . xfburn
Author: pollux Date: 2008-03-14 19:12:01 + (Fri, 14 Mar 2008) New Revision: 26679 Modified: xfburn/trunk/configure.in.in xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.h xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.h xfburn/trunk/xfburn/xfburn-data-composition.c Log: Updating libisofs support to 0.6.2 (patch by David Mohr) Modified: xfburn/trunk/configure.in.in === --- xfburn/trunk/configure.in.in2008-03-12 21:35:19 UTC (rev 26678) +++ xfburn/trunk/configure.in.in2008-03-14 19:12:01 UTC (rev 26679) @@ -9,7 +9,7 @@ m4_define([xfburn_version], [xfburn_version_major().xfburn_version_minor().xfburn_version_micro()ifelse(xfburn_version_tag(), [svn], [xfburn_version_tag()-xfburn_version_build()], [xfburn_version_tag()])]) dnl Initialize autoconf -AC_COPYRIGHT([Copyright (c) 2005-2007 Jean-François Wauthy [EMAIL PROTECTED]]) +AC_COPYRIGHT([Copyright (c) 2005-2008 Jean-François Wauthy [EMAIL PROTECTED]]) AC_INIT([xfburn], [xfburn_version], [EMAIL PROTECTED]) dnl Initialize automake @@ -30,7 +30,7 @@ dnl check for required packages XDT_CHECK_PACKAGE([LIBBURN], [libburn-1], [0.3.0]) -XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.2.8]) +XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.6.2]) XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) Modified: xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c === --- xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c 2008-03-12 21:35:19 UTC (rev 26678) +++ xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c 2008-03-14 19:12:01 UTC (rev 26679) @@ -44,7 +44,7 @@ typedef struct { - struct iso_volset * volume_set; + IsoImage *image; GtkWidget *frame_device; GtkWidget *device_box; @@ -60,7 +60,7 @@ enum { PROP_0, - PROP_VOLUME_SET, + PROP_IMAGE }; /* prototypes */ @@ -116,8 +116,8 @@ object_class-set_property = xfburn_burn_data_cd_composition_dialog_set_property; /* properties */ - g_object_class_install_property (object_class, PROP_VOLUME_SET, - g_param_spec_pointer (volume-set, Volume Set, Volume Set, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); + g_object_class_install_property (object_class, PROP_IMAGE, + g_param_spec_pointer (image, Image, Image, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); } static void @@ -225,8 +225,8 @@ XfburnBurnDataCdCompositionDialogPrivate *priv = XFBURN_BURN_DATA_CD_COMPOSITION_DIALOG_GET_PRIVATE (object); switch (prop_id) { - case PROP_VOLUME_SET: -g_value_set_pointer (value, priv-volume_set); + case PROP_IMAGE: +g_value_set_pointer (value, priv-image); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -240,8 +240,8 @@ XfburnBurnDataCdCompositionDialogPrivate *priv = XFBURN_BURN_DATA_CD_COMPOSITION_DIALOG_GET_PRIVATE (object); switch (prop_id) { - case PROP_VOLUME_SET: -priv-volume_set = g_value_get_pointer (value); + case PROP_IMAGE: +priv-image = g_value_get_pointer (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -254,7 +254,7 @@ { XfburnBurnDataCdCompositionDialogPrivate *priv = XFBURN_BURN_DATA_CD_COMPOSITION_DIALOG_GET_PRIVATE (object); - iso_volset_free (priv-volume_set); + iso_image_unref (priv-image); G_OBJECT_CLASS (parent_class)-finalize (object); } @@ -315,7 +315,8 @@ xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Writing ISO...)); size = (glong) params-src-get_size (params-src); - while (params-src-read (params-src, buf, 2048) == 2048) { + /* FIXME: is size really always 2048? */ + while (params-src-read_xt (params-src, buf, 2048) == 2048) { if (write (fd, buf, 2048) 2048) { /* an error occured while writing */ gchar err[256]; @@ -545,19 +546,20 @@ GtkWidget *dialog_progress; struct burn_source * src = NULL; -struct ecma119_source_opts src_opts = {}; +IsoWriteOpts *write_opts; -src_opts.volnum = 0; -src_opts.level = 2; -src_opts.flags = ECMA119_JOLIET; +/* Sets profile 2 [distribution] */ +iso_write_opts_new (write_opts, 2); -src = iso_source_new_ecma119 (priv-volume_set, src_opts); -if (src == NULL) { +if (iso_image_create_burn_source (priv-image, write_opts, src) 0) { /* could not create source */ xfce_err (_(Could not create ISO source structure)); return; } +/* iso_image_create_burn_source copies
[Xfce4-commits] r26676 - xfce4-appfinder/trunk/po xfce4-panel/trunk/po
Author: pollux Date: 2008-03-12 08:16:38 + (Wed, 12 Mar 2008) New Revision: 26676 Modified: xfce4-appfinder/trunk/po/ChangeLog xfce4-appfinder/trunk/po/de.po xfce4-panel/trunk/po/ChangeLog xfce4-panel/trunk/po/de.po Log: Update German translations by Enrico Tr?\195?\182ger Modified: xfce4-appfinder/trunk/po/ChangeLog === --- xfce4-appfinder/trunk/po/ChangeLog 2008-03-10 21:41:48 UTC (rev 26675) +++ xfce4-appfinder/trunk/po/ChangeLog 2008-03-12 08:16:38 UTC (rev 26676) @@ -1,3 +1,7 @@ +2008-03-12 Jean-François Wauthy [EMAIL PROTECTED] + * de.po: Update German translations by Enrico Tröger + [EMAIL PROTECTED] + 2008-03-05 Mike Massonnet [EMAIL PROTECTED] * am.po: Update Amharic translation @@ -4,8 +8,8 @@ 2008-02-27 Og Maciel [EMAIL PROTECTED] -* pt_BR.po: Brazilian Portuguese translation updated by -Fábio Nogueira [EMAIL PROTECTED]. + * pt_BR.po: Brazilian Portuguese translation updated by + Fábio Nogueira [EMAIL PROTECTED]. 2008-02-15 Mike Massonnet [EMAIL PROTECTED] Modified: xfce4-appfinder/trunk/po/de.po === --- xfce4-appfinder/trunk/po/de.po 2008-03-10 21:41:48 UTC (rev 26675) +++ xfce4-appfinder/trunk/po/de.po 2008-03-12 08:16:38 UTC (rev 26676) @@ -2,7 +2,7 @@ # Copyright (C) 2004-2005 Eduard Roccatello. # This file is distributed under the same license as the xfce4-appfinder package. # Moritz Heiber [EMAIL PROTECTED], 2004. -# Enrico Tröger [EMAIL PROTECTED], 2006. +# Enrico Tröger [EMAIL PROTECTED], 2006, 2008. # Nico Schümann [EMAIL PROTECTED], 2008. # msgid @@ -10,47 +10,45 @@ Project-Id-Version: xfce4-appfinder 4.4.0\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2008-02-15 15:05+0100\n -PO-Revision-Date: 2006-08-29 16:33+0100\n -Last-Translator: Nico Schümann [EMAIL PROTECTED]\n +PO-Revision-Date: 2008-03-12 08:36+0100\n +Last-Translator: Enrico Tröger [EMAIL PROTECTED]\n Language-Team: German [EMAIL PROTECTED]\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n #: ../src/main.c:62 -#, fuzzy msgid Show version information -msgstr Mehr Informationen... +msgstr Zeige Versionsinformationen #: ../src/main.c:63 msgid [MENUFILE] -msgstr +msgstr [Menü-Datei] #: ../src/main.c:82 msgid Failed to open display -msgstr +msgstr Konnte Display nicht öffnen #: ../src/main.c:94 msgid Copyright (c) 2008 -msgstr +msgstr Copyright (c) 2008 #: ../src/main.c:95 msgid The Xfce development team. All rights reserved. -msgstr +msgstr Das Xfce-Entwicklungsteam. Alle Rechte vorbehalten. #: ../src/main.c:96 #, c-format msgid Please report bugs to %s. -msgstr +msgstr Bitte melden Sie Probleme unter %s. #: ../src/appfinder.c:123 ../data/xfce4-appfinder.desktop.in.h:1 -#, fuzzy msgid Application Finder -msgstr Anwendungsfinder für Xfce 4 +msgstr Anwendungsfinder #: ../src/appfinder.c:164 msgid Filter -msgstr +msgstr Filter #: ../src/appfinder.c:185 msgid Categories @@ -62,11 +60,11 @@ #: ../src/appfinder.c:216 ../src/appfinder.c:371 ../src/appfinder.c:762 msgid Applications -msgstr +msgstr Anwendungen #: ../data/xfce4-appfinder.desktop.in.h:2 msgid Find applications installed on the system. -msgstr +msgstr Findet im System installierte Anwendungen. #~ msgid Cannot execute the selected application #~ msgstr Kann die ausgewählte Anwendung nicht ausführen Modified: xfce4-panel/trunk/po/ChangeLog === --- xfce4-panel/trunk/po/ChangeLog 2008-03-10 21:41:48 UTC (rev 26675) +++ xfce4-panel/trunk/po/ChangeLog 2008-03-12 08:16:38 UTC (rev 26676) @@ -1,3 +1,7 @@ +2008-03-12 Jean-François Wauthy [EMAIL PROTECTED] + * de.po: Update German translations by Enrico Tröger + [EMAIL PROTECTED] + 2008-03-05 Mike Massonnet [EMAIL PROTECTED] * ru.po: Update Russian translation by Andrey Fedoseev Modified: xfce4-panel/trunk/po/de.po === --- xfce4-panel/trunk/po/de.po 2008-03-10 21:41:48 UTC (rev 26675) +++ xfce4-panel/trunk/po/de.po 2008-03-12 08:16:38 UTC (rev 26676) @@ -3,14 +3,15 @@ # This file is distributed under the same license as the xfce4-panel package. # Moritz Heiber [EMAIL PROTECTED], 2003-2005. # Fabian Nowak [EMAIL PROTECTED], 2005-2007. +# Enrico Tröger [EMAIL PROTECTED], 2008. # msgid msgstr Project-Id-Version: xfce4-panel 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2007-12-12 12:57+0100\n -PO-Revision-Date: 2007-10-01 15:38+0100\n -Last-Translator: Nico Schümann [EMAIL PROTECTED]\n +POT-Creation-Date: 2008-03-12 08:30+0100\n +PO-Revision-Date: 2008-03-12 08:22+0100\n +Last-Translator: Enrico Tröger [EMAIL PROTECTED]\n Language-Team: German [EMAIL PROTECTED]\n MIME-Version: 1.0\n Content-Type:
[Xfce4-commits] r26588 - in xfprint: branches/xfce_4_4/xfprint trunk/xfprint
Author: pollux Date: 2008-01-24 19:16:44 + (Thu, 24 Jan 2008) New Revision: 26588 Modified: xfprint/branches/xfce_4_4/xfprint/print_dialog.c xfprint/trunk/xfprint/print_dialog.c Log: fix segfault when there is no default printer selected in backend (bug #3816) Modified: xfprint/branches/xfce_4_4/xfprint/print_dialog.c === --- xfprint/branches/xfce_4_4/xfprint/print_dialog.c2008-01-24 02:15:17 UTC (rev 26587) +++ xfprint/branches/xfce_4_4/xfprint/print_dialog.c2008-01-24 19:16:44 UTC (rev 26588) @@ -406,7 +406,7 @@ PRINTER_NAME_COLUMN, printer_data-name, PRINTER_ALIAS_COLUMN, printer_data-alias ? printer_data-alias : , -1); -if (!default_printer_found g_ascii_strcasecmp (default_printer-name, printer_data-name) == 0) { +if (default_printer !default_printer_found g_ascii_strcasecmp (default_printer-name, printer_data-name) == 0) { default_printer_found = TRUE; gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv-combobox_printer), iter); } Modified: xfprint/trunk/xfprint/print_dialog.c === --- xfprint/trunk/xfprint/print_dialog.c2008-01-24 02:15:17 UTC (rev 26587) +++ xfprint/trunk/xfprint/print_dialog.c2008-01-24 19:16:44 UTC (rev 26588) @@ -406,7 +406,7 @@ PRINTER_NAME_COLUMN, printer_data-name, PRINTER_ALIAS_COLUMN, printer_data-alias ? printer_data-alias : , -1); -if (!default_printer_found g_ascii_strcasecmp (default_printer-name, printer_data-name) == 0) { +if (default_printer !default_printer_found g_ascii_strcasecmp (default_printer-name, printer_data-name) == 0) { default_printer_found = TRUE; gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv-combobox_printer), iter); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26488 - xfce4-appfinder/trunk/src
Author: pollux Date: 2007-12-16 20:42:10 + (Sun, 16 Dec 2007) New Revision: 26488 Modified: xfce4-appfinder/trunk/src/main.c Log: use XfceTitledDialog instead of xfce_create_header Modified: xfce4-appfinder/trunk/src/main.c === --- xfce4-appfinder/trunk/src/main.c2007-12-16 17:12:38 UTC (rev 26487) +++ xfce4-appfinder/trunk/src/main.c2007-12-16 20:42:10 UTC (rev 26488) @@ -176,7 +176,6 @@ callbackInformationMenuActivate (GtkMenuItem *menuitem, gpointer menu) { GtkWidget *dialog; -GtkWidget *header; GtkWidget *vbox; GtkWidget *hbox; GtkWidget *frame; @@ -200,24 +199,24 @@ if (path XFCE_IS_DESKTOP_ENTRY(dentry = xfce_desktop_entry_new (path, keys, 7))) { -dialog = gtk_dialog_new_with_buttons (_(Xfce 4 Appfinder), NULL, - GTK_DIALOG_NO_SEPARATOR, - GTK_STOCK_CLOSE, GTK_RESPONSE_OK, - NULL); - icon = xfce_themed_icon_load(xfce4-appfinder, 48); -gtk_window_set_icon_name (GTK_WINDOW (dialog), xfce4-appfinder); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); +dialog = xfce_titled_dialog_new_with_buttons (_(Xfce 4 Appfinder), NULL, + GTK_DIALOG_NO_SEPARATOR, + GTK_STOCK_CLOSE, GTK_RESPONSE_OK, + NULL); + icon = xfce_themed_icon_load (xfce4-appfinder, 48); + if (G_LIKELY (G_IS_OBJECT (icon))) { + gtk_window_set_icon (GTK_WINDOW (dialog), icon); + g_object_unref (icon); + } + gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); + + xfce_desktop_entry_get_string (dentry, Name, TRUE, name); + xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog), name); + vbox = GTK_DIALOG (dialog)-vbox; gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); -xfce_desktop_entry_get_string (dentry, Name, TRUE, name); -header = xfce_create_header (icon, name); -gtk_container_set_border_width (GTK_CONTAINER (header), BORDER - 2); -gtk_widget_show (header); -gtk_box_pack_start (GTK_BOX (vbox), header, FALSE, TRUE, 0); -g_object_unref(icon); - hbox = gtk_hbox_new(FALSE, BORDER); gtk_container_set_border_width (GTK_CONTAINER (hbox), BORDER - 2); gtk_widget_show(hbox); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26480 - xfdesktop/branches/xfce_4_4/menueditor
Author: pollux Date: 2007-12-15 16:35:01 + (Sat, 15 Dec 2007) New Revision: 26480 Modified: xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c Log: force the menueditor to stop with a message if treestore could not be initialized (related to bug #3747) Modified: xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c === --- xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c 2007-12-14 13:55:15 UTC (rev 26479) +++ xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c 2007-12-15 16:35:01 UTC (rev 26480) @@ -312,6 +312,9 @@ treestore = gtk_tree_store_new (COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + if (G_UNLIKELY (!G_IS_OBJECT (treestore))) { +g_error (Could not initialize the treestore); + } scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26482 - xfwm4/trunk/mcs-plugin
Author: pollux Date: 2007-12-15 17:37:27 + (Sat, 15 Dec 2007) New Revision: 26482 Modified: xfwm4/trunk/mcs-plugin/workspaces.c xfwm4/trunk/mcs-plugin/workspaces.h xfwm4/trunk/mcs-plugin/workspaces_plugin.c xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c Log: * use XfceTitledDialog instead of xfce_create_header * fix a multiscreen bug by giving a parent to the edit workspace name dialog Modified: xfwm4/trunk/mcs-plugin/workspaces.c === --- xfwm4/trunk/mcs-plugin/workspaces.c 2007-12-15 16:38:37 UTC (rev 26481) +++ xfwm4/trunk/mcs-plugin/workspaces.c 2007-12-15 17:37:27 UTC (rev 26482) @@ -60,6 +60,8 @@ static GtkWidget *treeview; static int treerows; +static GtkDialog *parent_dialog; + enum { NUMBER_COLUMN, @@ -321,24 +323,22 @@ edit_name_dialog (GtkTreeModel * model, GtkTreeIter * iter, int number, const char *name, McsManager * manager) { -GtkWidget *dialog, *mainvbox, *header, *hbox, *label, *entry; +GtkWidget *dialog, *mainvbox, *hbox, *label, *entry; char title[512]; int response; const char *tmp; -dialog = gtk_dialog_new_with_buttons (_(Change name), NULL, +dialog = xfce_titled_dialog_new_with_buttons (_(Change name), GTK_WINDOW (parent_dialog), GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_APPLY, GTK_RESPONSE_OK, NULL); - +gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_EDIT); gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); mainvbox = GTK_DIALOG (dialog)-vbox; sprintf (title, _(Workspace %d), number); -header = xfce_create_header (NULL, title); -gtk_widget_show (header); -gtk_box_pack_start (GTK_BOX (mainvbox), header, TRUE, FALSE, 0); +xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog), title); hbox = gtk_hbox_new (FALSE, BORDER); gtk_container_set_border_width (GTK_CONTAINER (hbox), BORDER); @@ -504,10 +504,12 @@ } void -add_workspaces_page (GtkBox * box) +add_workspaces_page (GtkDialog * dialog, GtkBox * box) { GtkWidget *frame, *vbox; +parent_dialog = dialog; + /* Number of workspaces */ vbox = gtk_vbox_new (FALSE, BORDER); gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER); Modified: xfwm4/trunk/mcs-plugin/workspaces.h === --- xfwm4/trunk/mcs-plugin/workspaces.h 2007-12-15 16:38:37 UTC (rev 26481) +++ xfwm4/trunk/mcs-plugin/workspaces.h 2007-12-15 17:37:27 UTC (rev 26482) @@ -26,7 +26,7 @@ void create_workspaces_channel (McsPlugin * mcs_plugin); -void add_workspaces_page (GtkBox *box); +void add_workspaces_page (GtkDialog *dialog, GtkBox *box); #endif /* INC_WORKSPACES_H */ Modified: xfwm4/trunk/mcs-plugin/workspaces_plugin.c === --- xfwm4/trunk/mcs-plugin/workspaces_plugin.c 2007-12-15 16:38:37 UTC (rev 26481) +++ xfwm4/trunk/mcs-plugin/workspaces_plugin.c 2007-12-15 17:37:27 UTC (rev 26482) @@ -158,7 +158,7 @@ vbox = gtk_vbox_new (FALSE, BORDER); gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER); gtk_widget_show (vbox); -add_workspaces_page (GTK_BOX (vbox)); +add_workspaces_page (GTK_DIALOG (dialog), GTK_BOX (vbox)); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, gtk_label_new (_(Workspaces))); wm_name = gdk_x11_screen_get_window_manager_name (gdk_screen_get_default ()); Modified: xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c === --- xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c 2007-12-15 16:38:37 UTC (rev 26481) +++ xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c 2007-12-15 17:37:27 UTC (rev 26482) @@ -116,8 +116,6 @@ GtkWidget *hbox; GtkWidget *label; GtkWidget *entry; -GtkWidget *header_image; -GtkWidget *header; GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; @@ -131,15 +129,12 @@ FILE *new_theme; FILE *default_theme; -dialog = gtk_dialog_new_with_buttons (_(Add keybinding theme), GTK_WINDOW (itf-xfwm4_dialog), +dialog = xfce_titled_dialog_new_with_buttons (_(Add keybinding theme), GTK_WINDOW (itf-xfwm4_dialog), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); +gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_ADD); -header_image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_LARGE_TOOLBAR); -header = xfce_create_header_with_image (header_image, _(Add keybinding theme)); -gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)-vbox), header,
[Xfce4-commits] r26473 - xfdesktop/branches/xfce_4_4/menueditor
Author: pollux Date: 2007-12-14 07:50:17 + (Fri, 14 Dec 2007) New Revision: 26473 Modified: xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c Log: unref icon only if it has been initialized (bug #3747) Modified: xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c === --- xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c 2007-12-13 23:24:18 UTC (rev 26472) +++ xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c 2007-12-14 07:50:17 UTC (rev 26473) @@ -213,7 +213,7 @@ g_free (priv-menu_file_name); - if (G_LIKELY (dummy_icon != NULL)) { + if (G_LIKELY (G_IS_OBJECT (dummy_icon))) { g_object_unref (dummy_icon); dummy_icon = NULL; } @@ -255,8 +255,10 @@ /* Set default icon */ icon = xfce_themed_icon_load (xfce4-menueditor, 48); - gtk_window_set_icon (GTK_WINDOW (mainwin), icon); - g_object_unref (icon); + if (G_LIKELY (G_IS_OBJECT (icon))) { +gtk_window_set_icon (GTK_WINDOW (mainwin), icon); +g_object_unref (icon); + } /* create ui manager */ priv-action_group = gtk_action_group_new (menueditor-main-window); @@ -871,7 +873,7 @@ menueditor_main_window_set_menu_modified (window); - if (G_LIKELY (G_IS_OBJECT (new_icon))) + if (G_IS_OBJECT (new_icon)) g_object_unref (new_icon); g_free (new_name); g_free (new_command); @@ -1305,7 +1307,7 @@ gtk_widget_destroy (dialog); xfce_about_info_free (info); - if (G_LIKELY (icon != NULL)) + if (G_LIKELY (G_IS_OBJECT (icon))) g_object_unref (G_OBJECT (icon)); } @@ -1550,7 +1552,7 @@ COLUMN_OPTION_1, icon ? attribute_values[m] : , COLUMN_OPTION_2, in_terminal ? true : false, COLUMN_OPTION_3, start_notify ? true : false, -1); -if (icon) +if (G_IS_OBJECT (icon)) g_object_unref (icon); } else if (!strcmp (element_name, menu)) { @@ -1571,7 +1573,7 @@ COLUMN_NAME, name, COLUMN_COMMAND, , COLUMN_HIDDEN, hidden, COLUMN_OPTION_1, icon ? attribute_values[j] : , COLUMN_TYPE, MENU, -1); -if (icon) +if (G_IS_OBJECT (icon)) g_object_unref (icon); parent = g_new0 (GtkTreeIter, 1); @@ -1608,7 +1610,7 @@ COLUMN_HIDDEN, hidden, COLUMN_TYPE, BUILTIN, COLUMN_OPTION_1, icon ? attribute_values[k] : , COLUMN_OPTION_2, builtin, -1); -if (icon) +if (G_IS_OBJECT (icon)) g_object_unref (icon); } else if (!strcmp (element_name, title)) { @@ -1626,7 +1628,7 @@ COLUMN_ICON, icon ? icon : dummy_icon, COLUMN_NAME, name, COLUMN_HIDDEN, hidden, COLUMN_TYPE, TITLE, COLUMN_OPTION_1, icon ? attribute_values[j] : , -1); -if (icon) +if (G_IS_OBJECT (icon)) g_object_unref (icon); } else if (!strcmp (element_name, include)) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26366 - libxfcegui4/branches/xfce_4_4/libxfcegui4
Author: pollux Date: 2007-11-17 21:01:44 + (Sat, 17 Nov 2007) New Revision: 26366 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/xfce-exec.c Log: backport from trunk fixing xfce_exec in multi-screen environments (bug 3667) Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/xfce-exec.c === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/xfce-exec.c 2007-11-17 20:37:15 UTC (rev 26365) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/xfce-exec.c 2007-11-17 21:01:44 UTC (rev 26366) @@ -122,19 +122,37 @@ if (async) { +gchar **cur = NULL; + spawn_flags = G_SPAWN_SEARCH_PATH; if (want_child_watch) { spawn_flags |= G_SPAWN_DO_NOT_REAP_CHILD; } - + + if (!free_envp) + free_envp = g_strdupv (envp); + + for (cur = free_envp; *cur; cur++) +{ + if ((strlen (*cur) 7) (g_strncasecmp (DISPLAY, *cur, 7) == 0)) +{ + gchar *dpyname = gdk_screen_make_display_name (screen); + + g_free (*cur); + *cur = g_strconcat (DISPLAY=, dpyname, NULL); + + g_free (dpyname); + } + } + success = gdk_spawn_on_screen (screen, NULL, argv, - free_envp ? free_envp : envp, - spawn_flags, - child_setup_async, NULL, pid, - error); + free_envp, + spawn_flags, + child_setup_async, NULL, pid, + error); } else { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26321 - libxfce4util/branches/xfce_4_4 libxfcegui4/branches/xfce_4_4 mousepad/branches/xfce_4_4 xfcalendar/branches/xfce_4_4 xfce-mcs-manager/branches/xfce_4_4 xfce-mcs-plugins/branch
Author: pollux Date: 2007-11-16 21:07:48 + (Fri, 16 Nov 2007) New Revision: 26321 Modified: libxfce4util/branches/xfce_4_4/NEWS libxfcegui4/branches/xfce_4_4/NEWS mousepad/branches/xfce_4_4/NEWS xfcalendar/branches/xfce_4_4/NEWS xfce-mcs-manager/branches/xfce_4_4/NEWS xfce-mcs-plugins/branches/xfce_4_4/NEWS xfce-utils/branches/xfce_4_4/NEWS xfce4-appfinder/branches/xfce_4_4/NEWS xfce4-icon-theme/branches/xfce_4_4/NEWS xfce4-mixer/branches/xfce_4_4/NEWS xfce4-panel/branches/xfce_4_4/NEWS xfce4-session/branches/xfce_4_4/NEWS xfdesktop/branches/xfce_4_4/NEWS xfprint/branches/xfce_4_4/NEWS xfwm4/branches/xfce_4_4/NEWS Log: Updated NEWS Modified: libxfce4util/branches/xfce_4_4/NEWS === --- libxfce4util/branches/xfce_4_4/NEWS 2007-11-16 20:59:44 UTC (rev 26320) +++ libxfce4util/branches/xfce_4_4/NEWS 2007-11-16 21:07:48 UTC (rev 26321) @@ -6,7 +6,7 @@ - Updated translations: Maximilian Schleiss (nl), Dimitri Gogelia (ka), Pablo Vieira and Jose Vitor Lopes e Silva (pt_BR). - New translations: Terje Uriansrud (nb_NO), Nuno Miguel (pt_PT), - Manatsawin (th), Tegegne Tefera (am), RPrieditis (lv). + Mişu Moldovan (ro), Manatsawin (th), Tegegne Tefera (am), RPrieditis (lv). 4.4.1 Modified: libxfcegui4/branches/xfce_4_4/NEWS === --- libxfcegui4/branches/xfce_4_4/NEWS 2007-11-16 20:59:44 UTC (rev 26320) +++ libxfcegui4/branches/xfce_4_4/NEWS 2007-11-16 21:07:48 UTC (rev 26321) @@ -7,7 +7,7 @@ in session management, in case the application frees the data. - Properly deal with %-starting 'field codes' in commands from .desktop files - Updated translations: Maximilian Schleiss (nl), Dimitri Gogelia (ka), - Pablo Vieira and Jose Vitor Lopes e Silva (pt_BR). + Pablo Vieira and Jose Vitor Lopes e Silva (pt_BR), Mişu Moldovan (ro. - New translations: Terje Uriansrud (nb_NO), Nuno Miguel (pt_PT), Tegegne Tefera (am), Manatsawin (th), RPrieditis (lv). Modified: mousepad/branches/xfce_4_4/NEWS === --- mousepad/branches/xfce_4_4/NEWS 2007-11-16 20:59:44 UTC (rev 26320) +++ mousepad/branches/xfce_4_4/NEWS 2007-11-16 21:07:48 UTC (rev 26321) @@ -10,8 +10,8 @@ Fabio Riga (it), Dimitri Gogelia (ka), Pablo Vieira (pt_BR), Og Maciel (pt_BR). - New translations: Besnik Bleta (sq), Terje Uriansrud (nb_NO), - Nuno Miguel (pt_PT), Tegegne Tefera (am), Manatsawin (th), - RPrieditis (lv). + Nuno Miguel (pt_PT), Mişu Moldovan (ro), Tegegne Tefera (am), + Manatsawin (th), RPrieditis (lv). 0.2.12 Modified: xfcalendar/branches/xfce_4_4/NEWS === --- xfcalendar/branches/xfce_4_4/NEWS 2007-11-16 20:59:44 UTC (rev 26320) +++ xfcalendar/branches/xfce_4_4/NEWS 2007-11-16 21:07:48 UTC (rev 26321) @@ -10,7 +10,7 @@ - Updated translations: Fabio Riga (it), Pau Rul-lan Ferragut (ca), Daichi Kawahata (ja), Terje Uriansrud (nb_NO), Nuno Miguel (pt_PT), Tegegne Tefera (am), Dimitri Gogelia (ka), Vincent Tunru (nl), - Pablo Vieira (pt_PT), Fábio Nogueira (pt_PT). + Pablo Vieira (pt_PT), Fábio Nogueira (pt_PT), Mişu Moldovan (ro). - New translations: RPrieditis (lv). Modified: xfce-mcs-manager/branches/xfce_4_4/NEWS === --- xfce-mcs-manager/branches/xfce_4_4/NEWS 2007-11-16 20:59:44 UTC (rev 26320) +++ xfce-mcs-manager/branches/xfce_4_4/NEWS 2007-11-16 21:07:48 UTC (rev 26321) @@ -5,7 +5,7 @@ hurt laptop battery performance. - Updated translations: Terje Uriansrud (nb_NO), European Portuguese (pt_PT), Vincent Tunru (nl), Dimitri Gogelia (ka), Ivan Masar (sk), Vladimir Melo (pt_BR), - Terje Uriansrud (nb_NO), Nuno Miguel (pt_PT). + Terje Uriansrud (nb_NO), Nuno Miguel (pt_PT), Mişu Moldovan (ro). - New translations: Tegegne Tefera (am), RPrieditis (lv). Modified: xfce-mcs-plugins/branches/xfce_4_4/NEWS === --- xfce-mcs-plugins/branches/xfce_4_4/NEWS 2007-11-16 20:59:44 UTC (rev 26320) +++ xfce-mcs-plugins/branches/xfce_4_4/NEWS 2007-11-16 21:07:48 UTC (rev 26321) @@ -9,7 +9,7 @@ Vladimir Melo (ka), Alexander Nyakhaychyk (be), Jari Rahkonen (fi), Nico Schümann (de), Mike Massonnet (fr), Jeff Bailes (en_GB), Terje Uriansrud (nb_NO), Stavros Giannouris (el), Fabio Riga (it), - Luiz Armesto (pt_BR), Stephan Arts (nl). + Luiz Armesto (pt_BR), Stephan Arts (nl), Mişu Moldovan (ro). - New translations: Terje Uriansrud (nb_NO), RPrieditis (lv). Modified: xfce-utils/branches/xfce_4_4/NEWS === --- xfce-utils/branches/xfce_4_4/NEWS 2007-11-16 20:59:44 UTC (rev 26320) +++ xfce-utils/branches/xfce_4_4/NEWS 2007-11-16 21:07:48 UTC (rev 26321) @@ -5,7
[Xfce4-commits] r26252 - libxfce4menu/trunk/po
Author: pollux Date: 2007-11-04 09:36:53 + (Sun, 04 Nov 2007) New Revision: 26252 Added: libxfce4menu/trunk/po/sq.po Modified: libxfce4menu/trunk/po/ libxfce4menu/trunk/po/ChangeLog libxfce4menu/trunk/po/LINGUAS Log: Add Albanian translation by Besnik Bleta [EMAIL PROTECTED] Property changes on: libxfce4menu/trunk/po ___ Name: svn:ignore - POTFILES Makefile Makefile.in stamp-it *.swp + POTFILES Makefile Makefile.in Makefile.in.in stamp-it *.swp *.gmo Modified: libxfce4menu/trunk/po/ChangeLog === --- libxfce4menu/trunk/po/ChangeLog 2007-11-04 08:45:12 UTC (rev 26251) +++ libxfce4menu/trunk/po/ChangeLog 2007-11-04 09:36:53 UTC (rev 26252) @@ -1,3 +1,8 @@ +2007-11-04 Jean-François Wauthy [EMAIL PROTECTED] + + * LINGUAS, sq.po: Add Albanian translation by Besnik Bleta + [EMAIL PROTECTED] + 2007-09-24 Mike Massonnet [EMAIL PROTECTED] * LINGUAS, lv.po: Add Latvian translation by RPrieditis Modified: libxfce4menu/trunk/po/LINGUAS === --- libxfce4menu/trunk/po/LINGUAS 2007-11-04 08:45:12 UTC (rev 26251) +++ libxfce4menu/trunk/po/LINGUAS 2007-11-04 09:36:53 UTC (rev 26252) @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de lv ja +de ja lv sq Added: libxfce4menu/trunk/po/sq.po === --- libxfce4menu/trunk/po/sq.po (rev 0) +++ libxfce4menu/trunk/po/sq.po 2007-11-04 09:36:53 UTC (rev 26252) @@ -0,0 +1,33 @@ +# Albanian translation of the libxfce4menu package. +# Copyright (C) 2004-2007 +# This file is distributed under the same license as the libxfce4menu package. +# Besnik Bleta [EMAIL PROTECTED], 2007. + +msgid +msgstr +Project-Id-Version: libxfce4menu-0.1.\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2007-09-20 22:18+0200\n +PO-Revision-Date: 2007-11-01 13:30+0200\n +Last-Translator: Besnik Bleta [EMAIL PROTECTED]\n +Language-Team: Albanian [EMAIL PROTECTED]\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n + +#. Let the caller know there was no suitable file +#: ../libxfce4menu/xfce-menu.c:741 +#, fuzzy +msgid Failed to locate the application root menu +msgstr Dështova në gjetjen e menusë rrënjë për zbatimin + +#: ../libxfce4menu/xfce-menu-item-cache.c:192 +#, c-format +msgid Failed to create the libxfce4menu item cache in %s. +msgstr Dështova në krijimin e objektit të fshehtinës libxfce4menu te %s. + +#: ../libxfce4menu/xfce-menu-item-cache.c:202 +#, c-format +msgid Failed to open libxfce4menu item cache in %s: %s. +msgstr Dështova në hapjen e objektit të fshehtinës libxfce4menu te %s: %s. + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26234 - xfce-mcs-plugins/branches/xfce_4_4/po
Author: pollux Date: 2007-11-02 07:33:18 + (Fri, 02 Nov 2007) New Revision: 26234 Modified: xfce-mcs-plugins/branches/xfce_4_4/po/ChangeLog xfce-mcs-plugins/branches/xfce_4_4/po/nb_NO.po Log: Updated Norwegian translation by Terje [EMAIL PROTECTED] Modified: xfce-mcs-plugins/branches/xfce_4_4/po/ChangeLog === --- xfce-mcs-plugins/branches/xfce_4_4/po/ChangeLog 2007-11-02 02:11:56 UTC (rev 26233) +++ xfce-mcs-plugins/branches/xfce_4_4/po/ChangeLog 2007-11-02 07:33:18 UTC (rev 26234) @@ -1,3 +1,7 @@ +2007-11-02 Jean-François Wauthy [EMAIL PROTECTED] + + * nb_NO.po: Updated Norwegian translation by Terje [EMAIL PROTECTED] + 2007-11-02 Mike Massonnet [EMAIL PROTECTED] * fr.po: Update DPI translation Modified: xfce-mcs-plugins/branches/xfce_4_4/po/nb_NO.po === --- xfce-mcs-plugins/branches/xfce_4_4/po/nb_NO.po 2007-11-02 02:11:56 UTC (rev 26233) +++ xfce-mcs-plugins/branches/xfce_4_4/po/nb_NO.po 2007-11-02 07:33:18 UTC (rev 26234) @@ -74,11 +74,11 @@ #. #: ../plugins/display_plugin/display_plugin.c:909 msgid Sync sliders -msgstr Synkroniser glidebryter +msgstr Synkroniser glidebrytere #: ../plugins/fm_plugin/fm_plugin.c:63 msgid Failed to open the File Manager Preferences. -msgstr Feilet å åpne Filbehandler innstillinger. +msgstr Klarte ikke åpne Filbehandler innstillinger. #: ../plugins/fm_plugin/fm_plugin.c:65 msgid @@ -472,7 +472,7 @@ #: ../plugins/ui_plugin/ui_plugin.c:122 msgid System Default -msgstr +msgstr System forvalg #: ../plugins/ui_plugin/ui_plugin.c:501 msgid Font Selection Dialog @@ -480,51 +480,54 @@ #: ../plugins/ui_plugin/ui_plugin.c:529 msgid DPI Changed -msgstr +msgstr DPI endret #: ../plugins/ui_plugin/ui_plugin.c:531 msgid DPI was changed successfully -msgstr +msgstr DPI er endret #: ../plugins/ui_plugin/ui_plugin.c:532 msgid However, you may need to restart your session for the settings to take effect. msgstr +Du må kanskje omstarte økten for at endringene skal vises. #: ../plugins/ui_plugin/ui_plugin.c:534 msgid Log Out _Later -msgstr +msgstr Logg ut _senere #: ../plugins/ui_plugin/ui_plugin.c:536 msgid Log Out _Now -msgstr +msgstr Logg ut _nå #: ../plugins/ui_plugin/ui_plugin.c:543 msgid Exec Error -msgstr +msgstr Exec feil #: ../plugins/ui_plugin/ui_plugin.c:544 msgid Failed to run \xfce4-session-logout\ -msgstr +msgstr Klarte ikke å kjøre \xfce4-session-logout\ #: ../plugins/ui_plugin/ui_plugin.c:558 msgid Custom DPI -msgstr +msgstr Selvvalgt DPI #: ../plugins/ui_plugin/ui_plugin.c:579 msgid Enter your display's DPI below. Numbers that are multiples of 6 usually work best. The smaller the number, the smaller your fonts will look. msgstr +Angi DPI for skjermen din nedenfor. Verdier som er delelig med 6 fungerer +vanligvis best. Lavere verdier gjør at skriften på skjermen ser mindre ut. #: ../plugins/ui_plugin/ui_plugin.c:594 msgid Custom _DPI: -msgstr +msgstr Selvvalgt _DPI: #: ../plugins/ui_plugin/ui_plugin.c:631 ../plugins/ui_plugin/ui_plugin.c:1000 msgid Other... -msgstr +msgstr Annen... #: ../plugins/ui_plugin/ui_plugin.c:887 msgid User Interface Preferences @@ -540,7 +543,7 @@ #: ../plugins/ui_plugin/ui_plugin.c:974 msgid Font _DPI: -msgstr +msgstr Skrifttype _DPI: #: ../plugins/ui_plugin/ui_plugin.c:1005 msgid Font ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26227 - xfce-mcs-plugins/branches/xfce_4_4/po
Author: pollux Date: 2007-11-01 21:28:52 + (Thu, 01 Nov 2007) New Revision: 26227 Modified: xfce-mcs-plugins/branches/xfce_4_4/po/ChangeLog xfce-mcs-plugins/branches/xfce_4_4/po/de.po Log: Updated German translation by Nico Sch?\195?\188mann [EMAIL PROTECTED] Modified: xfce-mcs-plugins/branches/xfce_4_4/po/ChangeLog === --- xfce-mcs-plugins/branches/xfce_4_4/po/ChangeLog 2007-11-01 10:44:52 UTC (rev 26226) +++ xfce-mcs-plugins/branches/xfce_4_4/po/ChangeLog 2007-11-01 21:28:52 UTC (rev 26227) @@ -1,3 +1,8 @@ +2007-11-01 Jean-François Wauthy [EMAIL PROTECTED] + + * de.po: Updated German translation by Nico Schümann + [EMAIL PROTECTED] + 2007-11-01 Jari Rahkonen [EMAIL PROTECTED] * fi.po: Updated Finnish translation Modified: xfce-mcs-plugins/branches/xfce_4_4/po/de.po === --- xfce-mcs-plugins/branches/xfce_4_4/po/de.po 2007-11-01 10:44:52 UTC (rev 26226) +++ xfce-mcs-plugins/branches/xfce_4_4/po/de.po 2007-11-01 21:28:52 UTC (rev 26227) @@ -477,7 +477,7 @@ #: ../plugins/ui_plugin/ui_plugin.c:122 msgid System Default -msgstr +msgstr Systemvorgabe #: ../plugins/ui_plugin/ui_plugin.c:501 msgid Font Selection Dialog @@ -485,51 +485,55 @@ #: ../plugins/ui_plugin/ui_plugin.c:529 msgid DPI Changed -msgstr +msgstr DPI geändert #: ../plugins/ui_plugin/ui_plugin.c:531 msgid DPI was changed successfully -msgstr +msgstr DPI wurde erfolgreich geändert #: ../plugins/ui_plugin/ui_plugin.c:532 msgid However, you may need to restart your session for the settings to take effect. msgstr +Zum Übernehmen der Änderungen muss die Sitzung u. U. neu gestartet werden. #: ../plugins/ui_plugin/ui_plugin.c:534 msgid Log Out _Later -msgstr +msgstr Sitzung _später beenden #: ../plugins/ui_plugin/ui_plugin.c:536 msgid Log Out _Now -msgstr +msgstr Sitzung _jetzt beenden #: ../plugins/ui_plugin/ui_plugin.c:543 msgid Exec Error -msgstr +msgstr Fehler beim Ausfühen #: ../plugins/ui_plugin/ui_plugin.c:544 msgid Failed to run \xfce4-session-logout\ -msgstr +msgstr Konnte »xfce4-session-logout« nicht ausführen #: ../plugins/ui_plugin/ui_plugin.c:558 msgid Custom DPI -msgstr +msgstr Benutzerdefinierter DPI #: ../plugins/ui_plugin/ui_plugin.c:579 msgid Enter your display's DPI below. Numbers that are multiples of 6 usually work best. The smaller the number, the smaller your fonts will look. msgstr +Geben Sie die DPI-Zahl Ihres Bildschirms ein. Nummern, die ein Vielfaches +von sechs sind, funktionieren normalerweise am besten. Je kleiner die Zahl, +desto kleiner die Schrift. #: ../plugins/ui_plugin/ui_plugin.c:594 msgid Custom _DPI: -msgstr +msgstr Benutzerdefinierter _DPI: #: ../plugins/ui_plugin/ui_plugin.c:631 ../plugins/ui_plugin/ui_plugin.c:1000 msgid Other... -msgstr +msgstr Sonstiges ... #: ../plugins/ui_plugin/ui_plugin.c:887 msgid User Interface Preferences @@ -545,7 +549,7 @@ #: ../plugins/ui_plugin/ui_plugin.c:974 msgid Font _DPI: -msgstr +msgstr Schrift-_DPI: #: ../plugins/ui_plugin/ui_plugin.c:1005 msgid Font ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26208 - libxfcegui4/trunk/libxfcegui4
Author: pollux Date: 2007-10-28 17:05:29 + (Sun, 28 Oct 2007) New Revision: 26208 Modified: libxfcegui4/trunk/libxfcegui4/xfce-exec.c Log: Start program on the correct screen. The DISPLAY environment variable is always :0.0 even if the program has to be started on an other screen. This patch changes the DISPLAY environment variable to use the wanted screen, if anyone has a better idea to fix that issue feel free to improve. Modified: libxfcegui4/trunk/libxfcegui4/xfce-exec.c === --- libxfcegui4/trunk/libxfcegui4/xfce-exec.c 2007-10-28 15:50:54 UTC (rev 26207) +++ libxfcegui4/trunk/libxfcegui4/xfce-exec.c 2007-10-28 17:05:29 UTC (rev 26208) @@ -53,6 +53,7 @@ #include libxfce4util/libxfce4util.h #include xfce-exec.h +#include xfce-gdk-extensions.h #include xfce-startup-notification.h extern char **environ; @@ -122,19 +123,37 @@ if (async) { +gchar **cur = NULL; + spawn_flags = G_SPAWN_SEARCH_PATH; if (want_child_watch) { spawn_flags |= G_SPAWN_DO_NOT_REAP_CHILD; } - + + if (!free_envp) + free_envp = g_strdupv (envp); + + for (cur = free_envp; *cur; cur++) +{ + if ((strlen (*cur) 7) (g_strncasecmp (DISPLAY, *cur, 7) == 0)) +{ + gchar *dpyname = gdk_screen_make_display_name (screen); + + g_free (*cur); + *cur = g_strconcat (DISPLAY=, dpyname, NULL); + + g_free (dpyname); + } + } + success = gdk_spawn_on_screen (screen, NULL, argv, - free_envp ? free_envp : envp, - spawn_flags, - child_setup_async, NULL, pid, - error); + free_envp, + spawn_flags, + child_setup_async, NULL, pid, + error); } else { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26102 - in xfce-utils: branches/xfce_4_4/xfce4-about trunk/xfce4-about
Author: pollux Date: 2007-09-23 20:16:29 + (Sun, 23 Sep 2007) New Revision: 26102 Modified: xfce-utils/branches/xfce_4_4/xfce4-about/GPL xfce-utils/trunk/xfce4-about/GPL Log: update FSF's address (fix bug #1680) Modified: xfce-utils/branches/xfce_4_4/xfce4-about/GPL === --- xfce-utils/branches/xfce_4_4/xfce4-about/GPL2007-09-23 19:02:36 UTC (rev 26101) +++ xfce-utils/branches/xfce_4_4/xfce4-about/GPL2007-09-23 20:16:29 UTC (rev 26102) @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Modified: xfce-utils/trunk/xfce4-about/GPL === --- xfce-utils/trunk/xfce4-about/GPL2007-09-23 19:02:36 UTC (rev 26101) +++ xfce-utils/trunk/xfce4-about/GPL2007-09-23 20:16:29 UTC (rev 26102) @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26103 - in xfce-utils: branches/xfce_4_4/xfce4-about trunk/xfce4-about
Author: pollux Date: 2007-09-23 20:18:08 + (Sun, 23 Sep 2007) New Revision: 26103 Modified: xfce-utils/branches/xfce_4_4/xfce4-about/LGPL xfce-utils/trunk/xfce4-about/LGPL Log: update FSF's address (fix bug #1680) Modified: xfce-utils/branches/xfce_4_4/xfce4-about/LGPL === --- xfce-utils/branches/xfce_4_4/xfce4-about/LGPL 2007-09-23 20:16:29 UTC (rev 26102) +++ xfce-utils/branches/xfce_4_4/xfce4-about/LGPL 2007-09-23 20:18:08 UTC (rev 26103) @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Modified: xfce-utils/trunk/xfce4-about/LGPL === --- xfce-utils/trunk/xfce4-about/LGPL 2007-09-23 20:16:29 UTC (rev 26102) +++ xfce-utils/trunk/xfce4-about/LGPL 2007-09-23 20:18:08 UTC (rev 26103) @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26079 - xfburn/trunk/xfburn
Author: pollux Date: 2007-09-16 09:16:21 + (Sun, 16 Sep 2007) New Revision: 26079 Modified: xfburn/trunk/xfburn/xfburn-main-window.c Log: Add Nuno Miguel to translator credits Modified: xfburn/trunk/xfburn/xfburn-main-window.c === --- xfburn/trunk/xfburn/xfburn-main-window.c2007-09-15 21:33:05 UTC (rev 26078) +++ xfburn/trunk/xfburn/xfburn-main-window.c2007-09-16 09:16:21 UTC (rev 26079) @@ -508,6 +508,7 @@ {Mantas, [EMAIL PROTECTED], lt,}, {Stephan Arts, [EMAIL PROTECTED], nl,}, {Szymon Kałasz, [EMAIL PROTECTED], pl,}, +{Nuno Miguel, [EMAIL PROTECTED], pt_PT,}, {Sergey Fedoseev, [EMAIL PROTECTED], ru,}, {Maxim V. Dziumanenko, [EMAIL PROTECTED], uk,}, {Cosmo Chene, [EMAIL PROTECTED], zh_TW,}, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25998 - in libxfcegui4: branches/xfce_4_4/libxfcegui4 trunk/libxfcegui4
Author: pollux Date: 2007-08-22 09:04:15 + (Wed, 22 Aug 2007) New Revision: 25998 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/icons.c libxfcegui4/trunk/libxfcegui4/icons.c Log: revert change of yesterday Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/icons.c === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/icons.c 2007-08-21 23:42:33 UTC (rev 25997) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/icons.c 2007-08-22 09:04:15 UTC (rev 25998) @@ -213,7 +213,7 @@ GtkIconInfo *info; gchar *filename = NULL, *name_fixed = NULL, *p; -g_return_val_if_fail(name != NULL, NULL); +g_return_val_if_fail(name, NULL); if(*name == '/' g_file_test(name, G_FILE_TEST_IS_REGULAR)) return g_strdup(name); Modified: libxfcegui4/trunk/libxfcegui4/icons.c === --- libxfcegui4/trunk/libxfcegui4/icons.c 2007-08-21 23:42:33 UTC (rev 25997) +++ libxfcegui4/trunk/libxfcegui4/icons.c 2007-08-22 09:04:15 UTC (rev 25998) @@ -213,7 +213,7 @@ GtkIconInfo *info; gchar *filename = NULL, *name_fixed = NULL, *p; -g_return_val_if_fail(name != NULL, NULL); +g_return_val_if_fail(name, NULL); if(*name == '/' g_file_test(name, G_FILE_TEST_IS_REGULAR)) return g_strdup(name); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26001 - in xfce-utils: branches/xfce_4_4/xfce4-about trunk/xfce4-about
Author: pollux Date: 2007-08-22 15:22:33 + (Wed, 22 Aug 2007) New Revision: 26001 Modified: xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS xfce-utils/trunk/xfce4-about/AUTHORS Log: add Nuno Miguel to the translation credits Modified: xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS === --- xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS2007-08-22 12:40:58 UTC (rev 26000) +++ xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS2007-08-22 15:22:33 UTC (rev 26001) @@ -101,6 +101,7 @@ pl;Szymon Kałasz;[EMAIL PROTECTED] pt_BR;Adriano Winter Bess;[EMAIL PROTECTED] pt_BR;Rodrigo Coacci;[EMAIL PROTECTED] +pt_PT;Nuno Miguel;[EMAIL PROTECTED] ro;Mişu Moldovan;[EMAIL PROTECTED] ru;Andrey Fedoseev;[EMAIL PROTECTED] ru;Maxim Zenin;[EMAIL PROTECTED] Modified: xfce-utils/trunk/xfce4-about/AUTHORS === --- xfce-utils/trunk/xfce4-about/AUTHORS2007-08-22 12:40:58 UTC (rev 26000) +++ xfce-utils/trunk/xfce4-about/AUTHORS2007-08-22 15:22:33 UTC (rev 26001) @@ -101,6 +101,7 @@ pl;Szymon Kałasz;[EMAIL PROTECTED] pt_BR;Adriano Winter Bess;[EMAIL PROTECTED] pt_BR;Rodrigo Coacci;[EMAIL PROTECTED] +pt_PT;Nuno Miguel;[EMAIL PROTECTED] ro;Mişu Moldovan;[EMAIL PROTECTED] ru;Andrey Fedoseev;[EMAIL PROTECTED] ru;Maxim Zenin;[EMAIL PROTECTED] ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25995 - in xfburn/trunk: . xfburn
Author: pollux Date: 2007-08-21 14:59:27 + (Tue, 21 Aug 2007) New Revision: 25995 Modified: xfburn/trunk/configure.in.in xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c xfburn/trunk/xfburn/xfburn-data-composition.c Log: build with libisofs 0.2.8 Modified: xfburn/trunk/configure.in.in === --- xfburn/trunk/configure.in.in2007-08-20 22:50:08 UTC (rev 25994) +++ xfburn/trunk/configure.in.in2007-08-21 14:59:27 UTC (rev 25995) @@ -30,7 +30,7 @@ dnl check for required packages XDT_CHECK_PACKAGE([LIBBURN], [libburn-1], [0.3.0]) -XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.2.3]) +XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.2.8]) XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) Modified: xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c === --- xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c 2007-08-20 22:50:08 UTC (rev 25994) +++ xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c 2007-08-21 14:59:27 UTC (rev 25995) @@ -545,8 +545,13 @@ GtkWidget *dialog_progress; struct burn_source * src = NULL; +struct ecma119_source_opts src_opts = {}; -src = iso_source_new_ecma119 (priv-volume_set, 0, 2, ECMA119_JOLIET); +src_opts.volnum = 0; +src_opts.level = 2; +src_opts.flags = ECMA119_JOLIET; + +src = iso_source_new_ecma119 (priv-volume_set, src_opts); if (src == NULL) { /* could not create source */ xfce_err (_(Could not create ISO source structure)); Modified: xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c === --- xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c 2007-08-20 22:50:08 UTC (rev 25994) +++ xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c 2007-08-21 14:59:27 UTC (rev 25995) @@ -538,8 +538,12 @@ GtkWidget *dialog_progress; struct burn_source * src = NULL; +struct ecma119_source_opts src_opts = {}; -src = iso_source_new_ecma119 (priv-volume_set, 0, 2, ECMA119_JOLIET); +src_opts.volnum = 0; +src_opts.level = 2; +src_opts.flags = ECMA119_JOLIET; +src = iso_source_new_ecma119 (priv-volume_set, src_opts); if (src == NULL) { /* could not create source */ xfce_err (_(Could not create ISO source structure)); Modified: xfburn/trunk/xfburn/xfburn-data-composition.c === --- xfburn/trunk/xfburn/xfburn-data-composition.c 2007-08-20 22:50:08 UTC (rev 25994) +++ xfburn/trunk/xfburn/xfburn-data-composition.c 2007-08-21 14:59:27 UTC (rev 25995) @@ -1440,21 +1440,23 @@ } static void -fill_volume_with_composition (GtkTreeModel *model, struct iso_tree_node * parent, GtkTreeIter *iter) +fill_volume_with_composition (GtkTreeModel *model, struct iso_tree_node_dir * parent, GtkTreeIter *iter) { do { DataCompositionEntryType type; gchar *name = NULL; gchar *src = NULL; - struct iso_tree_node *node = NULL; + struct iso_tree_node_dir *node_dir = NULL; gtk_tree_model_get (model, iter, DATA_COMPOSITION_COLUMN_TYPE, type, DATA_COMPOSITION_COLUMN_CONTENT, name, DATA_COMPOSITION_COLUMN_PATH, src, -1); if (type == DATA_COMPOSITION_TYPE_DIRECTORY) { - node = iso_tree_add_new_dir (parent, name); + node_dir = iso_tree_add_dir (parent, name); } else { + struct iso_tree_node *node = NULL; + node = iso_tree_add_node (parent, src); iso_tree_node_set_name (node, name); } @@ -1465,7 +1467,7 @@ GtkTreeIter child; gtk_tree_model_iter_children (model, child, iter); - fill_volume_with_composition (model, node, child); + fill_volume_with_composition (model, node_dir, child); } } while (gtk_tree_model_iter_next (model, iter)); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25996 - in libxfcegui4: branches/xfce_4_4/libxfcegui4 trunk/libxfcegui4
Author: pollux Date: 2007-08-21 19:45:31 + (Tue, 21 Aug 2007) New Revision: 25996 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/icons.c libxfcegui4/trunk/libxfcegui4/icons.c Log: Make the test for name != NULL more explicit Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/icons.c === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/icons.c 2007-08-21 14:59:27 UTC (rev 25995) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/icons.c 2007-08-21 19:45:31 UTC (rev 25996) @@ -213,7 +213,7 @@ GtkIconInfo *info; gchar *filename = NULL, *name_fixed = NULL, *p; -g_return_val_if_fail(name, NULL); +g_return_val_if_fail(name != NULL, NULL); if(*name == '/' g_file_test(name, G_FILE_TEST_IS_REGULAR)) return g_strdup(name); Modified: libxfcegui4/trunk/libxfcegui4/icons.c === --- libxfcegui4/trunk/libxfcegui4/icons.c 2007-08-21 14:59:27 UTC (rev 25995) +++ libxfcegui4/trunk/libxfcegui4/icons.c 2007-08-21 19:45:31 UTC (rev 25996) @@ -213,7 +213,7 @@ GtkIconInfo *info; gchar *filename = NULL, *name_fixed = NULL, *p; -g_return_val_if_fail(name, NULL); +g_return_val_if_fail(name != NULL, NULL); if(*name == '/' g_file_test(name, G_FILE_TEST_IS_REGULAR)) return g_strdup(name); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25934 - modules/4.4
Author: pollux Date: 2007-07-24 10:28:05 + (Tue, 24 Jul 2007) New Revision: 25934 Modified: modules/4.4/ Log: fix 4.4 module Property changes on: modules/4.4 ___ Name: svn:externals - gtk-xfce-engine-2 http://svn.xfce.org/svn/xfce/gtk-xfce-engine-2/branches/xfce_4_4 libexo http://svn.xfce.org/svn/xfce/libexo/branches/xfce_4_4 libxfce4mcs http://svn.xfce.org/svn/xfce/libxfce4mcs/branches/xfce_4_4 libxfce4util http://svn.xfce.org/svn/xfce/libxfce4util/branches/xfce_4_4 libxfcegui4 http://svn.xfce.org/svn/xfce/libxfcegui4/branches/xfce_4_4 mousepad http://svn.xfce.org/svn/xfce/mousepad/branches/xfce_4_4 thunar http://svn.xfce.org/svn/xfce/thunar/branches/xfce_4_4 xfcalendar http://svn.xfce.org/svn/xfce/xfcalendar/branches/xfce_4_4 xfce4-appfinder http://svn.xfce.org/svn/xfce/xfce4-appfinder/branches/xfce_4_4 xfce4-dev-tools http://svn.xfce.org/svn/xfce/xfce4-dev-tools/branches/xfce_4_4 xfce4-icon-theme http://svn.xfce.org/svn/xfce/xfce4-icon-theme/branches/xfce_4_4 xfce4-mixer http://svn.xfce.org/svn/xfce/xfce4-mixer/branches/xfce_4_4 xfce4-panel http://svn.xfce.org/svn/xfce/xfce4-panel/branches/xfce_4_4 xfce4-session http://svn.xfce.org/svn/xfce/xfce4-session/branches/xfce_4_4 xfce4-terminal http://svn.xfce.org/svn/xfce/xfce4-terminal/branches/xfce_4_4 xfce4-toys http://svn.xfce.org/svn/xfce/xfce4-toys/branches/xfce_4_4 xfce4-trigger-launcher http://svn.xfce.org/svn/xfce/xfce4-trigger-launcher/branches/xfce_4_4 xfce-mcs-manager http://svn.xfce.org/svn/xfce/xfce-mcs-manager/branches/xfce_4_4 xfce-mcs-plugins http://svn.xfce.org/svn/xfce/xfce-mcs-plugins/branches/xfce_4_4 xfce-utils http://svn.xfce.org/svn/xfce/xfce-utils/branches/xfce_4_4 xfdesktop http://svn.xfce.org/svn/xfce/xfdesktop/branches/xfce_4_4 xfmedia http://svn.xfce.org/svn/xfce/xfmedia/branches/xfce_4_4 xfprint http://svn.xfce.org/svn/xfce/xfprint/branches/xfce_4_4 xfwm4 http://svn.xfce.org/svn/xfce/xfwm4/branches/xfce_4_4 xfwm4-themes http://svn.xfce.org/svn/xfce/xfwm4-themes/branches/xfce_4_4 + gtk-xfce-engine-2 http://svn.xfce.org/svn/xfce/gtk-xfce-engine-2/branches/xfce_4_4 libxfce4mcs http://svn.xfce.org/svn/xfce/libxfce4mcs/branches/xfce_4_4 libxfce4util http://svn.xfce.org/svn/xfce/libxfce4util/branches/xfce_4_4 libxfcegui4 http://svn.xfce.org/svn/xfce/libxfcegui4/branches/xfce_4_4 mousepad http://svn.xfce.org/svn/xfce/mousepad/branches/xfce_4_4 xfcalendar http://svn.xfce.org/svn/xfce/xfcalendar/branches/xfce_4_4 xfce4-appfinder http://svn.xfce.org/svn/xfce/xfce4-appfinder/branches/xfce_4_4 xfce4-dev-tools http://svn.xfce.org/svn/xfce/xfce4-dev-tools/branches/xfce_4_4 xfce4-icon-theme http://svn.xfce.org/svn/xfce/xfce4-icon-theme/branches/xfce_4_4 xfce4-mixer http://svn.xfce.org/svn/xfce/xfce4-mixer/branches/xfce_4_4 xfce4-panel http://svn.xfce.org/svn/xfce/xfce4-panel/branches/xfce_4_4 xfce4-session http://svn.xfce.org/svn/xfce/xfce4-session/branches/xfce_4_4 xfce-mcs-manager http://svn.xfce.org/svn/xfce/xfce-mcs-manager/branches/xfce_4_4 xfce-mcs-plugins http://svn.xfce.org/svn/xfce/xfce-mcs-plugins/branches/xfce_4_4 xfce-utils http://svn.xfce.org/svn/xfce/xfce-utils/branches/xfce_4_4 xfdesktop http://svn.xfce.org/svn/xfce/xfdesktop/branches/xfce_4_4 xfprint http://svn.xfce.org/svn/xfce/xfprint/branches/xfce_4_4 xfwm4 http://svn.xfce.org/svn/xfce/xfwm4/branches/xfce_4_4 xfwm4-themes http://svn.xfce.org/svn/xfce/xfwm4-themes/branches/xfce_4_4 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25576 - in xfburn/trunk: . xfburn
Author: pollux Date: 2007-04-15 13:44:55 + (Sun, 15 Apr 2007) New Revision: 25576 Modified: xfburn/trunk/configure.in.in xfburn/trunk/xfburn/xfburn-burn-image-dialog.c Log: off_t *must* be 8 bytes long ! (fix bug #3140) Modified: xfburn/trunk/configure.in.in === --- xfburn/trunk/configure.in.in2007-04-15 12:05:54 UTC (rev 25575) +++ xfburn/trunk/configure.in.in2007-04-15 13:44:55 UTC (rev 25576) @@ -23,6 +23,8 @@ AC_PROG_LIBTOOL() AC_PROG_INTLTOOL([0.31], [no-xml]) +AC_SYS_LARGEFILE + dnl check for i18n support XDT_I18N([EMAIL PROTECTED]@]) Modified: xfburn/trunk/xfburn/xfburn-burn-image-dialog.c === --- xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2007-04-15 12:05:54 UTC (rev 25575) +++ xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2007-04-15 13:44:55 UTC (rev 25576) @@ -241,13 +241,14 @@ if (fstat (fd, stbuf) != -1) if( (stbuf.st_mode S_IFMT) == S_IFREG) fixed_size = stbuf.st_size; - + if (fixed_size == 0) { xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _(Unable to determine image size)); goto end; } data_src = burn_fd_source_new(fd, -1, fixed_size); + if (data_src == NULL) { xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _(Cannot open image)); goto end; @@ -313,7 +314,6 @@ } burn_write_opts_set_simulate(burn_options, params-dummy ? 1 : 0); - burn_structure_print_disc (disc); DBG (TODO set speed); burn_drive_set_speed (drive, 0, 0); burn_write_opts_set_underrun_proof (burn_options, params-burnfree ? 1 : 0); @@ -376,6 +376,7 @@ xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG (dialog_progress), -1); break; default: + DBG (Status not implemented: %d, status); break; } ___ Xfce4-commits mailing list [EMAIL PROTECTED] http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25438 - terminal/trunk thunar/trunk
Author: pollux Date: 2007-04-08 08:42:40 + (Sun, 08 Apr 2007) New Revision: 25438 Modified: terminal/trunk/ChangeLog terminal/trunk/configure.in.in thunar/trunk/ChangeLog thunar/trunk/configure.in.in Log: Add support for fr and nl translations into configure.in.in (patch by Maximilian Schleiss) Modified: terminal/trunk/ChangeLog === --- terminal/trunk/ChangeLog2007-04-08 08:31:45 UTC (rev 25437) +++ terminal/trunk/ChangeLog2007-04-08 08:42:40 UTC (rev 25438) @@ -1,3 +1,8 @@ +2007-04-08 Jean-François Wauthy [EMAIL PROTECTED] + + * configure.in.in: Add support for fr translations into + configure.in.in (patch by Maximilian Schleiss) + 2007-02-27 Nick Schermer [EMAIL PROTECTED] * configure.in.in: Apply patch from bug 2920 to check the -Wall, Modified: terminal/trunk/configure.in.in === --- terminal/trunk/configure.in.in 2007-04-08 08:31:45 UTC (rev 25437) +++ terminal/trunk/configure.in.in 2007-04-08 08:42:40 UTC (rev 25438) @@ -269,6 +269,9 @@ doc/C/Makefile doc/C/Terminal.xml doc/C/images/Makefile +doc/fr/Makefile +doc/fr/Terminal.xml +doc/fr/images/Makefile doc/ja/Makefile doc/ja/Terminal.xml doc/ja/images/Makefile Modified: thunar/trunk/ChangeLog === --- thunar/trunk/ChangeLog 2007-04-08 08:31:45 UTC (rev 25437) +++ thunar/trunk/ChangeLog 2007-04-08 08:42:40 UTC (rev 25438) @@ -1,3 +1,8 @@ +2007-04-08 Jean-Fran�ois Wauthy [EMAIL PROTECTED] + + * configure.in.in: Add support for nl translations into + configure.in.in (patch by Maximilian Schleiss) + 2007-03-19 Benedikt Meurer [EMAIL PROTECTED] * thunar/thunar-icon-factory.c: Automatically disable thumbnailing Modified: thunar/trunk/configure.in.in === --- thunar/trunk/configure.in.in2007-04-08 08:31:45 UTC (rev 25437) +++ thunar/trunk/configure.in.in2007-04-08 08:42:40 UTC (rev 25438) @@ -427,6 +427,9 @@ docs/manual/ja/Makefile docs/manual/ja/Thunar.xml docs/manual/ja/images/Makefile +docs/manual/nl/Makefile +docs/manual/nl/Thunar.xml +docs/manual/nl/images/Makefile docs/manual/pl/Makefile docs/manual/pl/Thunar.xml docs/manual/pl/images/Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25431 - in xfce-utils: branches/xfce_4_4/xfce4-about trunk/xfce4-about
Author: pollux Date: 2007-04-07 19:58:15 + (Sat, 07 Apr 2007) New Revision: 25431 Modified: xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS xfce-utils/trunk/xfce4-about/AUTHORS Log: I'm stepping down from translation supervision Modified: xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS === --- xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS2007-04-07 16:06:31 UTC (rev 25430) +++ xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS2007-04-07 19:58:15 UTC (rev 25431) @@ -48,7 +48,6 @@ [Translations supervision] Daichi Kawahata;[EMAIL PROTECTED] -Jean-François Wauthy;[EMAIL PROTECTED] Maximilian Schleiss;[EMAIL PROTECTED] Pau Rul·lan Ferragut;[EMAIL PROTECTED] Modified: xfce-utils/trunk/xfce4-about/AUTHORS === --- xfce-utils/trunk/xfce4-about/AUTHORS2007-04-07 16:06:31 UTC (rev 25430) +++ xfce-utils/trunk/xfce4-about/AUTHORS2007-04-07 19:58:15 UTC (rev 25431) @@ -48,7 +48,6 @@ [Translations supervision] Daichi Kawahata;[EMAIL PROTECTED] -Jean-François Wauthy;[EMAIL PROTECTED] Maximilian Schleiss;[EMAIL PROTECTED] Pau Rul·lan Ferragut;[EMAIL PROTECTED] @@ -69,6 +68,8 @@ el;Stathis Kamperis;[EMAIL PROTECTED] el;Stavros Giannouris;[EMAIL PROTECTED] en_GB;Dwayne Bailey;[EMAIL PROTECTED] +eo;Antono Vasiljev;[EMAIL PROTECTED] +eo;Jarbas Araujo de Oliveira Jr;[EMAIL PROTECTED] eo;Sylvain Vedrenne;[EMAIL PROTECTED] es;Jaime Buffery;[EMAIL PROTECTED] es;Pablo Hernandez-M. Saiz;[EMAIL PROTECTED] ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25336 - xfdesktop/branches/xfce_4_4/menueditor
Author: pollux Date: 2007-03-29 20:29:58 + (Thu, 29 Mar 2007) New Revision: 25336 Modified: xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.h xfdesktop/branches/xfce_4_4/menueditor/menueditor-main.c Log: add support for menu file as argument (fix bug #2876) Modified: xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c === --- xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c 2007-03-29 19:40:30 UTC (rev 25335) +++ xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.c 2007-03-29 20:29:58 UTC (rev 25336) @@ -396,8 +396,6 @@ gtk_action_set_sensitive (action, FALSE); gtk_widget_set_sensitive (priv-treeview, FALSE); - - action_open_default_menu (NULL, mainwin); } /*/ @@ -2336,9 +2334,27 @@ obj = g_object_new (menueditor_main_window_get_type (), NULL); + if (obj) +action_open_default_menu (NULL, MENUEDITOR_MAIN_WINDOW (obj)); + return obj; } +GtkWidget * +menueditor_main_window_new_with_menufile (const gchar *menufile) +{ + GtkWidget *obj = NULL; + + g_return_val_if_fail (menufile != NULL, NULL); + + obj = g_object_new (menueditor_main_window_get_type (), NULL); + + if (obj) +load_menu_in_treeview (menufile, MENUEDITOR_MAIN_WINDOW (obj)); + + return obj; +} + void menueditor_main_window_set_menu_modified (MenuEditorMainWindow *win) { Modified: xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.h === --- xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.h 2007-03-29 19:40:30 UTC (rev 25335) +++ xfdesktop/branches/xfce_4_4/menueditor/menueditor-main-window.h 2007-03-29 20:29:58 UTC (rev 25336) @@ -64,6 +64,7 @@ GtkType menueditor_main_window_get_type (void); GtkWidget *menueditor_main_window_new (void); +GtkWidget *menueditor_main_window_new_with_menufile (const gchar *); void menueditor_main_window_set_menu_modified (MenuEditorMainWindow *win); Modified: xfdesktop/branches/xfce_4_4/menueditor/menueditor-main.c === --- xfdesktop/branches/xfce_4_4/menueditor/menueditor-main.c2007-03-29 19:40:30 UTC (rev 25335) +++ xfdesktop/branches/xfce_4_4/menueditor/menueditor-main.c2007-03-29 20:29:58 UTC (rev 25336) @@ -54,7 +54,10 @@ xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, UTF-8); - mainwin = menueditor_main_window_new (); + if (argc 1 argv[1] != NULL) +mainwin = menueditor_main_window_new_with_menufile (argv[1]); + else +mainwin = menueditor_main_window_new (); gtk_widget_show (mainwin); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25179 - xfburn/trunk/po
Author: pollux Date: 2007-03-16 21:00:39 + (Fri, 16 Mar 2007) New Revision: 25179 Added: xfburn/trunk/po/it.po Modified: xfburn/trunk/po/LINGUAS Log: add Italian translations from David Paleino [EMAIL PROTECTED] Modified: xfburn/trunk/po/LINGUAS === --- xfburn/trunk/po/LINGUAS 2007-03-16 15:45:40 UTC (rev 25178) +++ xfburn/trunk/po/LINGUAS 2007-03-16 21:00:39 UTC (rev 25179) @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -ar ca cs de dz el eu fi fr gl he hu ja ko lt nl pa pl ru sq sv uk zh_TW +ar ca cs de dz el eu fi fr gl he hu it ja ko lt nl pa pl ru sq sv uk zh_TW Added: xfburn/trunk/po/it.po === --- xfburn/trunk/po/it.po (rev 0) +++ xfburn/trunk/po/it.po 2007-03-16 21:00:39 UTC (rev 25179) @@ -0,0 +1,728 @@ +# Italian translations of xfburn package. +# Copyright (C) 2007 David Paleino +# This file is distributed under the same license as the xfburn package. +# David Paleino [EMAIL PROTECTED], 2007. +# +# +msgid +msgstr +Project-Id-Version: xfburn 0.0.3svn\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2007-01-23 15:51+0100\n +PO-Revision-Date: 2007-03-16 21:58+0100\n +Last-Translator: David Paleino [EMAIL PROTECTED]\n +Language-Team: Italian xfce-i18n@xfce.org\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=utf-8\n +Content-Transfer-Encoding: 8bit\n + +#: ../xfburn/xfburn-adding-progress.c:89 +msgid Adding files to the composition +msgstr Sto aggiungendo files alla composizione + +#: ../xfburn/xfburn-blank-cd-dialog.c:95 ../xfburn/xfburn-main-window.c:120 +msgid Blank CD-RW +msgstr Cancella CD-RW + +#: ../xfburn/xfburn-blank-cd-dialog.c:106 +#: ../xfburn/xfburn-burn-data-composition-dialog.c:148 +#: ../xfburn/xfburn-burn-image-dialog.c:136 +#: ../xfburn/xfburn-copy-cd-dialog.c:131 +#: ../xfburn/xfburn-copy-dvd-dialog.c:131 +#: ../xfburn/xfburn-format-dvd-dialog.c:102 +msgid Burning device +msgstr Dispositivo di scrittura + +#: ../xfburn/xfburn-blank-cd-dialog.c:112 +msgid Fast +msgstr Veloce + +#: ../xfburn/xfburn-blank-cd-dialog.c:113 +msgid Complete +msgstr Completa + +#: ../xfburn/xfburn-blank-cd-dialog.c:117 +msgid Blank type +msgstr + +#: ../xfburn/xfburn-blank-cd-dialog.c:125 +#: ../xfburn/xfburn-burn-data-composition-dialog.c:156 +#: ../xfburn/xfburn-burn-image-dialog.c:144 +#: ../xfburn/xfburn-copy-cd-dialog.c:139 +#: ../xfburn/xfburn-copy-dvd-dialog.c:139 +#: ../xfburn/xfburn-format-dvd-dialog.c:110 +msgid Options +msgstr Opzioni + +#: ../xfburn/xfburn-blank-cd-dialog.c:129 +#: ../xfburn/xfburn-burn-data-composition-dialog.c:160 +#: ../xfburn/xfburn-burn-image-dialog.c:148 +#: ../xfburn/xfburn-copy-cd-dialog.c:143 +#: ../xfburn/xfburn-copy-dvd-dialog.c:143 +#: ../xfburn/xfburn-format-dvd-dialog.c:114 +msgid E_ject disk +msgstr E_spelli disco + +#: ../xfburn/xfburn-blank-cd-dialog.c:139 +msgid _Blank +msgstr _Cancella + +#: ../xfburn/xfburn-blank-cd-dialog.c:173 +#: ../xfburn/xfburn-burn-data-composition-dialog.c:409 +#: ../xfburn/xfburn-burn-image-dialog.c:264 +msgid Unable to grab drive +msgstr + +#: ../xfburn/xfburn-blank-cd-dialog.c:189 +msgid The inserted disc is already blank +msgstr Il disco inserito è già vuoto + +#. these ones we can blank +#: ../xfburn/xfburn-blank-cd-dialog.c:194 +msgid Ready +msgstr Pronto + +#: ../xfburn/xfburn-blank-cd-dialog.c:197 +msgid No disc detected in the drive +msgstr Nessun disco rilevato nel drive + +#: ../xfburn/xfburn-blank-cd-dialog.c:200 +msgid Cannot recognize drive and media state +msgstr + +#: ../xfburn/xfburn-blank-cd-dialog.c:205 +msgid Media is not erasable +msgstr + +#: ../xfburn/xfburn-blank-cd-dialog.c:212 +msgid Blanking disc... +msgstr Cancellazione disco... + +#: ../xfburn/xfburn-blank-cd-dialog.c:223 +#: ../xfburn/xfburn-burn-data-composition-dialog.c:344 +#: ../xfburn/xfburn-burn-data-composition-dialog.c:527 +#: ../xfburn/xfburn-burn-image-dialog.c:385 +msgid Done +msgstr Fatto + +#: ../xfburn/xfburn-burn-data-composition-dialog.c:138 +msgid Burn Composition +msgstr Scrivi Composizione + +#: ../xfburn/xfburn-burn-data-composition-dialog.c:165 +#: ../xfburn/xfburn-burn-image-dialog.c:153 +#: ../xfburn/xfburn-copy-cd-dialog.c:148 +#: ../xfburn/xfburn-copy-dvd-dialog.c:148 +msgid _Dummy write +msgstr + +#: ../xfburn/xfburn-burn-data-composition-dialog.c:169 +#: ../xfburn/xfburn-burn-image-dialog.c:157 +msgid Burn_Free +msgstr + +#. create ISO ? +#: ../xfburn/xfburn-burn-data-composition-dialog.c:175 +#: ../xfburn/xfburn-copy-cd-dialog.c:157 +#: ../xfburn/xfburn-copy-dvd-dialog.c:157 +msgid Only create _ISO +msgstr Crea solamente l'_ISO + +#: ../xfburn/xfburn-burn-data-composition-dialog.c:212 +msgid _Burn Composition +msgstr _Scrivi Composizione + +#: ../xfburn/xfburn-burn-data-composition-dialog.c:308 +#, c-format +msgid Could not create destination ISO file: %s +msgstr Impossibile creare il file ISO di
[Xfce4-commits] r25035 - mousepad/branches
Author: pollux Date: 2007-02-27 16:53:45 + (Tue, 27 Feb 2007) New Revision: 25035 Added: mousepad/branches/nick_0_3/ Log: for nick ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24988 - xfburn/trunk/xfburn
Author: pollux Date: 2007-02-18 08:47:49 + (Sun, 18 Feb 2007) New Revision: 24988 Modified: xfburn/trunk/xfburn/xfburn-device-list.c Log: correctly free the 'drives' array Modified: xfburn/trunk/xfburn/xfburn-device-list.c === --- xfburn/trunk/xfburn/xfburn-device-list.c2007-02-17 14:31:35 UTC (rev 24987) +++ xfburn/trunk/xfburn/xfburn-device-list.c2007-02-18 08:47:49 UTC (rev 24988) @@ -205,10 +205,9 @@ refresh_supported_speeds (device, (drives[i])); devices = g_list_append (devices, device); - -burn_drive_info_free ((drives[i])); } + burn_drive_info_free (drives); burn_finish (); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24832 - in libxfcegui4: branches/xfce_4_4/libxfcegui4 trunk/libxfcegui4
Author: pollux Date: 2007-02-03 14:29:25 + (Sat, 03 Feb 2007) New Revision: 24832 Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c libxfcegui4/trunk/libxfcegui4/netk-window.c Log: return FALSE when assertion fails Modified: libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c === --- libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c 2007-02-03 14:26:56 UTC (rev 24831) +++ libxfcegui4/branches/xfce_4_4/libxfcegui4/netk-window.c 2007-02-03 14:29:25 UTC (rev 24832) @@ -1289,7 +1289,7 @@ gboolean netk_window_get_icon_geometry (NetkWindow * window, int *xp, int *yp, int *widthp, int *heightp) { -g_return_if_fail (NETK_IS_WINDOW (window)); +g_return_val_if_fail (NETK_IS_WINDOW (window), FALSE); if (window-priv-icon_geometry.width == -1) { return FALSE; Modified: libxfcegui4/trunk/libxfcegui4/netk-window.c === --- libxfcegui4/trunk/libxfcegui4/netk-window.c 2007-02-03 14:26:56 UTC (rev 24831) +++ libxfcegui4/trunk/libxfcegui4/netk-window.c 2007-02-03 14:29:25 UTC (rev 24832) @@ -1289,7 +1289,7 @@ gboolean netk_window_get_icon_geometry (NetkWindow * window, int *xp, int *yp, int *widthp, int *heightp) { -g_return_if_fail (NETK_IS_WINDOW (window)); +g_return_val_if_fail (NETK_IS_WINDOW (window), FALSE); if (window-priv-icon_geometry.width == -1) { return FALSE; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24800 - mousepad/branches
Author: pollux Date: 2007-01-31 23:02:31 + (Wed, 31 Jan 2007) New Revision: 24800 Removed: mousepad/branches/xfce_4_4 Log: delete broken branch link Deleted: mousepad/branches/xfce_4_4 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24801 - mousepad/branches
Author: pollux Date: 2007-01-31 23:03:30 + (Wed, 31 Jan 2007) New Revision: 24801 Added: mousepad/branches/xfce_4_4/ Log: fix xfce_4_4 branch Copied: mousepad/branches/xfce_4_4 (from rev 24799, mousepad/tags/mousepad-0.2.12) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24757 - in xfce-utils: branches/xfce_4_4/xfce4-about trunk/xfce4-about
Author: pollux Date: 2007-01-25 21:15:15 + (Thu, 25 Jan 2007) New Revision: 24757 Modified: xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS xfce-utils/trunk/xfce4-about/AUTHORS Log: fix Lam Vinh Nien mail address Modified: xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS === --- xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS2007-01-25 20:58:45 UTC (rev 24756) +++ xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS2007-01-25 21:15:15 UTC (rev 24757) @@ -129,7 +129,7 @@ ta;Dinesh Nadarajah;[EMAIL PROTECTED] tr;Erçin EKER;[EMAIL PROTECTED] uk;Maxim V. Dziumanenko;[EMAIL PROTECTED] -vi;Lâm Vĩnh Niên;[EMAIL PROTECTED] +vi;Lâm Vĩnh Niên;[EMAIL PROTECTED] zh_CN;Huang Huan;[EMAIL PROTECTED] zh_CN;Yongtao Yang;[EMAIL PROTECTED] zh_TW;Cosmo Chene;[EMAIL PROTECTED] Modified: xfce-utils/trunk/xfce4-about/AUTHORS === --- xfce-utils/trunk/xfce4-about/AUTHORS2007-01-25 20:58:45 UTC (rev 24756) +++ xfce-utils/trunk/xfce4-about/AUTHORS2007-01-25 21:15:15 UTC (rev 24757) @@ -129,7 +129,7 @@ ta;Dinesh Nadarajah;[EMAIL PROTECTED] tr;Erçin EKER;[EMAIL PROTECTED] uk;Maxim V. Dziumanenko;[EMAIL PROTECTED] -vi;Lâm Vĩnh Niên;[EMAIL PROTECTED] +vi;Lâm Vĩnh Niên;[EMAIL PROTECTED] zh_CN;Huang Huan;[EMAIL PROTECTED] zh_CN;Yongtao Yang;[EMAIL PROTECTED] zh_TW;Cosmo Chene;[EMAIL PROTECTED] ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24758 - in xfce-utils: branches/xfce_4_4/xfce4-about trunk/xfce4-about
Author: pollux Date: 2007-01-25 21:24:11 + (Thu, 25 Jan 2007) New Revision: 24758 Modified: xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS xfce-utils/trunk/xfce4-about/AUTHORS Log: Add Erik Harrisson to the core devs since Mousepad was part of the 4.4 release if anyone disagrees, it's the time to speak up Modified: xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS === --- xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS2007-01-25 21:15:15 UTC (rev 24757) +++ xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS2007-01-25 21:24:11 UTC (rev 24758) @@ -9,6 +9,7 @@ Danny Milosavljevic;[EMAIL PROTECTED] Edscott Wilson García;[EMAIL PROTECTED] Eduard Roccatello;[EMAIL PROTECTED] +Erik Harrison;[EMAIL PROTECTED] François Le Clainche;[EMAIL PROTECTED] Jasper Huijsmans;[EMAIL PROTECTED] Jean-François Wauthy;[EMAIL PROTECTED] Modified: xfce-utils/trunk/xfce4-about/AUTHORS === --- xfce-utils/trunk/xfce4-about/AUTHORS2007-01-25 21:15:15 UTC (rev 24757) +++ xfce-utils/trunk/xfce4-about/AUTHORS2007-01-25 21:24:11 UTC (rev 24758) @@ -9,6 +9,7 @@ Danny Milosavljevic;[EMAIL PROTECTED] Edscott Wilson García;[EMAIL PROTECTED] Eduard Roccatello;[EMAIL PROTECTED] +Erik Harrison;[EMAIL PROTECTED] François Le Clainche;[EMAIL PROTECTED] Jasper Huijsmans;[EMAIL PROTECTED] Jean-François Wauthy;[EMAIL PROTECTED] ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24761 - in xfce-utils: branches/xfce_4_4/xfce4-about trunk/xfce4-about
Author: pollux Date: 2007-01-25 22:18:19 + (Thu, 25 Jan 2007) New Revision: 24761 Modified: xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS xfce-utils/trunk/xfce4-about/AUTHORS Log: remove WebAdept from the hosting section of the credits Modified: xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS === --- xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS2007-01-25 22:16:37 UTC (rev 24760) +++ xfce-utils/branches/xfce_4_4/xfce4-about/AUTHORS2007-01-25 22:18:19 UTC (rev 24761) @@ -37,7 +37,6 @@ Xavier Maillard;[EMAIL PROTECTED] [Hosting] -Remco Lubbers - WebAdept;http://www.web-adept.nl/;[EMAIL PROTECTED] University of Namur, Belgium;http://www.fundp.ac.be/ [Server administration] Modified: xfce-utils/trunk/xfce4-about/AUTHORS === --- xfce-utils/trunk/xfce4-about/AUTHORS2007-01-25 22:16:37 UTC (rev 24760) +++ xfce-utils/trunk/xfce4-about/AUTHORS2007-01-25 22:18:19 UTC (rev 24761) @@ -37,7 +37,6 @@ Xavier Maillard;[EMAIL PROTECTED] [Hosting] -Remco Lubbers - WebAdept;http://www.web-adept.nl/;[EMAIL PROTECTED] University of Namur, Belgium;http://www.fundp.ac.be/ [Server administration] ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24706 - xfburn/branches/libburn_trial
Author: pollux Date: 2007-01-23 13:51:31 + (Tue, 23 Jan 2007) New Revision: 24706 Modified: xfburn/branches/libburn_trial/TODO Log: update TODO Modified: xfburn/branches/libburn_trial/TODO === --- xfburn/branches/libburn_trial/TODO 2007-01-23 13:50:43 UTC (rev 24705) +++ xfburn/branches/libburn_trial/TODO 2007-01-23 13:51:31 UTC (rev 24706) @@ -1,14 +1,7 @@ -developer visible -= - -- use g_type_class_add_private - - user visible -- detect supported speeds - add audio cd support - add text/uri-list DnD target support - remove temporary files -- use thunar-vfs (future) +- use more thunar-vfs ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24709 - in xfburn/branches/libburn_trial: . xfburn
Author: pollux Date: 2007-01-23 14:23:48 + (Tue, 23 Jan 2007) New Revision: 24709 Modified: xfburn/branches/libburn_trial/NEWS xfburn/branches/libburn_trial/xfburn/Makefile.am xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.h xfburn/branches/libburn_trial/xfburn/xfburn-data-composition.c Log: * update NEWS * fix build when libburn and libisofs are not in a standard prefix Modified: xfburn/branches/libburn_trial/NEWS === --- xfburn/branches/libburn_trial/NEWS 2007-01-23 14:23:41 UTC (rev 24708) +++ xfburn/branches/libburn_trial/NEWS 2007-01-23 14:23:48 UTC (rev 24709) @@ -11,6 +11,7 @@ - Detect supported speeds - Add support for writing ISO from a composition using libburn - Add support for burning a composition using libburn +- Use correct cdrom size (bug #2753) xfburn 0.2.0beta Modified: xfburn/branches/libburn_trial/xfburn/Makefile.am === --- xfburn/branches/libburn_trial/xfburn/Makefile.am2007-01-23 14:23:41 UTC (rev 24708) +++ xfburn/branches/libburn_trial/xfburn/Makefile.am2007-01-23 14:23:48 UTC (rev 24709) @@ -69,7 +69,7 @@ $(EXO_CFLAGS) \ $(THUNAR_VFS_CFLAGS) -xfburn_LDFLAGS = \ +xfburn_LDADD = \ $(LIBBURN_LIBS) \ $(LIBISOFS_LIBS)\ $(LIBXFCEGUI4_LIBS) \ Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2007-01-23 14:23:41 UTC (rev 24708) +++ xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2007-01-23 14:23:48 UTC (rev 24709) @@ -23,7 +23,7 @@ #include libxfcegui4/libxfcegui4.h -#include libburn/libburn.h +#include libburn.h #include xfburn-global.h #include xfburn-utils.h Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.h === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.h 2007-01-23 14:23:41 UTC (rev 24708) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.h 2007-01-23 14:23:48 UTC (rev 24709) @@ -27,7 +27,7 @@ #include gtk/gtk.h #include libxfcegui4/libxfcegui4.h -#include libisofs/libisofs.h +#include libisofs.h G_BEGIN_DECLS Modified: xfburn/branches/libburn_trial/xfburn/xfburn-data-composition.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-data-composition.c 2007-01-23 14:23:41 UTC (rev 24708) +++ xfburn/branches/libburn_trial/xfburn/xfburn-data-composition.c 2007-01-23 14:23:48 UTC (rev 24709) @@ -43,7 +43,7 @@ #include exo/exo.h -#include libisofs/libisofs.h +#include libisofs.h #include xfburn-data-composition.h ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24436 - xfburn/branches/libburn_trial/xfburn
Author: pollux Date: 2007-01-14 12:25:26 + (Sun, 14 Jan 2007) New Revision: 24436 Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c Log: avoid eating lots of CPU cycles when writing to an ISO Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-14 09:49:07 UTC (rev 24435) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-14 12:25:26 UTC (rev 24436) @@ -295,6 +295,7 @@ guchar buf[2048]; glong size = 0; glong written = 0; + guint i = 0; fd = open (params-iso_path, O_WRONLY | O_CREAT | O_TRUNC, 0644); if (fd == -1) { @@ -327,12 +328,17 @@ g_free (error_msg); goto cleanup; } else { - gdouble percent =0; - written += 2048; - percent = ((gdouble) written / (gdouble) size); + i++; - xfburn_progress_dialog_set_progress_bar_fraction (XFBURN_PROGRESS_DIALOG (dialog_progress), percent); + if (i = 1000) { + i = 0; + gdouble percent = 0; + + percent = ((gdouble) written / (gdouble) size); + + xfburn_progress_dialog_set_progress_bar_fraction (XFBURN_PROGRESS_DIALOG (dialog_progress), percent); + } } } xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_COMPLETED, _(Done)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24438 - xfburn/branches/libburn_trial/xfburn
Author: pollux Date: 2007-01-14 12:49:33 + (Sun, 14 Jan 2007) New Revision: 24438 Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c xfburn/branches/libburn_trial/xfburn/xfburn-main.c Log: fix segfault when using the burning device a second time (it must exist a cleaner way to do that) Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2007-01-14 12:43:49 UTC (rev 24437) +++ xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2007-01-14 12:49:33 UTC (rev 24438) @@ -163,6 +163,12 @@ enum burn_disc_status disc_state; struct burn_progress progress; + if (!burn_initialize ()) { +g_critical (Unable to initialize libburn); +g_free (params); +return; + } + if (!xfburn_device_grab (params-device, drive_info)) { xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _(Unable to grab drive)); @@ -218,12 +224,8 @@ cleanup: burn_drive_release (drive, params-eject ? 1 : 0); - /* commented because it unleashes hell - DBG (drive_info: %p, drive_info); - - burn_drive_info_free (drive_info); - */ end: + burn_finish (); g_free (params); } Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-14 12:43:49 UTC (rev 24437) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-14 12:49:33 UTC (rev 24438) @@ -380,6 +380,13 @@ gboolean burning_has_started = FALSE; gint ret; + if (!burn_initialize ()) { +g_critical (Unable to initialize libburn); +burn_source_free (params-src); +g_free (params); +return; + } + disc = burn_disc_create (); session = burn_session_create (); track = burn_track_create (); @@ -479,15 +486,11 @@ cleanup: burn_drive_release (drive, params-eject ? 1 : 0); - /* commented because it unleashes hell - DBG (drive_info: %p, drive_info); - - burn_drive_info_free (drive_info); - */ end: burn_track_free (track); burn_session_free (session); burn_disc_free (disc); + burn_finish (); burn_source_free (params-src); g_free (params); Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2007-01-14 12:43:49 UTC (rev 24437) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2007-01-14 12:49:33 UTC (rev 24438) @@ -216,6 +216,13 @@ gboolean burning_has_started = FALSE; gint ret; + if (!burn_initialize ()) { +g_critical (Unable to initialize libburn); +g_free (params-iso_path); +g_free (params); +return; + } + disc = burn_disc_create (); session = burn_session_create (); track = burn_track_create (); @@ -334,15 +341,11 @@ cleanup: burn_drive_release (drive, params-eject ? 1 : 0); - /* commented because it unleashes hell - DBG (drive_info: %p, drive_info); - - burn_drive_info_free (drive_info); - */ end: burn_track_free (track); burn_session_free (session); burn_disc_free (disc); + burn_finish (); g_free (params-iso_path); g_free (params); Modified: xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c 2007-01-14 12:43:49 UTC (rev 24437) +++ xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c 2007-01-14 12:49:33 UTC (rev 24438) @@ -124,7 +124,6 @@ } } - /**/ /* public API */ /**/ @@ -139,6 +138,11 @@ { struct burn_drive_info *drive_info = NULL; + if (!burn_initialize ()) { +g_critical (Unable to initialize libburn); +return; + } + if (!xfburn_device_grab (device, drive_info)) { g_error (Couldn't grab drive in order to update speed list.); return; @@ -147,6 +151,8 @@ refresh_supported_speeds (device, drive_info); burn_drive_release (drive_info-drive, 0); + + burn_finish (); } void @@ -156,6 +162,11 @@ gint i; guint n_drives = 0; + if (!burn_initialize ()) { +g_critical (Unable to initialize libburn); +return; + } + if (devices) { g_list_foreach (devices, (GFunc) device_content_free, NULL); g_list_free (devices); @@ -192,15 +203,13 @@ g_error (Unable to get drive %s address (ret=%d). Please report this problem to [EMAIL PROTECTED],
[Xfce4-commits] r24443 - xfburn/branches/libburn_trial/xfburn
Author: pollux Date: 2007-01-14 14:14:02 + (Sun, 14 Jan 2007) New Revision: 24443 Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c Log: report more info about what's going on during the burning process Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-14 14:09:16 UTC (rev 24442) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-14 14:14:02 UTC (rev 24443) @@ -376,9 +376,10 @@ struct burn_write_opts * burn_options; enum burn_disc_status disc_state; + enum burn_drive_status status; struct burn_progress progress; - gboolean burning_has_started = FALSE; gint ret; + time_t time_start; if (!burn_initialize ()) { g_critical (Unable to initialize libburn); @@ -465,20 +466,57 @@ burn_disc_write (burn_options, disc); burn_write_opts_free (burn_options); - xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Burning composition...)); - while (burn_drive_get_status (drive, NULL) == BURN_DRIVE_SPAWNING) usleep(1002); - while (burn_drive_get_status (drive, progress) != BURN_DRIVE_IDLE) { -if (progress.sectors 0 progress.sector = 0) { - gdouble percent = 1.0 + ((gdouble) progress.sector+1.0) / ((gdouble) progress.sectors) * 98.0; - - burning_has_started = TRUE; - xfburn_progress_dialog_set_progress_bar_fraction (XFBURN_PROGRESS_DIALOG (dialog_progress), percent / 100.0); -} else if (burning_has_started progress.sectors == 0) { - xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Finalizing disc...)); -} + time_start = time (NULL); + while ((status = burn_drive_get_status (drive, progress)) != BURN_DRIVE_IDLE) { +gdouble percent = 0.0; +time_t time_now = time (NULL); +switch (status) { +case BURN_DRIVE_WRITING: + xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Burning composition...)); + // DBG (buffer capacity: %d, progress.buffer_capacity); + // DBG (buffer available: %d, progress.buffer_available); + // DBG (buffer: %f, ((gdouble) progress.buffer_available / (gdouble) progress.buffer_capacity)); + if (progress.sectors 0 progress.sector = 0) { + percent = 1.0 + ((gdouble) progress.sector+1.0) / ((gdouble) progress.sectors) * 98.0; + + xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG (dialog_progress), ((gdouble) progress.buffer_available / (gdouble) progress.buffer_capacity)); + xfburn_progress_dialog_set_progress_bar_fraction (XFBURN_PROGRESS_DIALOG (dialog_progress), percent / 100.0); + + xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG (dialog_progress), + ((gdouble) (progress.sector * 2048) / (gdouble) (time_now - time_start)) / (150 * 1024)); + } + break; +case BURN_DRIVE_WRITING_LEADIN: + xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), + XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Writing Lead-In...)); + xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG (dialog_progress), -1); + break; +case BURN_DRIVE_WRITING_LEADOUT: + xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), + XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Writing Lead-Out...)); + xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG (dialog_progress), -1); + break; +case BURN_DRIVE_WRITING_PREGAP: + xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), + XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Writing pregap...)); + xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG (dialog_progress), -1); + break; +case BURN_DRIVE_CLOSING_TRACK: + xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), + XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Closing track...)); + xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG (dialog_progress), -1); + break; +case BURN_DRIVE_CLOSING_SESSION: + xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), +
[Xfce4-commits] r24382 - in xfburn/branches/libburn_trial: . xfburn
Author: pollux Date: 2007-01-13 18:18:31 + (Sat, 13 Jan 2007) New Revision: 24382 Removed: xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-progress-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-progress-dialog.h xfburn/branches/libburn_trial/xfburn/xfburn-create-iso-from-composition-progress-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-create-iso-from-composition-progress-dialog.h Modified: xfburn/branches/libburn_trial/NEWS xfburn/branches/libburn_trial/xfburn/Makefile.am xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.h xfburn/branches/libburn_trial/xfburn/xfburn-data-composition.c xfburn/branches/libburn_trial/xfburn/xfburn-data-composition.h xfburn/branches/libburn_trial/xfburn/xfburn-data-disc-usage.c Log: add support for writing ISO from a composition Modified: xfburn/branches/libburn_trial/NEWS === --- xfburn/branches/libburn_trial/NEWS 2007-01-13 18:15:10 UTC (rev 24381) +++ xfburn/branches/libburn_trial/NEWS 2007-01-13 18:18:31 UTC (rev 24382) @@ -9,6 +9,7 @@ - Fix icon size in filesystem browser - Add icons for actions based on icons from the Tango icontheme - Detect supported speeds +- Add support for writing ISO from a composition xfburn 0.2.0beta Modified: xfburn/branches/libburn_trial/xfburn/Makefile.am === --- xfburn/branches/libburn_trial/xfburn/Makefile.am2007-01-13 18:15:10 UTC (rev 24381) +++ xfburn/branches/libburn_trial/xfburn/Makefile.am2007-01-13 18:18:31 UTC (rev 24382) @@ -13,7 +13,6 @@ xfburn-adding-progress.h\ xfburn-blank-cd-dialog.h\ xfburn-burn-data-composition-dialog.h \ - xfburn-burn-data-composition-progress-dialog.h \ xfburn-burn-image-dialog.h \ xfburn-settings.h \ xfburn-composition.h\ @@ -22,7 +21,6 @@ xfburn-copy-cd-progress-dialog.h\ xfburn-copy-dvd-dialog.h\ xfburn-create-iso-progress-dialog.h \ - xfburn-create-iso-from-composition-progress-dialog.h\ xfburn-device-box.h \ xfburn-device-list.h\ xfburn-format-dvd-dialog.h \ @@ -42,6 +40,7 @@ $(xfburn_headers) \ xfburn-adding-progress.c\ xfburn-blank-cd-dialog.c\ + xfburn-burn-data-composition-dialog.c \ xfburn-burn-image-dialog.c \ xfburn-composition.c\ xfburn-compositions-notebook.c \ Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-13 18:15:10 UTC (rev 24381) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-13 18:18:31 UTC (rev 24382) @@ -21,22 +21,25 @@ #include config.h #endif /* !HAVE_CONFIG_H */ +#ifdef HAVE_STRING_H +#include string.h +#endif + +#include errno.h + #include xfburn-global.h #include xfburn-utils.h #include xfburn-settings.h -#include xfburn-burn-data-composition-progress-dialog.h -#include xfburn-create-iso-from-composition-progress-dialog.h + #include xfburn-device-box.h -#include xfburn-write-mode-combo-box.h - #include xfburn-burn-data-composition-dialog.h +#include xfburn-progress-dialog.h #define XFBURN_BURN_DATA_COMPOSITION_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_BURN_DATA_COMPOSITION_DIALOG, XfburnBurnDataCompositionDialogPrivate)) typedef struct { - gchar *command_iso; - gchar *command_burn; + struct iso_volset * volume_set; GtkWidget *frame_device; GtkWidget *device_box; @@ -48,16 +51,21 @@ GtkWidget *hbox_iso; GtkWidget *entry_path_iso; GtkWidget *check_dummy; - - gchar *file_list; - XfburnDataComposition *composition; } XfburnBurnDataCompositionDialogPrivate; +enum { + PROP_0, + PROP_VOLUME_SET, +}; + /* prototypes */ static void xfburn_burn_data_composition_dialog_class_init (XfburnBurnDataCompositionDialogClass * klass);
[Xfce4-commits] r24420 - in xfburn/branches/libburn_trial: . xfburn
Author: pollux Date: 2007-01-13 21:37:23 + (Sat, 13 Jan 2007) New Revision: 24420 Modified: xfburn/branches/libburn_trial/NEWS xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-data-composition.c xfburn/branches/libburn_trial/xfburn/xfburn-data-disc-usage.c Log: * Add support for burning a composition using libburn * Fix the content of the ISO generated from a composition Modified: xfburn/branches/libburn_trial/NEWS === --- xfburn/branches/libburn_trial/NEWS 2007-01-13 21:37:19 UTC (rev 24419) +++ xfburn/branches/libburn_trial/NEWS 2007-01-13 21:37:23 UTC (rev 24420) @@ -9,7 +9,8 @@ - Fix icon size in filesystem browser - Add icons for actions based on icons from the Tango icontheme - Detect supported speeds -- Add support for writing ISO from a composition +- Add support for writing ISO from a composition using libburn +- Add support for burning a composition using libburn xfburn 0.2.0beta Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-13 21:37:19 UTC (rev 24419) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-13 21:37:23 UTC (rev 24420) @@ -30,6 +30,7 @@ #include xfburn-global.h #include xfburn-utils.h #include xfburn-settings.h +#include xfburn-stock.h #include xfburn-device-box.h #include xfburn-burn-data-composition-dialog.h @@ -120,6 +121,7 @@ { XfburnBurnDataCompositionDialogPrivate *priv = XFBURN_BURN_DATA_COMPOSITION_DIALOG_GET_PRIVATE (obj); + GdkPixbuf *icon = NULL; GtkBox *box = GTK_BOX (GTK_DIALOG (obj)-vbox); GtkWidget *img; GtkWidget *frame; @@ -131,7 +133,9 @@ gtk_window_set_title (GTK_WINDOW (obj), _(Burn Composition)); gtk_window_set_destroy_with_parent (GTK_WINDOW (obj), TRUE); - gtk_window_set_icon_name (GTK_WINDOW (obj), GTK_STOCK_CDROM); + icon = gtk_widget_render_icon (GTK_WIDGET (obj), XFBURN_STOCK_BURN_CD, GTK_ICON_SIZE_DIALOG, NULL); + gtk_window_set_icon (GTK_WINDOW (obj), icon); + g_object_unref (icon); /* burning devices list */ priv-device_box = xfburn_device_box_new (TRUE, TRUE, TRUE); @@ -201,7 +205,7 @@ gtk_widget_show (button); gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL); - button = xfce_create_mixed_button (GTK_STOCK_CDROM, _(_Burn Composition)); + button = xfce_create_mixed_button (xfburn-burn-cd, _(_Burn Composition)); gtk_widget_show (button); gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_OK); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); @@ -337,28 +341,173 @@ g_free (params); } +typedef struct { + GtkWidget *dialog_progress; + XfburnDevice *device; + struct burn_source *src; + gint speed; + XfburnWriteMode write_mode; + gboolean eject; + gboolean dummy; + gboolean burnfree; +} ThreadBurnCompositionParams; + static void +thread_burn_composition (ThreadBurnCompositionParams * params) +{ + GtkWidget *dialog_progress = params-dialog_progress; + + struct burn_disc *disc; + struct burn_session *session; + struct burn_track *track; + + struct burn_drive_info *drive_info = NULL; + struct burn_drive *drive; + + struct burn_write_opts * burn_options; + enum burn_disc_status disc_state; + struct burn_progress progress; + gboolean burning_has_started = FALSE; + gint ret; + + disc = burn_disc_create (); + session = burn_session_create (); + track = burn_track_create (); + + ret = burn_disc_add_session (disc, session, BURN_POS_END); + if (ret == 0) { +xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _(Unable to create disc object)); +goto end; + } + + if (burn_track_set_source (track, params-src) != BURN_SOURCE_OK) { +xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _(Cannot attach source object to track object)); +goto end; + } + + burn_session_add_track (session, track, BURN_POS_END); + + if (!xfburn_device_grab (params-device, drive_info)) { +xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _(Unable to grab drive)); + +goto end; + } + + drive = drive_info-drive; + + while (burn_drive_get_status (drive, NULL) != BURN_DRIVE_IDLE) +usleep(11); + + /* Evaluate drive and media */ + while ((disc_state = burn_disc_get_status(drive)) == BURN_DISC_UNREADY) +usleep(11); + if (disc_state == BURN_DISC_APPENDABLE params-write_mode != WRITE_MODE_TAO) { +xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _(Cannot append data to multisession disc in this write mode (use TAO instead))); +goto cleanup; + } else if (disc_state !=
[Xfce4-commits] r24429 - xfburn/branches/libburn_trial/xfburn
Author: pollux Date: 2007-01-13 22:06:06 + (Sat, 13 Jan 2007) New Revision: 24429 Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c Log: use open, write and close instead of fopen, fwrite, fclose Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-13 21:58:01 UTC (rev 24428) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c 2007-01-13 22:06:06 UTC (rev 24429) @@ -25,6 +25,10 @@ #include string.h #endif +#include sys/types.h +#include sys/stat.h +#include fcntl.h + #include errno.h #include xfburn-global.h @@ -287,13 +291,13 @@ thread_write_iso (ThreadWriteIsoParams * params) { GtkWidget *dialog_progress = params-dialog_progress; - FILE *fd = NULL; + gint fd; guchar buf[2048]; glong size = 0; glong written = 0; - fd = fopen(params-iso_path, w); - if (fd == NULL) { + fd = open (params-iso_path, O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (fd == -1) { /* could not create destination */ gchar err[256]; gchar *error_msg = NULL; @@ -311,7 +315,7 @@ size = (glong) params-src-get_size (params-src); while (params-src-read (params-src, buf, 2048) == 2048) { -if ( (fwrite(buf, 1, 2048, fd) 2048) (ferror (fd) 0)) { +if (write (fd, buf, 2048) 2048) { /* an error occured while writing */ gchar err[256]; gchar *error_msg = NULL; @@ -334,7 +338,7 @@ xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_COMPLETED, _(Done)); cleanup: - fclose (fd); + close (fd); end: burn_source_free (params-src); g_free (params-iso_path); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24359 - libexo/trunk/po
Author: pollux Date: 2007-01-11 19:50:31 + (Thu, 11 Jan 2007) New Revision: 24359 Added: libexo/trunk/po/be.po Modified: libexo/trunk/po/ChangeLog libexo/trunk/po/LINGUAS Log: 2007-01-11 Jean-Fran?\195?\167ois Wauthy [EMAIL PROTECTED] * be.po, LINGUAS: Add Belarusian translations by Alexander Nyakhaychyk [EMAIL PROTECTED] Modified: libexo/trunk/po/ChangeLog === --- libexo/trunk/po/ChangeLog 2007-01-11 16:54:21 UTC (rev 24358) +++ libexo/trunk/po/ChangeLog 2007-01-11 19:50:31 UTC (rev 24359) @@ -1,3 +1,8 @@ +2007-01-11 Jean-François Wauthy [EMAIL PROTECTED] + + * be.po, LINGUAS: Add Belarusian translations by Alexander Nyakhaychyk + [EMAIL PROTECTED] + 2007-01-11 Jari Rahkonen [EMAIL PROTECTED] * fi.po: Updated Finnish translation. Modified: libexo/trunk/po/LINGUAS === --- libexo/trunk/po/LINGUAS 2007-01-11 16:54:21 UTC (rev 24358) +++ libexo/trunk/po/LINGUAS 2007-01-11 19:50:31 UTC (rev 24359) @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -ca cs cy de dz el en_GB es et eu fi fr gl he hu it ja ka lt mk nl pa pl pt_BR ro ru sv +be ca cs cy de dz el en_GB es et eu fi fr gl he hu it ja ka lt mk nl pa pl pt_BR ro ru sv Added: libexo/trunk/po/be.po === --- libexo/trunk/po/be.po (rev 0) +++ libexo/trunk/po/be.po 2007-01-11 19:50:31 UTC (rev 24359) @@ -0,0 +1,1133 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR [EMAIL PROTECTED], YEAR. +# +msgid +msgstr +Project-Id-Version: libexo 0.3\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2007-01-03 13:02+0100\n +PO-Revision-Date: 2007-01-11 20:42+0300\n +Last-Translator: Alexander Nyakhaychyk [EMAIL PROTECTED]\n +Language-Team: Belarusian [EMAIL PROTECTED]\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=utf-8\n +Content-Transfer-Encoding: 8bit\n + +#: ../exo/exo-cell-renderer-ellipsized-text.c:138 +#: ../exo/exo-cell-renderer-icon.c:145 +msgid Follow state +msgstr Улічваць стан + +#: ../exo/exo-cell-renderer-ellipsized-text.c:139 +#: ../exo/exo-cell-renderer-icon.c:146 +msgid Render differently based on the selection state. +msgstr Адлюстраваньне заснавана на вылучаным стане. + +#: ../exo/exo-cell-renderer-icon.c:167 +msgid Icon +msgstr Значка + +#: ../exo/exo-cell-renderer-icon.c:168 +msgid The icon to render. +msgstr Значка для адлюстраваньня + +#: ../exo/exo-cell-renderer-icon.c:189 +msgid size +msgstr памер + +#: ../exo/exo-cell-renderer-icon.c:190 +msgid The size of the icon to render in pixels. +msgstr Памер значкі для адлюстраваньня ў піксэлях. + +#: ../exo/exo-gdk-pixbuf-extensions.c:770 +#, c-format +msgid Failed to open file \%s\: %s +msgstr Немагчыма адчыніць файл \%s\: %s + +#: ../exo/exo-gdk-pixbuf-extensions.c:832 +#, c-format +msgid Failed to read file \%s\: %s +msgstr Немагчыма перачытаць файл \%s\: %s + +#: ../exo/exo-gdk-pixbuf-extensions.c:873 +#, c-format +msgid Failed to load image \%s\: Unknown reason, probably a corrupt image file +msgstr Немагчыма загрузіць відарыс \%s\: прычына невядома, магчыма файл пашкоджаны + +#: ../exo/exo-icon-bar.c:249 +#: ../exo/exo-icon-view.c:783 +msgid Orientation +msgstr Арыентацыя + +#: ../exo/exo-icon-bar.c:250 +msgid The orientation of the iconbar +msgstr Арыентацыя панэлі значак + +#: ../exo/exo-icon-bar.c:266 +#: ../exo/exo-icon-view.c:800 +msgid Pixbuf column +msgstr Слупок са значкамі + +#: ../exo/exo-icon-bar.c:267 +#: ../exo/exo-icon-view.c:801 +msgid Model column used to retrieve the icon pixbuf from +msgstr Мадэль слупка, якая выкарыстоўваецца для атрыманьня значак з + +#: ../exo/exo-icon-bar.c:282 +#: ../exo/exo-icon-view.c:927 +msgid Text column +msgstr Тэкставы слупок + +#: ../exo/exo-icon-bar.c:283 +#: ../exo/exo-icon-view.c:928 +msgid Model column used to retrieve the text from +msgstr Мадэль слупка для атрыманьня тэксту з + +#: ../exo/exo-icon-bar.c:295 +msgid Icon Bar Model +msgstr Мадэль панэлі значак + +#: ../exo/exo-icon-bar.c:296 +msgid Model for the icon bar +msgstr Мадэль для панэлі значак + +#: ../exo/exo-icon-bar.c:312 +msgid Active +msgstr Актыўны + +#: ../exo/exo-icon-bar.c:313 +msgid Active item index +msgstr Індэкс актыўнага элемэнта + +#: ../exo/exo-icon-bar.c:319 +#: ../exo/exo-icon-bar.c:320 +msgid Active item fill color +msgstr Колер заліўкі актыўнага элемэнта + +#: ../exo/exo-icon-bar.c:326 +#: ../exo/exo-icon-bar.c:327 +msgid Active item border color +msgstr Колер мяжы актыўнага элемэнта + +#: ../exo/exo-icon-bar.c:333 +#: ../exo/exo-icon-bar.c:334 +msgid Active item text color +msgstr Колер тэксту актыўнага элемэнта + +#: ../exo/exo-icon-bar.c:340 +#: ../exo/exo-icon-bar.c:341 +msgid Cursor item fill color +msgstr Колер
[Xfce4-commits] r24333 - in xfburn/branches/libburn_trial: . icons icons/16x16 icons/22x22 icons/24x24 icons/32x32 icons/48x48 icons/scalable xfburn
Author: pollux Date: 2007-01-09 16:11:08 + (Tue, 09 Jan 2007) New Revision: 24333 Added: xfburn/branches/libburn_trial/icons/16x16/ xfburn/branches/libburn_trial/icons/16x16/Makefile.am xfburn/branches/libburn_trial/icons/16x16/stock_xfburn-blank-cdrw.png xfburn/branches/libburn_trial/icons/16x16/stock_xfburn-burn-cd.png xfburn/branches/libburn_trial/icons/16x16/stock_xfburn-data-copy.png xfburn/branches/libburn_trial/icons/16x16/stock_xfburn-import-session.png xfburn/branches/libburn_trial/icons/22x22/ xfburn/branches/libburn_trial/icons/22x22/Makefile.am xfburn/branches/libburn_trial/icons/22x22/stock_xfburn-blank-cdrw.png xfburn/branches/libburn_trial/icons/22x22/stock_xfburn-burn-cd.png xfburn/branches/libburn_trial/icons/22x22/stock_xfburn-data-copy.png xfburn/branches/libburn_trial/icons/22x22/stock_xfburn-import-session.png xfburn/branches/libburn_trial/icons/32x32/stock_xfburn-import-session.png xfburn/branches/libburn_trial/icons/48x48/stock_xfburn-import-session.png xfburn/branches/libburn_trial/icons/scalable/stock_xfburn-import-session.svg Modified: xfburn/branches/libburn_trial/NEWS xfburn/branches/libburn_trial/configure.in.in xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-blank-cdrw.png xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-burn-cd.png xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-data-copy.png xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-import-session.png xfburn/branches/libburn_trial/icons/32x32/Makefile.am xfburn/branches/libburn_trial/icons/48x48/Makefile.am xfburn/branches/libburn_trial/icons/Makefile.am xfburn/branches/libburn_trial/icons/scalable/Makefile.am xfburn/branches/libburn_trial/xfburn/xfburn-adding-progress.c xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c xfburn/branches/libburn_trial/xfburn/xfburn-fs-browser.c xfburn/branches/libburn_trial/xfburn/xfburn-main.c Log: * add 'pretty' smaller icons * update NEWS Modified: xfburn/branches/libburn_trial/NEWS === --- xfburn/branches/libburn_trial/NEWS 2007-01-09 15:25:38 UTC (rev 24332) +++ xfburn/branches/libburn_trial/NEWS 2007-01-09 16:11:08 UTC (rev 24333) @@ -1,11 +1,14 @@ xfburn 0.x == +- Use libburn (libburnia.pykix.org) instead of cdrecord tools - Avoid adding non regular files (bug #2179) -- Fix wrong get_speed call in burn iso dialog - Directory are sort before files in data composition - Fix segfault when removing a file and one of its parent directory together -- Add create ISO from DVD support +- Try to use media-optical and media-cdrom as themable icon before gtk-cdrom in order to avoid crappy png icon being shown in Preferences dialog +- Fix icon size in filesystem browser +- Add icons for actions based on icons from the Tango icontheme +- Detect supported speeds xfburn 0.2.0beta Modified: xfburn/branches/libburn_trial/configure.in.in === --- xfburn/branches/libburn_trial/configure.in.in 2007-01-09 15:25:38 UTC (rev 24332) +++ xfburn/branches/libburn_trial/configure.in.in 2007-01-09 16:11:08 UTC (rev 24333) @@ -43,6 +43,8 @@ AC_OUTPUT([ Makefile icons/Makefile +icons/16x16/Makefile +icons/22x22/Makefile icons/24x24/Makefile icons/32x32/Makefile icons/48x48/Makefile Property changes on: xfburn/branches/libburn_trial/icons/16x16 ___ Name: svn:ignore + Makefile.in Makefile Added: xfburn/branches/libburn_trial/icons/16x16/Makefile.am === --- xfburn/branches/libburn_trial/icons/16x16/Makefile.am (rev 0) +++ xfburn/branches/libburn_trial/icons/16x16/Makefile.am 2007-01-09 16:11:08 UTC (rev 24333) @@ -0,0 +1,9 @@ +iconsdir = $(datadir)/icons/hicolor/16x16/stock/media +icons_DATA = \ + stock_xfburn-blank-cdrw.png \ + stock_xfburn-burn-cd.png\ + stock_xfburn-data-copy.png \ + stock_xfburn-import-session.png + +EXTRA_DIST = \ + $(icons_DATA) Added: xfburn/branches/libburn_trial/icons/16x16/stock_xfburn-blank-cdrw.png === (Binary files differ) Property changes on: xfburn/branches/libburn_trial/icons/16x16/stock_xfburn-blank-cdrw.png ___ Name: svn:mime-type + application/octet-stream Added: xfburn/branches/libburn_trial/icons/16x16/stock_xfburn-burn-cd.png ===
[Xfce4-commits] r24334 - in xfburn/trunk: . xfburn
Author: pollux Date: 2007-01-09 17:47:03 + (Tue, 09 Jan 2007) New Revision: 24334 Removed: xfburn/trunk/icons/ Modified: xfburn/trunk/configure.in.in xfburn/trunk/xfburn/xfburn-burn-data-composition-progress-dialog.h xfburn/trunk/xfburn/xfburn-create-iso-from-composition-progress-dialog.h xfburn/trunk/xfburn/xfburn-progress-dialog.h Log: remove icons in order to backport new icons Modified: xfburn/trunk/configure.in.in === --- xfburn/trunk/configure.in.in2007-01-09 16:11:08 UTC (rev 24333) +++ xfburn/trunk/configure.in.in2007-01-09 17:47:03 UTC (rev 24334) @@ -59,7 +59,12 @@ AC_OUTPUT([ Makefile icons/Makefile +icons/16x16/Makefile +icons/22x22/Makefile icons/24x24/Makefile +icons/32x32/Makefile +icons/48x48/Makefile +icons/scalable/Makefile po/Makefile.in xfburn/Makefile ]) Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-progress-dialog.h === --- xfburn/trunk/xfburn/xfburn-burn-data-composition-progress-dialog.h 2007-01-09 16:11:08 UTC (rev 24333) +++ xfburn/trunk/xfburn/xfburn-burn-data-composition-progress-dialog.h 2007-01-09 17:47:03 UTC (rev 24334) @@ -47,7 +47,7 @@ GtkType xfburn_burn_data_composition_progress_dialog_get_type (); -GtkWidget *xfburn_burn_data_composition_progress_dialog_new (); +GtkWidget *xfburn_burn_data_composition_progress_dialog_new (GPid pid_command, int fd_stdout, int fd_stderr); G_END_DECLS Modified: xfburn/trunk/xfburn/xfburn-create-iso-from-composition-progress-dialog.h === --- xfburn/trunk/xfburn/xfburn-create-iso-from-composition-progress-dialog.h 2007-01-09 16:11:08 UTC (rev 24333) +++ xfburn/trunk/xfburn/xfburn-create-iso-from-composition-progress-dialog.h 2007-01-09 17:47:03 UTC (rev 24334) @@ -48,7 +48,7 @@ } XfburnCreateIsoFromCompositionProgressDialogClass; GtkType xfburn_create_iso_from_composition_progress_dialog_get_type (); -GtkWidget *xfburn_create_iso_from_composition_progress_dialog_new (); +GtkWidget *xfburn_create_iso_from_composition_progress_dialog_new (GPid pid_command, gint fd_stdout, gint fd_stderr); G_END_DECLS Modified: xfburn/trunk/xfburn/xfburn-progress-dialog.h === --- xfburn/trunk/xfburn/xfburn-progress-dialog.h2007-01-09 16:11:08 UTC (rev 24333) +++ xfburn/trunk/xfburn/xfburn-progress-dialog.h2007-01-09 17:47:03 UTC (rev 24334) @@ -81,8 +81,6 @@ void xfburn_progress_dialog_set_writing_speed (XfburnProgressDialog * dialog, gfloat speed); void xfburn_progress_dialog_set_status (XfburnProgressDialog * dialog, XfburnProgressDialogStatus status); -GtkWidget *xfburn_progress_dialog_new (); - G_END_DECLS #endif /* XFBURN_PROGRESS_DIALOG_H */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24336 - xfburn/trunk
Author: pollux Date: 2007-01-09 18:03:53 + (Tue, 09 Jan 2007) New Revision: 24336 Modified: xfburn/trunk/NEWS Log: update NEWS Modified: xfburn/trunk/NEWS === --- xfburn/trunk/NEWS 2007-01-09 17:51:06 UTC (rev 24335) +++ xfburn/trunk/NEWS 2007-01-09 18:03:53 UTC (rev 24336) @@ -6,6 +6,7 @@ - Directory are sort before files in data composition - Fix segfault when removing a file and one of its parent directory together - Add create ISO from DVD support +- Add new icons based on icons from the Tango icontheme xfburn 0.2.0beta ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24308 - in xfburn/branches/libburn_trial: . icons icons/24x24 icons/32x32 icons/48x48 icons/scalable
Author: pollux Date: 2007-01-08 13:01:31 + (Mon, 08 Jan 2007) New Revision: 24308 Added: xfburn/branches/libburn_trial/icons/32x32/ xfburn/branches/libburn_trial/icons/32x32/Makefile.am xfburn/branches/libburn_trial/icons/32x32/stock_xfburn-burn-cd.png xfburn/branches/libburn_trial/icons/48x48/ xfburn/branches/libburn_trial/icons/48x48/Makefile.am xfburn/branches/libburn_trial/icons/48x48/stock_xfburn-burn-cd.png xfburn/branches/libburn_trial/icons/scalable/ xfburn/branches/libburn_trial/icons/scalable/Makefile.am xfburn/branches/libburn_trial/icons/scalable/stock_xfburn-burn-cd.svg Modified: xfburn/branches/libburn_trial/configure.in.in xfburn/branches/libburn_trial/icons/24x24/Makefile.am xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-cd.png xfburn/branches/libburn_trial/icons/Makefile.am Log: use custom icon Modified: xfburn/branches/libburn_trial/configure.in.in === --- xfburn/branches/libburn_trial/configure.in.in 2007-01-08 12:45:31 UTC (rev 24307) +++ xfburn/branches/libburn_trial/configure.in.in 2007-01-08 13:01:31 UTC (rev 24308) @@ -44,6 +44,9 @@ Makefile icons/Makefile icons/24x24/Makefile +icons/32x32/Makefile +icons/48x48/Makefile +icons/scalable/Makefile po/Makefile.in xfburn/Makefile ]) Modified: xfburn/branches/libburn_trial/icons/24x24/Makefile.am === --- xfburn/branches/libburn_trial/icons/24x24/Makefile.am 2007-01-08 12:45:31 UTC (rev 24307) +++ xfburn/branches/libburn_trial/icons/24x24/Makefile.am 2007-01-08 13:01:31 UTC (rev 24308) @@ -1,4 +1,4 @@ -iconsdir = $(datadir)/icons/hicolor/24x24/stock/navigation +iconsdir = $(datadir)/icons/hicolor/24x24/stock/media icons_DATA = \ stock_xfburn-audio-copy.png \ stock_xfburn-blank-cdrw.png \ Modified: xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-cd.png === (Binary files differ) Property changes on: xfburn/branches/libburn_trial/icons/32x32 ___ Name: svn:ignore + Makefile Makefile.in Added: xfburn/branches/libburn_trial/icons/32x32/Makefile.am === --- xfburn/branches/libburn_trial/icons/32x32/Makefile.am (rev 0) +++ xfburn/branches/libburn_trial/icons/32x32/Makefile.am 2007-01-08 13:01:31 UTC (rev 24308) @@ -0,0 +1,7 @@ +iconsdir = $(datadir)/icons/hicolor/32x32/stock/media +icons_DATA = \ + stock_xfburn-burn-cd.png + +EXTRA_DIST = \ + $(icons_DATA) + Added: xfburn/branches/libburn_trial/icons/32x32/stock_xfburn-burn-cd.png === (Binary files differ) Property changes on: xfburn/branches/libburn_trial/icons/32x32/stock_xfburn-burn-cd.png ___ Name: svn:mime-type + application/octet-stream Property changes on: xfburn/branches/libburn_trial/icons/48x48 ___ Name: svn:ignore + Makefile Makefile.in Added: xfburn/branches/libburn_trial/icons/48x48/Makefile.am === --- xfburn/branches/libburn_trial/icons/48x48/Makefile.am (rev 0) +++ xfburn/branches/libburn_trial/icons/48x48/Makefile.am 2007-01-08 13:01:31 UTC (rev 24308) @@ -0,0 +1,7 @@ +iconsdir = $(datadir)/icons/hicolor/48x48/stock/media +icons_DATA = \ + stock_xfburn-burn-cd.png + +EXTRA_DIST = \ + $(icons_DATA) + Added: xfburn/branches/libburn_trial/icons/48x48/stock_xfburn-burn-cd.png === (Binary files differ) Property changes on: xfburn/branches/libburn_trial/icons/48x48/stock_xfburn-burn-cd.png ___ Name: svn:mime-type + application/octet-stream Modified: xfburn/branches/libburn_trial/icons/Makefile.am === --- xfburn/branches/libburn_trial/icons/Makefile.am 2007-01-08 12:45:31 UTC (rev 24307) +++ xfburn/branches/libburn_trial/icons/Makefile.am 2007-01-08 13:01:31 UTC (rev 24308) @@ -1,4 +1,6 @@ -SUBDIRS = 24x24 +SUBDIRS = \ + 24x24
[Xfce4-commits] r24314 - xfburn/branches/libburn_trial/icons/24x24
Author: pollux Date: 2007-01-08 15:16:47 + (Mon, 08 Jan 2007) New Revision: 24314 Added: xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-burn-cd.png Removed: xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-burn-cd.png xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-cd.png Modified: xfburn/branches/libburn_trial/icons/24x24/Makefile.am Log: wrong filename Modified: xfburn/branches/libburn_trial/icons/24x24/Makefile.am === --- xfburn/branches/libburn_trial/icons/24x24/Makefile.am 2007-01-08 13:55:30 UTC (rev 24313) +++ xfburn/branches/libburn_trial/icons/24x24/Makefile.am 2007-01-08 15:16:47 UTC (rev 24314) @@ -4,7 +4,6 @@ stock_xfburn-blank-cdrw.png \ stock_xfburn-format-dvdrw.png \ stock_xfburn-burn-cd.png\ - stock_xfburn-cd.png \ stock_xfburn-data-copy.png \ stock_xfburn-import-session.png Deleted: xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-burn-cd.png Copied: xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-burn-cd.png (from rev 24308, xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-cd.png) === (Binary files differ) Deleted: xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-cd.png ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24322 - in xfburn/branches/libburn_trial/icons: . 24x24 32x32 48x48 scalable
Author: pollux Date: 2007-01-08 20:53:52 + (Mon, 08 Jan 2007) New Revision: 24322 Added: xfburn/branches/libburn_trial/icons/32x32/stock_xfburn-blank-cdrw.png xfburn/branches/libburn_trial/icons/48x48/stock_xfburn-blank-cdrw.png xfburn/branches/libburn_trial/icons/scalable/stock_xfburn-blank-cdrw.svg Modified: xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-blank-cdrw.png xfburn/branches/libburn_trial/icons/32x32/Makefile.am xfburn/branches/libburn_trial/icons/48x48/Makefile.am xfburn/branches/libburn_trial/icons/Makefile.am xfburn/branches/libburn_trial/icons/scalable/Makefile.am Log: icon for cdrw blanking Modified: xfburn/branches/libburn_trial/icons/24x24/stock_xfburn-blank-cdrw.png === (Binary files differ) Modified: xfburn/branches/libburn_trial/icons/32x32/Makefile.am === --- xfburn/branches/libburn_trial/icons/32x32/Makefile.am 2007-01-08 19:55:00 UTC (rev 24321) +++ xfburn/branches/libburn_trial/icons/32x32/Makefile.am 2007-01-08 20:53:52 UTC (rev 24322) @@ -1,5 +1,6 @@ iconsdir = $(datadir)/icons/hicolor/32x32/stock/media icons_DATA = \ + stock_xfburn-blank-cdrw.png \ stock_xfburn-burn-cd.png\ stock_xfburn-data-copy.png Added: xfburn/branches/libburn_trial/icons/32x32/stock_xfburn-blank-cdrw.png === (Binary files differ) Property changes on: xfburn/branches/libburn_trial/icons/32x32/stock_xfburn-blank-cdrw.png ___ Name: svn:mime-type + application/octet-stream Modified: xfburn/branches/libburn_trial/icons/48x48/Makefile.am === --- xfburn/branches/libburn_trial/icons/48x48/Makefile.am 2007-01-08 19:55:00 UTC (rev 24321) +++ xfburn/branches/libburn_trial/icons/48x48/Makefile.am 2007-01-08 20:53:52 UTC (rev 24322) @@ -1,5 +1,6 @@ iconsdir = $(datadir)/icons/hicolor/48x48/stock/media icons_DATA = \ + stock_xfburn-blank-cdrw.png \ stock_xfburn-burn-cd.png\ stock_xfburn-data-copy.png Added: xfburn/branches/libburn_trial/icons/48x48/stock_xfburn-blank-cdrw.png === (Binary files differ) Property changes on: xfburn/branches/libburn_trial/icons/48x48/stock_xfburn-blank-cdrw.png ___ Name: svn:mime-type + application/octet-stream Modified: xfburn/branches/libburn_trial/icons/Makefile.am === --- xfburn/branches/libburn_trial/icons/Makefile.am 2007-01-08 19:55:00 UTC (rev 24321) +++ xfburn/branches/libburn_trial/icons/Makefile.am 2007-01-08 20:53:52 UTC (rev 24322) @@ -1,5 +1,7 @@ SUBDIRS = \ 24x24 \ + 32x32 \ + 48x48 \ scalable gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor Modified: xfburn/branches/libburn_trial/icons/scalable/Makefile.am === --- xfburn/branches/libburn_trial/icons/scalable/Makefile.am2007-01-08 19:55:00 UTC (rev 24321) +++ xfburn/branches/libburn_trial/icons/scalable/Makefile.am2007-01-08 20:53:52 UTC (rev 24322) @@ -1,5 +1,6 @@ iconsdir = $(datadir)/icons/hicolor/scalable/stock/media icons_DATA = \ + stock_xfburn-blank-cdrw.svg \ stock_xfburn-burn-cd.svg\ stock_xfburn-data-copy.svg Added: xfburn/branches/libburn_trial/icons/scalable/stock_xfburn-blank-cdrw.svg === --- xfburn/branches/libburn_trial/icons/scalable/stock_xfburn-blank-cdrw.svg (rev 0) +++ xfburn/branches/libburn_trial/icons/scalable/stock_xfburn-blank-cdrw.svg 2007-01-08 20:53:52 UTC (rev 24322) @@ -0,0 +1,1109 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://web.resource.org/cc/; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; +
[Xfce4-commits] r24287 - xfburn/branches/libburn_trial/xfburn
Author: pollux Date: 2007-01-07 15:29:12 + (Sun, 07 Jan 2007) New Revision: 24287 Modified: xfburn/branches/libburn_trial/xfburn/xfburn-preferences-dialog.c Log: try to use media-optical and media-cdrom as themable icon before gtk-cdrom, this should avoid crappy png icon being shown Modified: xfburn/branches/libburn_trial/xfburn/xfburn-preferences-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-preferences-dialog.c 2007-01-07 13:49:03 UTC (rev 24286) +++ xfburn/branches/libburn_trial/xfburn/xfburn-preferences-dialog.c 2007-01-07 15:29:12 UTC (rev 24287) @@ -125,6 +125,7 @@ GtkWidget *frame; GtkWidget *scrolled_window; GtkListStore *icon_store, *store; + gint x,y; GdkPixbuf *icon = NULL; GtkTreeIter iter; GtkTreeViewColumn *column_name; @@ -289,17 +290,22 @@ g_signal_connect (G_OBJECT (priv-button_scan), clicked, G_CALLBACK (scan_button_clicked_cb), obj); gtk_widget_show (priv-button_scan); - icon = gtk_widget_render_icon (GTK_WIDGET (priv-icon_bar), - GTK_STOCK_CDROM, - GTK_ICON_SIZE_DIALOG, - NULL); + gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, x, y); + icon = xfce_themed_icon_load (media-optical, x); + if (!icon) +icon = xfce_themed_icon_load (media-cdrom, x); + if (!icon) +icon = xfce_themed_icon_load (GTK_STOCK_CDROM, x); + + gtk_list_store_append (icon_store, iter); gtk_list_store_set (icon_store, iter, SETTINGS_LIST_PIXBUF_COLUMN, icon, SETTINGS_LIST_TEXT_COLUMN, _(Devices), SETTINGS_LIST_INDEX_COLUMN, index, -1); - g_object_unref (G_OBJECT (icon)); + if (icon) +g_object_unref (G_OBJECT (icon)); exo_mutual_binding_new (G_OBJECT (priv-notebook), page, G_OBJECT (priv-icon_bar), active); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24288 - xfburn/branches/libburn_trial/xfburn
Author: pollux Date: 2007-01-07 16:27:52 + (Sun, 07 Jan 2007) New Revision: 24288 Modified: xfburn/branches/libburn_trial/xfburn/xfburn-device-box.c xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c xfburn/branches/libburn_trial/xfburn/xfburn-device-list.h Log: speed selection (still not accurate and a bit buggy) Modified: xfburn/branches/libburn_trial/xfburn/xfburn-device-box.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-device-box.c2007-01-07 15:29:12 UTC (rev 24287) +++ xfburn/branches/libburn_trial/xfburn/xfburn-device-box.c2007-01-07 16:27:52 UTC (rev 24288) @@ -81,6 +81,7 @@ static void xfburn_device_box_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void xfburn_device_box_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void cb_speed_refresh_clicked (GtkButton *button, XfburnDeviceBox *box); static void cb_combo_device_changed (GtkComboBox *combo, XfburnDeviceBox *box); /* globals */ @@ -151,7 +152,7 @@ { XfburnDeviceBoxPrivate *priv = XFBURN_DEVICE_BOX_GET_PRIVATE (box); - GtkWidget *label; + GtkWidget *label, *img, *button; GList *device = NULL; GtkListStore *store = NULL; GtkCellRenderer *cell; @@ -198,6 +199,15 @@ gtk_widget_show (priv-combo_speed); gtk_box_pack_start (GTK_BOX (priv-hbox_speed_selection), priv-combo_speed, TRUE, TRUE, BORDER); + img = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_widget_show (img); + button = gtk_button_new (); + gtk_container_add (GTK_CONTAINER (button), img); + gtk_widget_show (button); + gtk_box_pack_start (GTK_BOX (priv-hbox_speed_selection), button, FALSE, FALSE, 0); + + g_signal_connect (G_OBJECT (button), clicked, G_CALLBACK (cb_speed_refresh_clicked), box); + /* mode */ priv-hbox_mode_selection = gtk_hbox_new (FALSE, 0); gtk_widget_show (priv-hbox_mode_selection); @@ -279,19 +289,22 @@ { XfburnDeviceBoxPrivate *priv = XFBURN_DEVICE_BOX_GET_PRIVATE (box); GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv-combo_speed)); - gint i; + GSList *el = device-supported_cdr_speeds; gtk_list_store_clear (GTK_LIST_STORE (model)); - for (i = device-min_cdr_speed; i = device-max_cdr_speed; i += 2) { + while (el) { +gint speed = GPOINTER_TO_INT (el-data); GtkTreeIter iter; gchar *str = NULL; -str = g_strdup_printf (%d, i); +str = g_strdup_printf (%d, speed); gtk_list_store_append (GTK_LIST_STORE (model), iter); -gtk_list_store_set (GTK_LIST_STORE (model), iter, SPEED_TEXT_COLUMN, str, SPEED_VALUE_COLUMN, i, -1); +gtk_list_store_set (GTK_LIST_STORE (model), iter, SPEED_TEXT_COLUMN, str, SPEED_VALUE_COLUMN, speed, -1); g_free (str); + +el = g_slist_next (el); } gtk_combo_box_set_active (GTK_COMBO_BOX (priv-combo_speed), gtk_tree_model_iter_n_children (model, NULL) - 1); } @@ -334,6 +347,17 @@ } static void +cb_speed_refresh_clicked (GtkButton *button, XfburnDeviceBox *box) +{ + XfburnDevice *device = NULL; + + device = xfburn_device_box_get_selected_device (box); + xfburn_device_refresh_supported_speeds (device); + + fill_combo_speed (box, device); +} + +static void cb_combo_device_changed (GtkComboBox *combo, XfburnDeviceBox *box) { XfburnDevice *device; Modified: xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c 2007-01-07 15:29:12 UTC (rev 24287) +++ xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c 2007-01-07 16:27:52 UTC (rev 24288) @@ -38,7 +38,7 @@ #define CDR_1X_SPEED 150 /* private */ -static gint supported_cdr_speeds[] = {2, 4, 6, 8, 10, 12, 16, 24, 32, 40, 48, 52, -1}; +static gint supported_cdr_speeds[] = {2, 4, 6, 8, 10, 12, 16, 20, 24, 32, 40, 48, 52, -1}; static GList *devices = NULL; /*/ @@ -49,23 +49,45 @@ { g_free (device-name); g_free (device-node_path); + + g_slist_free (device-supported_cdr_speeds); } static gint get_closest_supported_cdr_speed (gint speed) { + /* TODO: need some fixing */ gint i = 0; + gint previous = 0; while (supported_cdr_speeds[i] != -1) { -if (speed (supported_cdr_speeds[i] * CDR_1X_SPEED)) - return supported_cdr_speeds[i]; -else - i++; +if (speed (supported_cdr_speeds[i] * CDR_1X_SPEED)) { + return supported_cdr_speeds[previous]; +} else + previous = i; +i++; } return 0; } +static gboolean +no_speed_duplicate (GSList *speed_list, gint speed) +{ + GSList *el = speed_list; + + while (el) { +gint el_speed = GPOINTER_TO_INT (el-data); + +if (el_speed == speed) + return FALSE; + +el = g_slist_next (el); + } + + return TRUE; +} + /**/ /* public API */
[Xfce4-commits] r24265 - xfburn/branches/libburn_trial/xfburn
Author: pollux Date: 2007-01-04 17:37:27 + (Thu, 04 Jan 2007) New Revision: 24265 Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c xfburn/branches/libburn_trial/xfburn/xfburn-progress-dialog.c Log: * basic image burning support * fix cd blanking GUI Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2007-01-04 10:42:01 UTC (rev 24264) +++ xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2007-01-04 17:37:27 UTC (rev 24265) @@ -203,7 +203,7 @@ burn_disc_erase(drive, params-blank_type); sleep(1); - xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Blanking disc)); + xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Blanking disc...)); while (burn_drive_get_status (drive, progress) != BURN_DRIVE_IDLE) { if(progress.sectors0 progress.sector=0) { Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2007-01-04 10:42:01 UTC (rev 24264) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2007-01-04 17:37:27 UTC (rev 24265) @@ -213,10 +213,9 @@ struct burn_write_opts * burn_options; enum burn_disc_status disc_state; struct burn_progress progress; + gboolean burning_has_started = FALSE; gint ret; - DBG (starting the burning thread); - disc = burn_disc_create (); session = burn_session_create (); track = burn_track_create (); @@ -251,7 +250,6 @@ } burn_session_add_track (session, track, BURN_POS_END); - DBG (Source is '%s'\n, params-iso_path); burn_source_free (data_src); if (!xfburn_device_grab (params-device, drive_info)) { @@ -311,17 +309,29 @@ DBG (TODO set speed); burn_drive_set_speed (drive, 0, 0); burn_write_opts_set_underrun_proof (burn_options, params-burnfree ? 1 : 0); - - burn_disc_write (burn_options, disc); - + + burn_disc_write (burn_options, disc); burn_write_opts_free (burn_options); + + xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Burning image...)); + while (burn_drive_get_status (drive, NULL) == BURN_DRIVE_SPAWNING) usleep(1002); while (burn_drive_get_status (drive, progress) != BURN_DRIVE_IDLE) { -DBG (TODO progress: %d of %d, progress.sector, progress.sectors); +if (progress.sectors 0 progress.sector = 0) { + gdouble percent = 1.0 + ((gdouble) progress.sector+1.0) / ((gdouble) progress.sectors) * 98.0; + + burning_has_started = TRUE; + xfburn_progress_dialog_set_progress_bar_fraction (XFBURN_PROGRESS_DIALOG (dialog_progress), percent / 100.0); +} else if (burning_has_started progress.sectors == 0) { + xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _(Finalizing disc...)); +} + usleep (50); } + xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_COMPLETED, _(Done)); + cleanup: burn_drive_release (drive, params-eject ? 1 : 0); /* commented because it unleashes hell @@ -336,8 +346,6 @@ g_free (params-iso_path); g_free (params); - - DBG (burning thread terminated); } static void Modified: xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c 2007-01-04 10:42:01 UTC (rev 24264) +++ xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c 2007-01-04 17:37:27 UTC (rev 24265) @@ -38,6 +38,7 @@ #define CDR_1X_SPEED 150 /* private */ +static gint supported_cdr_speeds[] = {2, 4, 6, 8, 10, 12, 16, 24, 32, 40, 48, 52, -1}; static GList *devices = NULL; /*/ @@ -50,6 +51,21 @@ g_free (device-node_path); } +static gint +get_closest_supported_cdr_speed (gint speed) +{ + gint i = 0; + + while (supported_cdr_speeds[i] != -1) { +if (speed (supported_cdr_speeds[i] * CDR_1X_SPEED)) + return supported_cdr_speeds[i]; +else + i++; + } + + return 0; +} + /**/ /* public API */ /**/ Modified: xfburn/branches/libburn_trial/xfburn/xfburn-progress-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-progress-dialog.c 2007-01-04 10:42:01 UTC (rev 24264) +++
[Xfce4-commits] r24222 - in xfburn/branches/libburn_trial: . xfburn
Author: pollux Date: 2006-12-30 20:29:37 + (Sat, 30 Dec 2006) New Revision: 24222 Removed: xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-progress-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-progress-dialog.h xfburn/branches/libburn_trial/xfburn/xfburn-write-mode-combo-box.c xfburn/branches/libburn_trial/xfburn/xfburn-write-mode-combo-box.h Modified: xfburn/branches/libburn_trial/configure.in.in xfburn/branches/libburn_trial/xfburn/Makefile.am xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c xfburn/branches/libburn_trial/xfburn/xfburn-progress-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-progress-dialog.h Log: * make XfburnProgressDialog thread safe * begin of speed detection implementation (requires libburn 2.7svn) Modified: xfburn/branches/libburn_trial/configure.in.in === --- xfburn/branches/libburn_trial/configure.in.in 2006-12-30 14:08:01 UTC (rev 24221) +++ xfburn/branches/libburn_trial/configure.in.in 2006-12-30 20:29:37 UTC (rev 24222) @@ -27,7 +27,7 @@ XDT_I18N([EMAIL PROTECTED]@]) dnl check for required packages -XDT_CHECK_PACKAGE([LIBBURN], [libburn-1], [0.2.6]) +XDT_CHECK_PACKAGE([LIBBURN], [libburn-1], [0.2.7]) XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.2.3]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90]) Modified: xfburn/branches/libburn_trial/xfburn/Makefile.am === --- xfburn/branches/libburn_trial/xfburn/Makefile.am2006-12-30 14:08:01 UTC (rev 24221) +++ xfburn/branches/libburn_trial/xfburn/Makefile.am2006-12-30 20:29:37 UTC (rev 24222) @@ -15,7 +15,6 @@ xfburn-burn-data-composition-dialog.h \ xfburn-burn-data-composition-progress-dialog.h \ xfburn-burn-image-dialog.h \ - xfburn-burn-image-progress-dialog.h \ xfburn-settings.h \ xfburn-composition.h\ xfburn-compositions-notebook.h \ @@ -37,8 +36,7 @@ xfburn-directory-browser.h \ xfburn-preferences-dialog.h \ xfburn-stock.h \ - xfburn-utils.h \ - xfburn-write-mode-combo-box.h + xfburn-utils.h xfburn_SOURCES = \ $(xfburn_headers) \ @@ -63,8 +61,7 @@ xfburn-directory-browser.c \ xfburn-preferences-dialog.c \ xfburn-stock.c \ - xfburn-utils.c \ - xfburn-write-mode-combo-box.c + xfburn-utils.c xfburn_CFLAGS = \ $(LIBBURN_CFLAGS) \ Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2006-12-30 14:08:01 UTC (rev 24221) +++ xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2006-12-30 20:29:37 UTC (rev 24222) @@ -164,10 +164,7 @@ struct burn_progress progress; if (!xfburn_device_grab (params-device, drive_info)) { -gdk_threads_enter (); -xfburn_progress_dialog_set_status (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_FAILED); -xfce_err (_(Unable to grab drive)); -gdk_threads_leave (); +xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _(Unable to grab drive)); goto end; } @@ -183,63 +180,41 @@ switch (disc_state) { case BURN_DISC_BLANK: -gdk_threads_enter (); -xfburn_progress_dialog_set_status (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_FAILED); -xfce_err (_(The inserted disc is already blank)); -gdk_threads_leave (); +xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _(The inserted disc is already blank)); goto cleanup; case BURN_DISC_FULL: case BURN_DISC_APPENDABLE: /* these ones we can blank */ -gdk_threads_enter (); -xfburn_progress_dialog_set_action_text
[Xfce4-commits] r24192 - xfburn/trunk/xfburn
Author: pollux Date: 2006-12-26 19:38:08 + (Tue, 26 Dec 2006) New Revision: 24192 Modified: xfburn/trunk/xfburn/xfburn-directory-browser.c Log: hide symbolic links in directory browser for consistency (related to bug #2688) Modified: xfburn/trunk/xfburn/xfburn-directory-browser.c === --- xfburn/trunk/xfburn/xfburn-directory-browser.c 2006-12-26 00:19:24 UTC (rev 24191) +++ xfburn/trunk/xfburn/xfburn-directory-browser.c 2006-12-26 19:38:08 UTC (rev 24192) @@ -245,6 +245,10 @@ struct stat s; full_path = g_build_filename (path, dir_entry, NULL); +if (g_file_test (full_path, G_FILE_TEST_IS_SYMLINK)) { + g_free (full_path); + continue; +} if (dir_entry[0] != '.' (stat (full_path, s) == 0)) { gchar *humansize; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24193 - xfburn/branches/libburn_trial/xfburn
Author: pollux Date: 2006-12-26 20:46:16 + (Tue, 26 Dec 2006) New Revision: 24193 Modified: xfburn/branches/libburn_trial/xfburn/xfburn-directory-browser.c Log: backport from trunk Modified: xfburn/branches/libburn_trial/xfburn/xfburn-directory-browser.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-directory-browser.c 2006-12-26 19:38:08 UTC (rev 24192) +++ xfburn/branches/libburn_trial/xfburn/xfburn-directory-browser.c 2006-12-26 20:46:16 UTC (rev 24193) @@ -245,6 +245,10 @@ struct stat s; full_path = g_build_filename (path, dir_entry, NULL); +if (g_file_test (full_path, G_FILE_TEST_IS_SYMLINK)) { + g_free (full_path); + continue; +} if (dir_entry[0] != '.' (stat (full_path, s) == 0)) { gchar *humansize; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24187 - xfburn/branches/libburn_trial/xfburn
Author: pollux Date: 2006-12-25 19:05:35 + (Mon, 25 Dec 2006) New Revision: 24187 Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-device-box.c xfburn/branches/libburn_trial/xfburn/xfburn-device-box.h xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c xfburn/branches/libburn_trial/xfburn/xfburn-progress-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-progress-dialog.h Log: can burn iso with libburn but is still unstable Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2006-12-25 11:14:34 UTC (rev 24186) +++ xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2006-12-25 19:05:35 UTC (rev 24187) @@ -168,11 +168,9 @@ gdk_threads_enter (); xfburn_progress_dialog_set_status (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_FAILED); xfce_err (_(Unable to grab drive)); -gtk_widget_destroy (dialog_progress); gdk_threads_leave (); -g_free (params); -return; +goto end; } drive = drive_info-drive; @@ -228,7 +226,7 @@ xfburn_progress_dialog_set_status (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING); gdk_threads_leave (); - while (burn_drive_get_status(drive, progress) != BURN_DRIVE_IDLE) { + while (burn_drive_get_status (drive, progress) != BURN_DRIVE_IDLE) { if(progress.sectors0 progress.sector=0) { gdouble percent = 1.0 + ((gdouble) progress.sector+1.0) / ((gdouble) progress.sectors) * 98.0; @@ -246,15 +244,16 @@ cleanup: burn_drive_release (drive, params-eject ? 1 : 0); + while (burn_drive_get_status (drive, progress) != BURN_DRIVE_IDLE) { +DBG (waiting for release); +usleep (50); + } ret = burn_drive_info_forget (drive_info, 1); if (ret != 1) g_error (Unable to drop drive %s (ret=%d). Please report problem to [EMAIL PROTECTED], params-device-name, ret); burn_drive_info_free (drive_info); - gdk_threads_enter (); - gtk_widget_destroy (dialog_progress); - gdk_threads_leave (); - + end: g_free (params); } @@ -284,11 +283,9 @@ blank_type = 1; } -dialog_progress = xfburn_progress_dialog_new (); -gtk_window_set_transient_for (GTK_WINDOW (dialog_progress), gtk_window_get_transient_for (GTK_WINDOW (dialog))); +dialog_progress = xfburn_progress_dialog_new (GTK_WINDOW (dialog)); gtk_widget_hide (GTK_WIDGET (dialog)); -xfburn_progress_dialog_set_action_text (XFBURN_PROGRESS_DIALOG (dialog_progress), _(Initializing)); gtk_widget_show (dialog_progress); params = g_new0 (ThreadBlankParams, 1); Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2006-12-25 11:14:34 UTC (rev 24186) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2006-12-25 19:05:35 UTC (rev 24187) @@ -21,6 +21,11 @@ #include config.h #endif /* !HAVE_CONFIG_H */ +#include sys/types.h +#include sys/stat.h +#include unistd.h +#include fcntl.h + #include gtk/gtk.h #include xfburn-global.h @@ -172,57 +177,222 @@ device = xfburn_device_box_get_selected_device (XFBURN_DEVICE_BOX (priv-device_box)); if (device) -gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-check_dummy), !device-dummy_write); +gtk_widget_set_sensitive (priv-check_dummy, device-dummy_write); } /*/ /* internals */ /*/ +typedef struct { + GtkWidget *dialog_progress; + XfburnDevice *device; + gchar *iso_path; + gint speed; + XfburnWriteMode write_mode; + gboolean eject; + gboolean dummy; + gboolean burnfree; +} ThreadBurnIsoParams; + static void +thread_burn_iso (ThreadBurnIsoParams * params) +{ + GtkWidget *dialog_progress = params-dialog_progress; + + struct burn_disc *disc; + struct burn_session *session; + struct burn_track *track; + + gint fd; + struct stat stbuf; + off_t fixed_size = 0; + struct burn_source *data_src; + + struct burn_drive_info *drive_info = NULL; + struct burn_drive *drive; + + struct burn_write_opts * burn_options; + enum burn_disc_status disc_state; + struct burn_progress progress; + gint ret; + + DBG (starting the burning thread); + + disc = burn_disc_create (); + session = burn_session_create (); + track = burn_track_create (); + + ret = burn_disc_add_session (disc, session, BURN_POS_END); + if (ret == 0) { +xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _(Unable to create disc object)); +goto end; + } + + burn_track_define_data (track, 0, 300*1024, 1, BURN_MODE1); + + fd =
[Xfce4-commits] r24188 - xfburn/branches/libburn_trial/xfburn
Author: pollux Date: 2006-12-25 19:45:32 + (Mon, 25 Dec 2006) New Revision: 24188 Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c Log: no more crash but not sure it doesn't leak some mem Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2006-12-25 19:05:35 UTC (rev 24187) +++ xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2006-12-25 19:45:32 UTC (rev 24188) @@ -162,7 +162,6 @@ struct burn_drive *drive; enum burn_disc_status disc_state; struct burn_progress progress; - gint ret; if (!xfburn_device_grab (params-device, drive_info)) { gdk_threads_enter (); @@ -244,15 +243,11 @@ cleanup: burn_drive_release (drive, params-eject ? 1 : 0); - while (burn_drive_get_status (drive, progress) != BURN_DRIVE_IDLE) { -DBG (waiting for release); -usleep (50); - } - ret = burn_drive_info_forget (drive_info, 1); - if (ret != 1) -g_error (Unable to drop drive %s (ret=%d). Please report problem to [EMAIL PROTECTED], params-device-name, ret); + /* commented because it unleashes hell + DBG (drive_info: %p, drive_info); + burn_drive_info_free (drive_info); - + */ end: g_free (params); } Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2006-12-25 19:05:35 UTC (rev 24187) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2006-12-25 19:45:32 UTC (rev 24188) @@ -325,17 +325,11 @@ cleanup: burn_drive_release (drive, params-eject ? 1 : 0); - while (burn_drive_get_status (drive, progress) != BURN_DRIVE_IDLE) { -DBG (waiting for release); -usleep (50); - } - + /* commented because it unleashes hell DBG (drive_info: %p, drive_info); - ret = burn_drive_info_forget (drive_info, 1); - if (ret != 1) -g_error (Unable to drop drive %s (ret=%d). Please report problem to [EMAIL PROTECTED], params-device-name, ret); + burn_drive_info_free (drive_info); - + */ end: burn_track_free (track); burn_session_free (session); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24182 - in xfburn/branches/libburn_trial: . xfburn
Author: pollux Date: 2006-12-24 16:13:31 + (Sun, 24 Dec 2006) New Revision: 24182 Modified: xfburn/branches/libburn_trial/xfburn-toolbars.ui xfburn/branches/libburn_trial/xfburn.ui xfburn/branches/libburn_trial/xfburn/Makefile.am xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-device-box.c xfburn/branches/libburn_trial/xfburn/xfburn-device-box.h xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c xfburn/branches/libburn_trial/xfburn/xfburn-device-list.h xfburn/branches/libburn_trial/xfburn/xfburn-main-window.c Log: * remove dvd actions from GUI * add filters in image selection dialog * improve XfburnDeviceBox Modified: xfburn/branches/libburn_trial/xfburn/Makefile.am === --- xfburn/branches/libburn_trial/xfburn/Makefile.am2006-12-24 15:01:41 UTC (rev 24181) +++ xfburn/branches/libburn_trial/xfburn/Makefile.am2006-12-24 16:13:31 UTC (rev 24182) @@ -44,6 +44,7 @@ $(xfburn_headers) \ xfburn-adding-progress.c\ xfburn-blank-cd-dialog.c\ + xfburn-burn-image-dialog.c \ xfburn-composition.c\ xfburn-compositions-notebook.c \ xfburn-settings.c \ Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2006-12-24 15:01:41 UTC (rev 24181) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2006-12-24 16:13:31 UTC (rev 24182) @@ -95,6 +95,7 @@ XfburnBurnImageDialogPrivate *priv = XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE (obj); GdkPixbuf *icon = NULL; + GtkFileFilter *filter; GtkWidget *frame; GtkWidget *vbox; GtkWidget *hbox; @@ -111,6 +112,16 @@ priv-chooser_image = gtk_file_chooser_button_new (_(Image to burn), GTK_FILE_CHOOSER_ACTION_OPEN); gtk_widget_show (priv-chooser_image); + filter = gtk_file_filter_new (); + gtk_file_filter_set_name (filter, _(All files)); + gtk_file_filter_add_pattern (filter, *); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(priv-chooser_image), filter); + filter = gtk_file_filter_new (); + gtk_file_filter_set_name (filter, _(ISO images)); + gtk_file_filter_add_pattern (filter, *.iso); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (priv-chooser_image), filter); + gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (priv-chooser_image), filter); + frame = xfce_create_framebox_with_content (_(Image to burn), priv-chooser_image); gtk_widget_show (frame); gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER); @@ -179,6 +190,7 @@ static void xfburn_burn_image_dialog_response_cb (XfburnBurnImageDialog * dialog, gint response_id, gpointer user_data) { + /* if (response_id == GTK_RESPONSE_OK) { XfburnBurnImageDialogPrivate *priv = XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE (dialog); XfburnDevice *device; @@ -211,6 +223,7 @@ g_free (command); } + */ } /* public */ Modified: xfburn/branches/libburn_trial/xfburn/xfburn-device-box.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-device-box.c2006-12-24 15:01:41 UTC (rev 24181) +++ xfburn/branches/libburn_trial/xfburn/xfburn-device-box.c2006-12-24 16:13:31 UTC (rev 24182) @@ -40,6 +40,18 @@ PROP_SHOW_SPEED_SELECTION, }; +enum { + DEVICE_NAME_COLUMN, + DEVICE_POINTER_COLUMN, + DEVICE_N_COLUMNS, +}; + +enum { + SPEED_TEXT_COLUMN, + SPEED_VALUE_COLUMN, + SPEED_N_COLUMNS, +}; + /* private struct */ typedef struct { @@ -58,6 +70,7 @@ static void xfburn_device_box_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void xfburn_device_box_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void fill_combo_speed (XfburnDeviceBox *box); static void cb_combo_device_changed (GtkComboBox *combo, XfburnDeviceBox *box); /* globals */ @@ -124,12 +137,19 @@ { XfburnDeviceBoxPrivate *priv = XFBURN_DEVICE_BOX_GET_PRIVATE (box); - GtkWidget *label, *img, *button; + GtkWidget *label; GList *device = NULL; - gint i; + GtkListStore *store = NULL; + GtkCellRenderer *cell; /* devices */ - priv-combo_device = gtk_combo_box_new_text (); + store = gtk_list_store_new (DEVICE_N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER); + priv-combo_device = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store)); + g_object_unref (store); + + cell = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT
[Xfce4-commits] r24183 - xfburn/branches/libburn_trial/xfburn
Author: pollux Date: 2006-12-24 20:49:17 + (Sun, 24 Dec 2006) New Revision: 24183 Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-copy-dvd-dialog.c xfburn/branches/libburn_trial/xfburn/xfburn-device-box.c xfburn/branches/libburn_trial/xfburn/xfburn-device-box.h xfburn/branches/libburn_trial/xfburn/xfburn-device-list.c xfburn/branches/libburn_trial/xfburn/xfburn-device-list.h xfburn/branches/libburn_trial/xfburn/xfburn-format-dvd-dialog.c Log: * add some info in XfburnDevice struct * add write mode selection combo in XfburnDeviceBox * improve XfburnBurnImageDialog a bit * Merry Christmas Modified: xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2006-12-24 16:13:31 UTC (rev 24182) +++ xfburn/branches/libburn_trial/xfburn/xfburn-blank-cd-dialog.c 2006-12-24 20:49:17 UTC (rev 24183) @@ -100,7 +100,7 @@ g_object_unref (icon); /* devices list */ - priv-device_box = xfburn_device_box_new (TRUE, FALSE); + priv-device_box = xfburn_device_box_new (TRUE, FALSE, FALSE); gtk_widget_show (priv-device_box); frame = xfce_create_framebox_with_content (_(Burning device), priv-device_box); Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c === --- xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2006-12-24 16:13:31 UTC (rev 24182) +++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c 2006-12-24 20:49:17 UTC (rev 24183) @@ -39,7 +39,6 @@ GtkWidget *chooser_image; GtkWidget *device_box; - GtkWidget *combo_mode; GtkWidget *check_eject; GtkWidget *check_burnfree; @@ -50,7 +49,8 @@ static void xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass); static void xfburn_burn_image_dialog_init (XfburnBurnImageDialog * sp); -static void xfburn_burn_image_dialog_response_cb (XfburnBurnImageDialog * dialog, gint response_id, gpointer user_data); +static void cb_device_changed (XfburnDeviceBox *box, XfburnDevice *device, XfburnBurnImageDialog * dialog); +static void cb_dialog_response (XfburnBurnImageDialog * dialog, gint response_id, gpointer user_data); /*/ /* class declaration */ @@ -98,9 +98,8 @@ GtkFileFilter *filter; GtkWidget *frame; GtkWidget *vbox; - GtkWidget *hbox; - GtkWidget *label; GtkWidget *button; + XfburnDevice *device; gtk_window_set_title (GTK_WINDOW (obj), _(Burn CD image)); gtk_window_set_destroy_with_parent (GTK_WINDOW (obj), TRUE); @@ -127,26 +126,13 @@ gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER); /* devices list */ - priv-device_box = xfburn_device_box_new (TRUE, TRUE); + priv-device_box = xfburn_device_box_new (TRUE, TRUE, TRUE); gtk_widget_show (priv-device_box); frame = xfce_create_framebox_with_content (_(Burning device), priv-device_box); gtk_widget_show (frame); gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER); - /* mode */ - hbox = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox); - gtk_box_pack_start (GTK_BOX (priv-device_box), hbox, FALSE, FALSE, BORDER); - - label = gtk_label_new_with_mnemonic (_(Write _mode :)); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, BORDER); - - priv-combo_mode = xfburn_write_mode_combo_box_new (); - gtk_box_pack_start (GTK_BOX (hbox), priv-combo_mode, TRUE, TRUE, BORDER); - gtk_widget_show (priv-combo_mode); - /* options */ vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox); @@ -181,15 +167,28 @@ gtk_widget_grab_focus (button); gtk_widget_grab_default (button); - g_signal_connect (G_OBJECT (obj), response, G_CALLBACK (xfburn_burn_image_dialog_response_cb), obj); + g_signal_connect (G_OBJECT (priv-device_box), device-changed, G_CALLBACK (cb_device_changed), obj); + g_signal_connect (G_OBJECT (obj), response, G_CALLBACK (cb_dialog_response), obj); + + device = xfburn_device_box_get_selected_device (XFBURN_DEVICE_BOX (priv-device_box)); + if (device) +gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-check_dummy), !device-dummy_write); } /*/ /* internals */ /*/ static void -xfburn_burn_image_dialog_response_cb (XfburnBurnImageDialog * dialog, gint response_id, gpointer user_data) +cb_device_changed (XfburnDeviceBox *box, XfburnDevice *device, XfburnBurnImageDialog * dialog) { + XfburnBurnImageDialogPrivate *priv = XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE (dialog); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-check_dummy), !device-dummy_write); +} + +static void +cb_dialog_response (XfburnBurnImageDialog * dialog, gint response_id, gpointer
[Xfce4-commits] r24173 - xfburn/trunk/xfburn
Author: pollux Date: 2006-12-23 12:37:09 + (Sat, 23 Dec 2006) New Revision: 24173 Modified: xfburn/trunk/xfburn/xfburn-progress-dialog.c Log: Apply patch from Jasper to prevent crash when closing the Blanking CD dialog (fix bug #2679) Modified: xfburn/trunk/xfburn/xfburn-progress-dialog.c === --- xfburn/trunk/xfburn/xfburn-progress-dialog.c2006-12-23 02:25:17 UTC (rev 24172) +++ xfburn/trunk/xfburn/xfburn-progress-dialog.c2006-12-23 12:37:09 UTC (rev 24173) @@ -499,12 +499,12 @@ static void cb_dialog_response (XfburnProgressDialog * dialog, gint response_id, XfburnProgressDialogPrivate * priv) { + g_signal_emit (G_OBJECT (dialog), signals[FINISHED], 0); if (response_id == GTK_RESPONSE_CANCEL) { if (priv-pid_command 0) { kill (priv-pid_command, SIGTERM); priv-pid_command = -1; } - gtk_widget_set_sensitive (priv-button_stop, FALSE); priv-status = XFBURN_PROGRESS_DIALOG_STATUS_CANCELLED; } else if (response_id == GTK_RESPONSE_CLOSE) @@ -688,7 +688,9 @@ xfburn_progress_dialog_set_status (XfburnProgressDialog * dialog, XfburnProgressDialogStatus status) { XfburnProgressDialogPrivate *priv = XFBURN_PROGRESS_DIALOG_GET_PRIVATE (dialog); - + + if (status == XFBURN_PROGRESS_DIALOG_STATUS_COMPLETED) +g_signal_emit (G_OBJECT (dialog), signals[FINISHED], 0); priv-status = status; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24036 - xfburn/branches
Author: pollux Date: 2006-12-03 15:58:41 + (Sun, 03 Dec 2006) New Revision: 24036 Added: xfburn/branches/libburn_trial/ Log: create a branch to try to make xfburn directly work with libburn and friends Copied: xfburn/branches/libburn_trial (from rev 24035, xfburn/trunk) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r24038 - xfburn/branches/libburn_trial
Author: pollux Date: 2006-12-03 19:02:14 + (Sun, 03 Dec 2006) New Revision: 24038 Modified: xfburn/branches/libburn_trial/configure.in.in Log: workaround to libburn little bug, so Moe can compile :p Modified: xfburn/branches/libburn_trial/configure.in.in === --- xfburn/branches/libburn_trial/configure.in.in 2006-12-03 18:35:22 UTC (rev 24037) +++ xfburn/branches/libburn_trial/configure.in.in 2006-12-03 19:02:14 UTC (rev 24038) @@ -27,7 +27,7 @@ XDT_I18N([EMAIL PROTECTED]@]) dnl check for required packages -XDT_CHECK_PACKAGE([LIBBURN], [libburn-1], [0.2.6.1]) +XDT_CHECK_PACKAGE([LIBBURN], [libburn-1], [0.2.6]) XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.2.3]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23995 - xfdesktop/trunk
Author: pollux Date: 2006-11-27 20:02:58 + (Mon, 27 Nov 2006) New Revision: 23995 Modified: xfdesktop/trunk/menu.xml.ca Log: updated Catalan translations Modified: xfdesktop/trunk/menu.xml.ca === --- xfdesktop/trunk/menu.xml.ca 2006-11-27 19:12:19 UTC (rev 23994) +++ xfdesktop/trunk/menu.xml.ca 2006-11-27 20:02:58 UTC (rev 23995) @@ -95,7 +95,7 @@ sortida. Si xfce4-session no s'està executant farà que xfdesktop acabi. -- -builtin name=Quit cmd=quit icon=minipower / +builtin name=Quit cmd=quit icon=gnome-logout / /xfdesktop-menu ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23791 - in xfprint/trunk: . icons icons/24x24 icons/48x48 icons/scalable
Author: pollux Date: 2006-11-09 10:54:59 + (Thu, 09 Nov 2006) New Revision: 23791 Modified: xfprint/trunk/configure.in.in xfprint/trunk/icons/ xfprint/trunk/icons/24x24/ xfprint/trunk/icons/48x48/ xfprint/trunk/icons/scalable/ Log: use Brian's trick to ease bumping version requirements Modified: xfprint/trunk/configure.in.in === --- xfprint/trunk/configure.in.in 2006-11-09 07:47:52 UTC (rev 23790) +++ xfprint/trunk/configure.in.in 2006-11-09 10:54:59 UTC (rev 23791) @@ -21,6 +21,10 @@ m4_define([xfprint_version_tag], [svn]) m4_define([xfprint_version], [xfprint_version_major().xfprint_version_minor().xfprint_version_micro()ifelse(xfprint_version_nano(), [], [], [.xfprint_version_nano()])ifelse(xfprint_version_tag(), [svn], [xfprint_version_tag()-xfprint_version_build()], [xfprint_version_tag()])]) +dnl minimum required versions +m4_define([gtk_minimum_version], [2.6.0]) +m4_define([xfce_minimum_version], [4.3.99.2]) + dnl # DO NOT MODIFY ANYTHING BELOW THIS LINE, UNLESS YOU KNOW WHAT dnl # YOU ARE DOING. @@ -78,25 +82,25 @@ dnl Check for i18n support XDT_I18N([EMAIL PROTECTED]@]) -dnl Check for gmodule = 2.2.0 -XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.6.0]) +dnl Check for gmodule +XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [gtk_minimum_version]) -dnl check for glib = 2.2.0 -XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.0]) +dnl check for glib +XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [gtk_minimum_version]) -dnl Check for gtk = 2.2.0 -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) +dnl Check for gtk +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version]) -dnl Check for libxfcegui4 = 4.3.90.2 installed -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2]) +dnl Check for libxfcegui4 +XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [xfce_minimum_version]) -dnl Check for libxfce4util = 4.3.90.2 installed -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2]) +dnl Check for libxfce4uti +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [xfce_minimum_version]) dnl Check for libxfce4mcs -XDT_CHECK_PACKAGE(LIBXFCE4MCS_CLIENT, libxfce4mcs-client-1.0, 4.3.99.2) -XDT_CHECK_PACKAGE(LIBXFCE4MCS_MANAGER, libxfce4mcs-manager-1.0, 4.2.99.2) -XDT_XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.3.99.2]) +XDT_CHECK_PACKAGE(LIBXFCE4MCS_CLIENT, libxfce4mcs-client-1.0, [xfce_minimum_version]) +XDT_CHECK_PACKAGE(LIBXFCE4MCS_MANAGER, libxfce4mcs-manager-1.0, [xfce_minimum_version]) +XDT_XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [xfce_minimum_version]) dnl Check for CUPS AC_ARG_ENABLE([cups], Property changes on: xfprint/trunk/icons ___ Name: svn:ignore + Makefile.in Makefile Property changes on: xfprint/trunk/icons/24x24 ___ Name: svn:ignore + Makefile.in Makefile Property changes on: xfprint/trunk/icons/48x48 ___ Name: svn:ignore + Makefile.in Makefile Property changes on: xfprint/trunk/icons/scalable ___ Name: svn:ignore + Makefile.in Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23645 - xfce-utils/trunk/xfce4-about xfce4-session/trunk/xfce4-tips/data
Author: pollux Date: 2006-11-04 12:42:30 + (Sat, 04 Nov 2006) New Revision: 23645 Modified: xfce-utils/trunk/xfce4-about/COPYING xfce-utils/trunk/xfce4-about/INFO xfce-utils/trunk/xfce4-about/INFO.ca xfce-utils/trunk/xfce4-about/INFO.cs xfce-utils/trunk/xfce4-about/INFO.es xfce-utils/trunk/xfce4-about/INFO.fi xfce-utils/trunk/xfce4-about/INFO.fr xfce-utils/trunk/xfce4-about/INFO.it xfce-utils/trunk/xfce4-about/INFO.ja xfce-utils/trunk/xfce4-about/INFO.ru xfce-utils/trunk/xfce4-about/INFO.uk xfce-utils/trunk/xfce4-about/INFO.vi xfce4-session/trunk/xfce4-tips/data/tips Log: remove references to xftaskbar4 and xfce4-iconbox and rename xffm into thunar (fix #bug 1332) Modified: xfce-utils/trunk/xfce4-about/COPYING === --- xfce-utils/trunk/xfce4-about/COPYING2006-11-04 12:27:37 UTC (rev 23644) +++ xfce-utils/trunk/xfce4-about/COPYING2006-11-04 12:42:30 UTC (rev 23645) @@ -1,16 +1,15 @@ Xfce 4 is copyright Olivier Fourdan ([EMAIL PROTECTED]). The different components are copyrighted by their respective authors. -The packages libxfce4util and xfprint are distributed under the terms of the -BSD license. +The packages libxfce4util is distributed under the terms of the BSD license. The libxfce4mcs and libxfcegui4 libraries and the xfce-mcs-manager package are distributed under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -The packages xfce-mcs-plugins, xfce-utils, xfce4-panel, xfce4-session, -xfdesktop, xffm and xfwm4 are distributed under the terms of the GNU +The packages thunar, xfce-mcs-plugins, xfce-utils, xfce4-panel, xfce4-session, +xfdesktop, xfprint and xfwm4 are distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Modified: xfce-utils/trunk/xfce4-about/INFO === --- xfce-utils/trunk/xfce4-about/INFO 2006-11-04 12:27:37 UTC (rev 23644) +++ xfce-utils/trunk/xfce4-about/INFO 2006-11-04 12:42:30 UTC (rev 23645) @@ -14,7 +14,7 @@ sets a background color or image and provides a menu when you click on the desktop background -o File manager (xffm) +o File manager (thunar) fast file manager o Session manager (xfce4-session) @@ -24,8 +24,6 @@ o Utilities xfprint4: print files xfrun4: run programs - xftaskbar4: simple taskbar with optional pager and system tray - xfce4-iconbox: show minimized apps in an icon box Xfce 4 is also a development platform providing several libraries, that help Modified: xfce-utils/trunk/xfce4-about/INFO.ca === --- xfce-utils/trunk/xfce4-about/INFO.ca2006-11-04 12:27:37 UTC (rev 23644) +++ xfce-utils/trunk/xfce4-about/INFO.ca2006-11-04 12:42:30 UTC (rev 23645) @@ -15,7 +15,7 @@ Elecció del color o la imatge de fons i ofereix un menú quan es pitja sobre el rerefons de l'escriptori. -o Gestor de fitxers (xffm) +o Gestor de fitxers (thunar) Gestor de fitxers realment ràpid. o Session manager (xfce4-session) @@ -25,9 +25,6 @@ o Utilitats: xfprint4 : Impressió de fitxers. xfrun4 : Execució de programes. - xftaskbar4 : Barra de tasques simple amb, opcionalment, un paginador - d'escriptoris i una safata de tasques. - xfce4-iconbox: Mostra les aplicacions com icones en l'escriptori. Xfce 4, és també una plataforma de desenvolupament amb força llibreries, que Modified: xfce-utils/trunk/xfce4-about/INFO.cs === --- xfce-utils/trunk/xfce4-about/INFO.cs2006-11-04 12:27:37 UTC (rev 23644) +++ xfce-utils/trunk/xfce4-about/INFO.cs2006-11-04 12:42:30 UTC (rev 23645) @@ -15,7 +15,7 @@ nastavuje barvu nebo obrázek pozadí a poskytuje přístup do menu při kliknutí na plochu -o Správce souborů (xffm) +o Správce souborů (thunar) rychlý správce souborů o Správce sezení (xfce4-session) @@ -24,9 +24,6 @@ o Nástroje xfprint4: tisk souborů xfrun4: spouštění programů - xftaskbar4: jednoduchý panel úloh s volitelným přepínačem ploch - a systémovou oblastí - xfce4-iconbox: zobrazuje minimalizované aplikace v oblasti pro ikony Xfce 4 je také vývojová platforma, poskytující mnoho knihoven, které Modified: xfce-utils/trunk/xfce4-about/INFO.es === --- xfce-utils/trunk/xfce4-about/INFO.es2006-11-04 12:27:37 UTC (rev 23644) +++ xfce-utils/trunk/xfce4-about/INFO.es2006-11-04 12:42:30 UTC (rev 23645) @@ -16,7 +16,7 @@ fija un color de fondo o una imagen y proporciona un menú
[Xfce4-commits] r23555 - xfce-utils/trunk/xfce4-about
Author: pollux Date: 2006-10-30 09:14:41 + (Mon, 30 Oct 2006) New Revision: 23555 Modified: xfce-utils/trunk/xfce4-about/AUTHORS Log: update AUTHORS Modified: xfce-utils/trunk/xfce4-about/AUTHORS === --- xfce-utils/trunk/xfce4-about/AUTHORS2006-10-30 08:01:38 UTC (rev 23554) +++ xfce-utils/trunk/xfce4-about/AUTHORS2006-10-30 09:14:41 UTC (rev 23555) @@ -49,6 +49,8 @@ [Translations supervision] Daichi Kawahata;[EMAIL PROTECTED] Jean-François Wauthy;[EMAIL PROTECTED] +Maximilian Schleiss;[EMAIL PROTECTED] +Pau Rul·lan Ferragut;[EMAIL PROTECTED] [Translators] af;Petri Jooste;[EMAIL PROTECTED] @@ -63,7 +65,7 @@ da;Jesper Berth;[EMAIL PROTECTED] de;Fabian Nowak;[EMAIL PROTECTED] de;Moritz Heiber;[EMAIL PROTECTED] -dz;Tenzin;[EMAIL PROTECTED] +dz;Tenzin Dendup;[EMAIL PROTECTED] el;Stathis Kamperis;[EMAIL PROTECTED] el;Stavros Giannouris;[EMAIL PROTECTED] en_GB;Dwayne Bailey;[EMAIL PROTECTED] @@ -78,6 +80,7 @@ fa;Abbas Izad;[EMAIL PROTECTED] fi;Jari Rahkonen;[EMAIL PROTECTED] fr;Collet Etienne;[EMAIL PROTECTED] +fr;Maximilian Schleiss;[EMAIL PROTECTED] fr;Olivier Fourdan;[EMAIL PROTECTED] fr;Stephane Roy;[EMAIL PROTECTED] gl;Leandro Regueiro;[EMAIL PROTECTED] ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23560 - in xfprint/trunk: . libxfprint mcs-plugin xfprint
Author: pollux Date: 2006-10-30 18:53:29 + (Mon, 30 Oct 2006) New Revision: 23560 Removed: xfprint/trunk/icons/ Modified: xfprint/trunk/Makefile.am xfprint/trunk/configure.in.in xfprint/trunk/libxfprint/printer-list-window.c xfprint/trunk/libxfprint/printer-queue-window.c xfprint/trunk/mcs-plugin/xfce-xfprint-settings.desktop.in xfprint/trunk/mcs-plugin/xfprint_plugin.c xfprint/trunk/xfprint/print_dialog.c Log: use themable 'printer' icon Modified: xfprint/trunk/Makefile.am === --- xfprint/trunk/Makefile.am 2006-10-30 17:41:35 UTC (rev 23559) +++ xfprint/trunk/Makefile.am 2006-10-30 18:53:29 UTC (rev 23560) @@ -6,8 +6,7 @@ xfprint \ xfprint-manager \ printing-systems \ - mcs-plugin\ - icons + mcs-plugin EXTRA_DIST = \ intltool-extract.in \ Modified: xfprint/trunk/configure.in.in === --- xfprint/trunk/configure.in.in 2006-10-30 17:41:35 UTC (rev 23559) +++ xfprint/trunk/configure.in.in 2006-10-30 18:53:29 UTC (rev 23560) @@ -168,9 +168,6 @@ po/Makefile.in xfprint/Makefile xfprint-manager/Makefile -icons/Makefile -icons/scalable/Makefile -icons/48x48/Makefile mcs-plugin/Makefile printing-systems/Makefile printing-systems/cups/Makefile Modified: xfprint/trunk/libxfprint/printer-list-window.c === --- xfprint/trunk/libxfprint/printer-list-window.c 2006-10-30 17:41:35 UTC (rev 23559) +++ xfprint/trunk/libxfprint/printer-list-window.c 2006-10-30 18:53:29 UTC (rev 23560) @@ -129,7 +129,7 @@ priv-icontheme = gtk_icon_theme_get_default (); g_signal_connect (G_OBJECT (priv-icontheme), changed, G_CALLBACK (icon_theme_changed_cb), win); - gtk_window_set_icon_name (GTK_WINDOW (win), xfprint); + gtk_window_set_icon_name (GTK_WINDOW (win), printer); gtk_window_set_default_size (GTK_WINDOW (win), 450, 250); gtk_window_set_title (GTK_WINDOW (win), _(Printer manager)); @@ -262,9 +262,8 @@ /* Credits */ xfce_about_info_add_credit (info, Benedikt Meurer, [EMAIL PROTECTED], _(Former maintainer)); xfce_about_info_add_credit (info, Jean-Francois Wauthy, [EMAIL PROTECTED], _(Maintainer)); - xfce_about_info_add_credit (info, Francois Le Clainche, [EMAIL PROTECTED], _(Artist)); - icon = gtk_icon_theme_load_icon (priv-icontheme, xfprint, 48, 0, NULL); + icon = gtk_icon_theme_load_icon (priv-icontheme, printer, 48, 0, NULL); dialog = xfce_about_dialog_new_with_values (GTK_WINDOW (win), info, icon); @@ -317,7 +316,7 @@ if (printer-type == PRINTER_TYPE_CLASS) icon = gtk_icon_theme_load_icon (priv-icontheme, printer-class, x, 0, NULL); if (!icon || printer-type == PRINTER_TYPE_PRINTER) - icon = gtk_icon_theme_load_icon (priv-icontheme, gnome-dev-printer, x, 0, NULL); + icon = gtk_icon_theme_load_icon (priv-icontheme, printer, x, 0, NULL); num_jobs = printing_system_get_jobs_count (priv-ps, printer-name); num_jobs_str = g_strdup_printf (%d, num_jobs); @@ -383,7 +382,7 @@ if (printer-type == PRINTER_TYPE_CLASS) icon = gtk_icon_theme_load_icon (priv-icontheme, printer-class, 48, 0, NULL); if (!icon || printer-type == PRINTER_TYPE_PRINTER) -icon = gtk_icon_theme_load_icon (priv-icontheme, gnome-dev-printer, 48, 0, NULL); +icon = gtk_icon_theme_load_icon (priv-icontheme, printer, 48, 0, NULL); gtk_list_store_set (GTK_LIST_STORE (model), iter, PRINTERS_ICON_COLUMN, icon, -1); Modified: xfprint/trunk/libxfprint/printer-queue-window.c === --- xfprint/trunk/libxfprint/printer-queue-window.c 2006-10-30 17:41:35 UTC (rev 23559) +++ xfprint/trunk/libxfprint/printer-queue-window.c 2006-10-30 18:53:29 UTC (rev 23560) @@ -119,7 +119,7 @@ g_signal_connect (G_OBJECT (priv-icontheme), changed, G_CALLBACK (icon_theme_changed_cb), win); gtk_window_set_title (GTK_WINDOW (win), _(Queue Manager)); - gtk_window_set_icon_name (GTK_WINDOW (win), xfprint); + gtk_window_set_icon_name (GTK_WINDOW (win), printer); gtk_window_set_default_size (GTK_WINDOW (win), 450, 150); gtk_window_set_position (GTK_WINDOW (win), GTK_WIN_POS_NONE); Modified: xfprint/trunk/mcs-plugin/xfce-xfprint-settings.desktop.in === --- xfprint/trunk/mcs-plugin/xfce-xfprint-settings.desktop.in 2006-10-30 17:41:35 UTC (rev 23559) +++ xfprint/trunk/mcs-plugin/xfce-xfprint-settings.desktop.in 2006-10-30 18:53:29 UTC (rev 23560) @@ -3,7 +3,7 @@ _Name=Xfce 4 Printing System Settings _Comment=Allow you to select the printing system backend that xfprint will use
[Xfce4-commits] r23561 - in libexo/trunk: . docs/manual docs/manual/fr docs/manual/fr/images po-doc
Author: pollux Date: 2006-10-30 19:16:01 + (Mon, 30 Oct 2006) New Revision: 23561 Added: libexo/trunk/docs/manual/fr/ libexo/trunk/docs/manual/fr/Makefile.am libexo/trunk/docs/manual/fr/exo-preferred-applications.xml.in libexo/trunk/docs/manual/fr/images/ libexo/trunk/docs/manual/fr/images/Makefile.am libexo/trunk/docs/manual/fr/images/exo-preferred-applications-internet.png libexo/trunk/docs/manual/fr/images/exo-preferred-applications-utilities.png libexo/trunk/docs/manual/fr/images/exo-preferred-applications-webbrowser-custom.png libexo/trunk/docs/manual/fr/images/exo-preferred-applications-webbrowser-menu.png libexo/trunk/po-doc/fr.po Modified: libexo/trunk/ChangeLog libexo/trunk/configure.in.in libexo/trunk/docs/manual/Makefile.am libexo/trunk/po-doc/ChangeLog libexo/trunk/po-doc/LINGUAS Log: 2006-10-30 Jean-Fran?\195?\167ois [EMAIL PROTECTED] * configure.in.in, docs/manual/fr, docs/manual/fr/exo-preferred-applications.xml.in, docs/manual/fr/images, docs/manual/fr/images/exo-preferred-applications-webbrowser-menu.png, docs/manual/fr/images/exo-preferred-applications-internet.png, docs/manual/fr/images/exo-preferred-applications-webbrowser-custom.png, docs/manual/fr/images/exo-preferred-applications-utilities.png, docs/manual/fr/images/Makefile.am, docs/manual/fr/Makefile.am, docs/manual/Makefile.am, po-doc/LINGUAS, po-doc/fr.po, po-doc/ChangeLog: Add French translations of the manual by Maximilian Schleiss. Bug #2478. Modified: libexo/trunk/ChangeLog === --- libexo/trunk/ChangeLog 2006-10-30 18:53:29 UTC (rev 23560) +++ libexo/trunk/ChangeLog 2006-10-30 19:16:01 UTC (rev 23561) @@ -1,3 +1,16 @@ +2006-10-30 Jean-François [EMAIL PROTECTED] + * configure.in.in, docs/manual/fr, + docs/manual/fr/exo-preferred-applications.xml.in, + docs/manual/fr/images, + docs/manual/fr/images/exo-preferred-applications-webbrowser-menu.png, + docs/manual/fr/images/exo-preferred-applications-internet.png, + docs/manual/fr/images/exo-preferred-applications-webbrowser-custom.png, + docs/manual/fr/images/exo-preferred-applications-utilities.png, + docs/manual/fr/images/Makefile.am, docs/manual/fr/Makefile.am, + docs/manual/Makefile.am, po-doc/LINGUAS, po-doc/fr.po, + po-doc/ChangeLog: Add French translations of the manual by Maximilian + Schleiss. Bug #2478. + 2006-09-28 Benedikt Meurer [EMAIL PROTECTED] * icons/24x24/, configure.in.in, icons/Makefile.am: Install the Modified: libexo/trunk/configure.in.in === --- libexo/trunk/configure.in.in2006-10-30 18:53:29 UTC (rev 23560) +++ libexo/trunk/configure.in.in2006-10-30 19:16:01 UTC (rev 23561) @@ -339,6 +339,9 @@ docs/manual/C/Makefile docs/manual/C/exo-preferred-applications.xml docs/manual/C/images/Makefile +docs/manual/fr/Makefile +docs/manual/fr/exo-preferred-applications.xml +docs/manual/fr/images/Makefile docs/manual/ja/Makefile docs/manual/ja/exo-preferred-applications.xml docs/manual/ja/images/Makefile Modified: libexo/trunk/docs/manual/Makefile.am === --- libexo/trunk/docs/manual/Makefile.am2006-10-30 18:53:29 UTC (rev 23560) +++ libexo/trunk/docs/manual/Makefile.am2006-10-30 19:16:01 UTC (rev 23561) @@ -2,6 +2,7 @@ SUBDIRS = \ C \ + fr \ ja EXTRA_DIST = \ Added: libexo/trunk/docs/manual/fr/Makefile.am === --- libexo/trunk/docs/manual/fr/Makefile.am (rev 0) +++ libexo/trunk/docs/manual/fr/Makefile.am 2006-10-30 19:16:01 UTC (rev 23561) @@ -0,0 +1,68 @@ +# $Id: Makefile.am 20037 2006-10-28 22:13:18Z maximilian $ + +SUBDIRS = \ + images + +TARGET_DIR = $(datadir)/xfce4/doc/fr +STYLESHEET = ../xfce-nochunk.xsl +DOCUMENT = exo-preferred-applications.xml + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +GPATH = $(srcdir) + +DOC_STAMPS = html-build.stamp + +EXTRA_DIST = $(DOCUMENT) +CLEANFILES = $(DOC_STAMPS) + +if ENABLE_XSLTPROC +all-local: html-build.stamp + +html-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(STYLESHEET) + @echo *** Building HTML *** + @-chmod -R u+w $(srcdir) + rm -rf
[Xfce4-commits] r23546 - xfwm4/trunk/mcs-plugin
Author: pollux Date: 2006-10-29 14:51:56 + (Sun, 29 Oct 2006) New Revision: 23546 Modified: xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c Log: allow the usage of 'Alt+C' in shortcuts (unfortunately it adds a string too) Modified: xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c === --- xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c 2006-10-29 11:03:17 UTC (rev 23545) +++ xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c 2006-10-29 14:51:56 UTC (rev 23546) @@ -843,9 +843,12 @@ /* Create dialog */ dialog = -gtk_dialog_new_with_buttons (_(Compose shortcut), NULL, GTK_DIALOG_MODAL, -GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); +gtk_dialog_new_with_buttons (_(Compose shortcut), NULL, GTK_DIALOG_MODAL, NULL); +button = xfce_create_mixed_button (GTK_STOCK_CANCEL, _(Cancel)); +gtk_widget_show (button); +gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_CANCEL); + button = xfce_create_mixed_button (GTK_STOCK_CLEAR, _(No shortcut)); gtk_widget_show (button); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_NO); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23548 - xfce-mcs-plugins/trunk
Author: pollux Date: 2006-10-29 16:59:56 + (Sun, 29 Oct 2006) New Revision: 23548 Modified: xfce-mcs-plugins/trunk/configure.in.in Log: support for debbuging was removed :-s Modified: xfce-mcs-plugins/trunk/configure.in.in === --- xfce-mcs-plugins/trunk/configure.in.in 2006-10-29 16:31:32 UTC (rev 23547) +++ xfce-mcs-plugins/trunk/configure.in.in 2006-10-29 16:59:56 UTC (rev 23548) @@ -305,6 +305,8 @@ AC_MSG_RESULT([$PLATFORM_LDFLAGS]) AC_SUBST([PLATFORM_LDFLAGS]) +XDT_FEATURE_DEBUG + AC_OUTPUT([ Makefile doc/Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23549 - xfburn/trunk
Author: pollux Date: 2006-10-29 17:01:32 + (Sun, 29 Oct 2006) New Revision: 23549 Modified: xfburn/trunk/xfburn.desktop.in Log: use media-cdrom as icon until better comes up (fix bug #2421) Modified: xfburn/trunk/xfburn.desktop.in === --- xfburn/trunk/xfburn.desktop.in 2006-10-29 16:59:56 UTC (rev 23548) +++ xfburn/trunk/xfburn.desktop.in 2006-10-29 17:01:32 UTC (rev 23549) @@ -6,7 +6,7 @@ _Comment=CD and DVD burning application Exec=xfburn TryExec=xfburn -Icon=xfburn +Icon=media-cdrom Terminal=false Categories=X-XFCE;GTK;DiscBurning;Archiving;Utility; StartupNotify=true ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23487 - in xfprint/trunk: libxfprint xfprint
Author: pollux Date: 2006-10-20 20:07:42 + (Fri, 20 Oct 2006) New Revision: 23487 Modified: xfprint/trunk/libxfprint/printing-system.c xfprint/trunk/xfprint/main.c xfprint/trunk/xfprint/print_dialog.c Log: fix warnings Modified: xfprint/trunk/libxfprint/printing-system.c === --- xfprint/trunk/libxfprint/printing-system.c 2006-10-20 13:44:54 UTC (rev 23486) +++ xfprint/trunk/libxfprint/printing-system.c 2006-10-20 20:07:42 UTC (rev 23487) @@ -273,7 +273,8 @@ GList * printing_system_get_printers (PrintingSystem * ps) { - g_return_val_if_fail (ps, NULL); + if (ps == NULL) +return NULL; return PRINTING_SYSTEM_GET_PRIVATE (ps)-ps_get_printers (); } @@ -281,7 +282,8 @@ Printer * printing_system_get_default_printer (PrintingSystem * ps) { - g_return_val_if_fail (ps, NULL); + if (ps == NULL) +return NULL; return PRINTING_SYSTEM_GET_PRIVATE (ps)-ps_get_default_printer (); } @@ -289,7 +291,8 @@ gint printing_system_get_printer_state (PrintingSystem * ps, const gchar * printer) { - g_return_val_if_fail (ps, PRINTER_STATE_UNKNOWN); + if (ps == NULL) +return PRINTER_STATE_UNKNOWN; return PRINTING_SYSTEM_GET_PRIVATE (ps)-ps_get_printer_state (printer); } @@ -297,7 +300,8 @@ gint printing_system_get_jobs_count (PrintingSystem * ps, const gchar * printer) { - g_return_val_if_fail (ps, 0); + if (ps == NULL) +return 0; return PRINTING_SYSTEM_GET_PRIVATE (ps)-ps_get_printer_jobs_count (printer); } @@ -305,7 +309,8 @@ gboolean printing_system_remove_job (PrintingSystem * ps, const gchar * printer, gint id) { - g_return_val_if_fail (ps, FALSE); + if (ps == NULL) +return FALSE; return PRINTING_SYSTEM_GET_PRIVATE (ps)-ps_remove_job (printer, id); } @@ -313,7 +318,8 @@ GList * printing_system_get_jobs (PrintingSystem * ps, const gchar * printer) { - g_return_val_if_fail (ps, NULL); + if (ps == NULL) +return NULL; return PRINTING_SYSTEM_GET_PRIVATE (ps)-ps_get_jobs (printer); } @@ -321,7 +327,8 @@ gboolean printing_system_print_file (PrintingSystem * ps, const gchar * printer, const gchar * original_name, const gchar * file, gboolean remove_file) { - g_return_val_if_fail (ps, FALSE); + if (ps == NULL) +return FALSE; return PRINTING_SYSTEM_GET_PRIVATE (ps)-ps_print_file (printer, original_name, file, remove_file); } @@ -329,7 +336,8 @@ void printing_system_customize_printer_list_window (PrintingSystem * ps, PrinterListWindow * win) { - g_return_if_fail (ps); + if (ps == NULL) +return; PRINTING_SYSTEM_GET_PRIVATE (ps)-ps_customize_printer_list_window (win); } @@ -337,7 +345,8 @@ void printing_system_customize_printer_queue_window (PrintingSystem * ps, PrinterQueueWindow * win) { - g_return_if_fail (ps); + if (ps == NULL) +return; PRINTING_SYSTEM_GET_PRIVATE (ps)-ps_customize_printer_queue_window (win); } Modified: xfprint/trunk/xfprint/main.c === --- xfprint/trunk/xfprint/main.c2006-10-20 13:44:54 UTC (rev 23486) +++ xfprint/trunk/xfprint/main.c2006-10-20 20:07:42 UTC (rev 23487) @@ -52,20 +52,11 @@ Display *dpy; int screen; PrintingSystem *ps = NULL; + + g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); -#if 0 -#ifdef ENABLE_NLS /* This is required for UTF-8 at least - Please don't remove it */ - bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); -#ifdef HAVE_BIND_TEXTDOMAIN_CODESET - bind_textdomain_codeset (GETTEXT_PACKAGE, UTF-8); -#endif - textdomain (GETTEXT_PACKAGE); -#endif -#else - /* This is required for UTF-8 at least - Please don't remove it */ xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8); -#endif gtk_set_locale (); gtk_init (argc, argv); @@ -89,11 +80,17 @@ g_warning (Unable to load printing system module %s, setting-data.v_string); } mcs_setting_free (setting); +} else { + g_warning (%s: XfPrint/system is not set, PACKAGE); } mcs_client_destroy (client); + } else { +g_warning (%s: no mcs client found, PACKAGE); } + if (ps == NULL) +g_warning (%s: No printing system loaded, PACKAGE); if (argc == 1) { struct timeval tv; Modified: xfprint/trunk/xfprint/print_dialog.c === --- xfprint/trunk/xfprint/print_dialog.c2006-10-20 13:44:54 UTC (rev 23486) +++ xfprint/trunk/xfprint/print_dialog.c2006-10-20 20:07:42 UTC (rev 23487) @@ -413,10 +413,12 @@ printer = g_list_next (printer); } + + if (G_LIKELY (G_IS_OBJECT (icon_printer))) +g_object_unref (icon_printer); + if (G_LIKELY (G_IS_OBJECT (icon_class))) +g_object_unref (icon_class); - g_object_unref (icon_printer); - g_object_unref (icon_class); - printers_free (printers); } ___ Xfce4-commits mailing
[Xfce4-commits] r23198 - libexo/trunk/po thunar/trunk/po xfce-mcs-plugins/trunk/po xfce4-panel/trunk/po xfwm4/trunk/po
Author: pollux Date: 2006-09-23 11:31:59 + (Sat, 23 Sep 2006) New Revision: 23198 Modified: libexo/trunk/po/ChangeLog libexo/trunk/po/pl.po thunar/trunk/po/ChangeLog thunar/trunk/po/pl.po xfce-mcs-plugins/trunk/po/ChangeLog xfce-mcs-plugins/trunk/po/pl.po xfce4-panel/trunk/po/ChangeLog xfce4-panel/trunk/po/de.po xfce4-panel/trunk/po/fr.po xfwm4/trunk/po/ChangeLog xfwm4/trunk/po/pl.po Log: various translations updates Modified: libexo/trunk/po/ChangeLog === --- libexo/trunk/po/ChangeLog 2006-09-22 22:29:33 UTC (rev 23197) +++ libexo/trunk/po/ChangeLog 2006-09-23 11:31:59 UTC (rev 23198) @@ -1,3 +1,8 @@ +2006-09-23 Jean-François Wauthy [EMAIL PROTECTED] + + * pl.po: Updated Polish translations by piotr maliński + [EMAIL PROTECTED] + 2006-09-18 Pau Rul-lan Ferragut [EMAIL PROTECTED] * ca.po: Updated Catalan translations Modified: libexo/trunk/po/pl.po === --- libexo/trunk/po/pl.po 2006-09-22 22:29:33 UTC (rev 23197) +++ libexo/trunk/po/pl.po 2006-09-23 11:31:59 UTC (rev 23198) @@ -1065,10 +1065,9 @@ msgstrexo-open --launch TYP [PARAMETRY...] #: ../exo-open/main.c:62 -#, fuzzy msgid -?, --help Print this help message and exit msgstr - -h, --help Wyświetl komunikat pomocy i wyjdź + -?, --help Wyświetl komunikat pomocy i wyjdź #: ../exo-open/main.c:63 msgid @@ -1094,6 +1093,9 @@ applications\n when using the --launch option. msgstr + --working-directory KATALOG Domyślny katalog roboczy dla +aplikacji\n + przy używaniu opcji --launch. #: ../exo-open/main.c:72 msgid The following TYPEs are supported for the --launch command: Modified: thunar/trunk/po/ChangeLog === --- thunar/trunk/po/ChangeLog 2006-09-22 22:29:33 UTC (rev 23197) +++ thunar/trunk/po/ChangeLog 2006-09-23 11:31:59 UTC (rev 23198) @@ -1,3 +1,8 @@ +2006-09-23 Jean-François Wauthy [EMAIL PROTECTED] + + * pl.po: Updated Polish translations by piotr maliński + [EMAIL PROTECTED] + 2006-09-20 Sylvain Vedrenne [EMAIL PROTECTED] * eo.po: Updated Esperanto translations, by Jarbas Araujo Modified: thunar/trunk/po/pl.po === --- thunar/trunk/po/pl.po 2006-09-22 22:29:33 UTC (rev 23197) +++ thunar/trunk/po/pl.po 2006-09-23 11:31:59 UTC (rev 23198) @@ -1800,9 +1800,9 @@ #. tell the user that we failed to change the icon of the .desktop file #: ../thunar/thunar-properties-dialog.c:702 -#, fuzzy, c-format +#, c-format msgid Failed to change icon of \%s\ -msgstr Nie udało się zmienić praw dostępu do \%s\ +msgstr Nie udało się zmienić ikony \%s\ #. update the properties dialog title #: ../thunar/thunar-properties-dialog.c:785 Modified: xfce-mcs-plugins/trunk/po/ChangeLog === --- xfce-mcs-plugins/trunk/po/ChangeLog 2006-09-22 22:29:33 UTC (rev 23197) +++ xfce-mcs-plugins/trunk/po/ChangeLog 2006-09-23 11:31:59 UTC (rev 23198) @@ -1,3 +1,8 @@ +2006-09-23 Jean-François Wauthy [EMAIL PROTECTED] + + * pl.po: Updated Polish translations by piotr maliński + [EMAIL PROTECTED] + 2006-09-18 Pau Rul-lan Ferragut [EMAIL PROTECTED] * ca.po: Updated Catalan translations Modified: xfce-mcs-plugins/trunk/po/pl.po === --- xfce-mcs-plugins/trunk/po/pl.po 2006-09-22 22:29:33 UTC (rev 23197) +++ xfce-mcs-plugins/trunk/po/pl.po 2006-09-23 11:31:59 UTC (rev 23198) @@ -121,9 +121,8 @@ msgstr Włącz Powolne klawisze #: ../plugins/keyboard_plugin/keyboard_plugin.c:557 -#, fuzzy msgid Slow keys delay : -msgstr Powolne klawisze +msgstr Opóźnienie powolnych klawiszy: #: ../plugins/keyboard_plugin/keyboard_plugin.c:570 msgid Bounce keys @@ -134,9 +133,8 @@ msgstr Włącz odskakujące klawisze #: ../plugins/keyboard_plugin/keyboard_plugin.c:583 -#, fuzzy msgid DeBounce delay : -msgstr Odskakujące klawisze +msgstr Opóźnienie odskakiwania : #: ../plugins/keyboard_plugin/keyboard_plugin.c:625 msgid Keyboard Preferences @@ -391,19 +389,19 @@ #: ../plugins/mouse_plugin/mouse_plugin.c:258 msgid Enable mouse emulation -msgstr +msgstr Włącz emulację myszy #: ../plugins/mouse_plugin/mouse_plugin.c:284 msgid Interval : -msgstr +msgstr Interwał : #: ../plugins/mouse_plugin/mouse_plugin.c:301 msgid Time to max : -msgstr +msgstr Czas do maksimum : #: ../plugins/mouse_plugin/mouse_plugin.c:314 msgid Max speed: -msgstr +msgstr Maksymalna szybkość: #: ../plugins/mouse_plugin/mouse_plugin.c:348 msgid Mouse Preferences Modified:
[Xfce4-commits] r23114 - xfdesktop/trunk/menueditor
Author: pollux Date: 2006-09-09 13:35:41 + (Sat, 09 Sep 2006) New Revision: 23114 Modified: xfdesktop/trunk/menueditor/menueditor-main-window.c Log: prevent endless loop if DnD of an element into itself (fix bug #2287) Modified: xfdesktop/trunk/menueditor/menueditor-main-window.c === --- xfdesktop/trunk/menueditor/menueditor-main-window.c 2006-09-08 23:39:43 UTC (rev 23113) +++ xfdesktop/trunk/menueditor/menueditor-main-window.c 2006-09-09 13:35:41 UTC (rev 23114) @@ -2174,9 +2174,17 @@ } gtk_tree_model_get_iter (model, iter_source, path_source); +gtk_tree_model_get_iter (model, iter_where_insert, path_where_insert); + +if (gtk_tree_path_is_descendant (path_where_insert, path_source) +|| gtk_tree_path_compare (path_where_insert, path_source) == 0) { + gtk_tree_path_free (path_source); + goto cleanup; +} + gtk_tree_path_free (path_source); -gtk_tree_model_get_iter (model, iter_where_insert, path_where_insert); - + + gtk_tree_model_get (model, iter_where_insert, COLUMN_TYPE, type, -1); if ((type == MENU) || (position == GTK_TREE_VIEW_DROP_BEFORE) || (position == GTK_TREE_VIEW_DROP_AFTER)) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23095 - xfdesktop/trunk/menueditor
Author: pollux Date: 2006-09-06 17:08:58 + (Wed, 06 Sep 2006) New Revision: 23095 Modified: xfdesktop/trunk/menueditor/Makefile.am xfdesktop/trunk/menueditor/menueditor-add-dialog.c xfdesktop/trunk/menueditor/menueditor-edit-dialog.c xfdesktop/trunk/menueditor/menueditor-main-window.c Log: use the icon chooser if libexo is available (bug #2220) Modified: xfdesktop/trunk/menueditor/Makefile.am === --- xfdesktop/trunk/menueditor/Makefile.am 2006-09-06 17:03:51 UTC (rev 23094) +++ xfdesktop/trunk/menueditor/Makefile.am 2006-09-06 17:08:58 UTC (rev 23095) @@ -15,9 +15,11 @@ xfce4_menueditor_CFLAGS = \ + -DEXO_API_SUBJECT_TO_CHANGE \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ -I$(top_srcdir)/pixmaps \ + $(LIBEXO_CFLAGS)\ $(LIBX11_CFLAGS)\ $(LIBXFCEGUI4_CFLAGS) \ -DLOCALEDIR=\$(localedir)\\ @@ -29,6 +31,7 @@ xfce4_menueditor_LDADD = \ $(top_builddir)/common/libxfdesktop.la \ + $(LIBEXO_LIBS) \ $(LIBX11_LDFLAGS) \ $(LIBX11_LIBS) \ $(LIBXFCE4MCS_CLIENT_LIBS) \ Modified: xfdesktop/trunk/menueditor/menueditor-add-dialog.c === --- xfdesktop/trunk/menueditor/menueditor-add-dialog.c 2006-09-06 17:03:51 UTC (rev 23094) +++ xfdesktop/trunk/menueditor/menueditor-add-dialog.c 2006-09-06 17:08:58 UTC (rev 23095) @@ -28,6 +28,10 @@ #include gtk/gtk.h #include libxfcegui4/libxfcegui4.h +#ifdef HAVE_LIBEXO +#include exo/exo.h +#endif + #include menueditor-add-dialog.h #define MENUEDITOR_ADD_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MENUEDITOR_TYPE_ADD_DIALOG, MenuEditorAddDialogPrivate)) @@ -39,10 +43,14 @@ GtkWidget *entry_name; GtkWidget *label_command; GtkWidget *entry_command; +#ifdef HAVE_LIBEXO + GtkWidget *button_icon; +#else GtkWidget *radio_button_themed_icon; GtkWidget *entry_themed_icon; GtkWidget *radio_button_icon; GtkWidget *chooser_icon; +#endif GtkWidget *check_button_snotify; GtkWidget *check_button_interm; } MenuEditorAddDialogPrivate; @@ -51,11 +59,15 @@ static void menueditor_add_dialog_class_init (MenuEditorAddDialogClass *); static void menueditor_add_dialog_init (MenuEditorAddDialog *); +static void cb_combo_changed (GtkComboBox *, MenuEditorAddDialog *); +static void cb_browse_button_clicked (GtkButton *, MenuEditorAddDialog *); +#ifdef HAVE_LIBEXO +static void cb_icon_button_clicked (GtkWidget *, MenuEditorAddDialog *); +#else static void cb_chooser_icon_update_preview (GtkFileChooser *, GtkImage *); -static void cb_browse_button_clicked (GtkButton *, MenuEditorAddDialog *); -static void cb_combo_changed (GtkComboBox *, MenuEditorAddDialog *); static void cb_radio_button_themed_icon_toggled (GtkToggleButton *, MenuEditorAddDialog *); static void cb_radio_button_icon_toggled (GtkToggleButton *, MenuEditorAddDialog *); +#endif /* globals */ static XfceTitledDialogClass *parent_class = NULL; @@ -101,14 +113,18 @@ { MenuEditorAddDialogPrivate *priv = MENUEDITOR_ADD_DIALOG_GET_PRIVATE (dialog); +#ifdef HAVE_LIBEXO + GtkWidget *align; +#else + GtkFileFilter *filter; + GtkWidget *preview; + GSList *radio_button_group = NULL; +#endif GtkWidget *table; GtkWidget *label; gchar *label_text = NULL; GtkWidget *hbox; GtkWidget *button_browse; - GtkFileFilter *filter; - GtkWidget *preview; - GSList *radio_button_group = NULL; gtk_window_set_title (GTK_WINDOW (dialog), _(Add menu entry)); gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); @@ -180,6 +196,25 @@ gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 6); +#ifdef HAVE_LIBEXO + /* Icon chooser */ + label = gtk_label_new (_(Icon:)); + label_text = g_strdup_printf (span weight='bold'%s/span, _(Icon:)); + gtk_label_set_markup (GTK_LABEL (label), label_text); + gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 0); + gtk_widget_show (label); + g_free (label_text); + + align = gtk_alignment_new (0.0f, 0.5f, 0.0f, 0.0f); + gtk_table_attach (GTK_TABLE (table), align, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL,
[Xfce4-commits] r23063 - libxfcegui4/trunk/po mousepad/trunk/po xfcalendar/trunk/po
Author: pollux Date: 2006-09-03 13:26:53 + (Sun, 03 Sep 2006) New Revision: 23063 Added: mousepad/trunk/po/nl.po Modified: libxfcegui4/trunk/po/ChangeLog libxfcegui4/trunk/po/nl.po mousepad/trunk/po/ChangeLog mousepad/trunk/po/LINGUAS xfcalendar/trunk/po/ChangeLog xfcalendar/trunk/po/nl.po Log: updated Dutch translations Modified: libxfcegui4/trunk/po/ChangeLog === --- libxfcegui4/trunk/po/ChangeLog 2006-09-03 11:32:20 UTC (rev 23062) +++ libxfcegui4/trunk/po/ChangeLog 2006-09-03 13:26:53 UTC (rev 23063) @@ -1,3 +1,7 @@ +2006-09-03 Jean-François Wauthy [EMAIL PROTECTED] + + * nl.po: Updated Dutch translations + 2006-09-02 Benedikt Meurer [EMAIL PROTECTED] * cs.po: Updated czech translations by Michal Várady Modified: libxfcegui4/trunk/po/nl.po === --- libxfcegui4/trunk/po/nl.po 2006-09-03 11:32:20 UTC (rev 23062) +++ libxfcegui4/trunk/po/nl.po 2006-09-03 13:26:53 UTC (rev 23063) @@ -5,11 +5,11 @@ # msgid msgstr -Project-Id-Version: libxfcegui4 4.3.99.1n +Project-Id-Version: libxfcegui4 4.3.90.2\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-09-02 16:37+0200\n +POT-Creation-Date: 2006-07-09 14:56+0200\n PO-Revision-Date: 2005-09-22 20:59+0900\n -Last-Translator: Jasper Huijsmans [EMAIL PROTECTED]\n +Last-Translator: Stephan Arts [EMAIL PROTECTED]\n Language-Team: Dutch [EMAIL PROTECTED]\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n @@ -18,7 +18,7 @@ #: libxfcegui4/netk-window-action-menu.c:215 #: libxfcegui4/netk-window-action-menu.c:217 msgid Workspace -msgstr +msgstr Werkblad #: libxfcegui4/netk-window-action-menu.c:246 msgid S_how @@ -54,33 +54,33 @@ #: libxfcegui4/netk-window-action-menu.c:439 msgid Send to... -msgstr +msgstr Zend naar... #: libxfcegui4/netk-window-action-menu.c:463 msgid _Close msgstr _Sluiten -#: libxfcegui4/xfce-appmenuitem.c:129 +#: libxfcegui4/xfce-appmenuitem.c:162 msgid Needs terminal msgstr Terminal nodig -#: libxfcegui4/xfce-appmenuitem.c:130 +#: libxfcegui4/xfce-appmenuitem.c:163 msgid Whether or not the command needs a terminal to execute msgstr Heeft het programma een terminal nodig? -#: libxfcegui4/xfce-appmenuitem.c:134 +#: libxfcegui4/xfce-appmenuitem.c:167 msgid Command msgstr Commando -#: libxfcegui4/xfce-appmenuitem.c:135 +#: libxfcegui4/xfce-appmenuitem.c:168 msgid The command to run when the item is clicked msgstr Het commando om uit te voeren -#: libxfcegui4/xfce-appmenuitem.c:139 +#: libxfcegui4/xfce-appmenuitem.c:172 msgid Icon name msgstr Pictogram -#: libxfcegui4/xfce-appmenuitem.c:140 +#: libxfcegui4/xfce-appmenuitem.c:173 msgid The name of the themed icon to display next to the item msgstr De naam van het pictogram (zonder extensie) @@ -109,13 +109,13 @@ #: libxfcegui4/xfce_systemtray.c:347 libxfcegui4/xfce_systemtray.c:351 #, c-format msgid Failed to acquire manager selection -msgstr +msgstr Verkrijgen beheerder selectie mislukt #: libxfcegui4/xfce_systemtray.c:487 #, c-format msgid tray icon has requested a size of (%i x %i), resizing to (%i x %i) -msgstr +msgstr systeemvak icoon heeft een formaat van (%i x %i), schalen naar (%i x %i) #: libxfcegui4/xfce_systemtray.c:496 msgid tray icon was not attached, destroying it -msgstr +msgstr systeemvak icoon is niet verbonden, wordt vernietigd Modified: mousepad/trunk/po/ChangeLog === --- mousepad/trunk/po/ChangeLog 2006-09-03 11:32:20 UTC (rev 23062) +++ mousepad/trunk/po/ChangeLog 2006-09-03 13:26:53 UTC (rev 23063) @@ -1,3 +1,7 @@ +2006-09-03 Jean-François Wauthy [EMAIL PROTECTED] + + * nl.po: Add Dutch translations + 2006-09-02 Benedikt Meurer [EMAIL PROTECTED] * de.po: Updated german translations by Enrico Tröger Modified: mousepad/trunk/po/LINGUAS === --- mousepad/trunk/po/LINGUAS 2006-09-03 11:32:20 UTC (rev 23062) +++ mousepad/trunk/po/LINGUAS 2006-09-03 13:26:53 UTC (rev 23063) @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -ca cs de el eo es et eu fi fr gl gu he hu it ja ka ko lt pl pt_BR ru sk sv ta uk zh_CN zh_TW +ca cs de el eo es et eu fi fr gl gu he hu it ja ka ko lt nl pl pt_BR ru sk sv ta uk zh_CN zh_TW Added: mousepad/trunk/po/nl.po === --- mousepad/trunk/po/nl.po (rev 0) +++ mousepad/trunk/po/nl.po 2006-09-03 13:26:53 UTC (rev 23063) @@ -0,0 +1,274 @@ +# Dutch translations for Mousepad package. +# Copyright (C) 2006 THE Mousepad'S COPYRIGHT HOLDER +# This file is distributed under the same license as the Mousepad package. +# Stephan Arts [EMAIL PROTECTED], 2006. +# +msgid +msgstr +Project-Id-Version: Mousepad 0.2.7svn-r22930\n +Report-Msgid-Bugs-To: \n
[Xfce4-commits] r23067 - libxfce4util/trunk/po
Author: pollux Date: 2006-09-03 19:35:11 + (Sun, 03 Sep 2006) New Revision: 23067 Added: libxfce4util/trunk/po/cs.po Modified: libxfce4util/trunk/po/ChangeLog libxfce4util/trunk/po/LINGUAS Log: Add Czech translations Modified: libxfce4util/trunk/po/ChangeLog === --- libxfce4util/trunk/po/ChangeLog 2006-09-03 19:00:18 UTC (rev 23066) +++ libxfce4util/trunk/po/ChangeLog 2006-09-03 19:35:11 UTC (rev 23067) @@ -1,3 +1,7 @@ +2006-09-03 Jean-François Wauthy [EMAIL PROTECTED] + + * cs.po: Add Czech translations + 2006-09-02 Benedikt Meurer [EMAIL PROTECTED] * *.po: Update Project-Id-Version. Modified: libxfce4util/trunk/po/LINGUAS === --- libxfce4util/trunk/po/LINGUAS 2006-09-03 19:00:18 UTC (rev 23066) +++ libxfce4util/trunk/po/LINGUAS 2006-09-03 19:35:11 UTC (rev 23067) @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -ca de fi fr gl he ja ka lt pl pt_BR uk +ca cs de fi fr gl he ja ka lt pl pt_BR uk Added: libxfce4util/trunk/po/cs.po === --- libxfce4util/trunk/po/cs.po (rev 0) +++ libxfce4util/trunk/po/cs.po 2006-09-03 19:35:11 UTC (rev 23067) @@ -0,0 +1,126 @@ +# Czech translations for libxfce4util package. +# Copyright (C) 2006 THE libxfce4util'S COPYRIGHT HOLDER +# This file is distributed under the same license as the libxfce4util package. +# Michal Várady [EMAIL PROTECTED], 2006. +# +msgid +msgstr +Project-Id-Version: libxfce4util 4.3.90.3svn-r22881\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-04-18 23:34+0200\n +PO-Revision-Date: 2006-08-26 01:33+0100\n +Last-Translator: Michal Várady [EMAIL PROTECTED]\n +Language-Team: Czech [EMAIL PROTECTED]\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n +Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n=2 n=4) ? 1 : 2;\n + +#: libxfce4util/xfce-fileutils.c:154 +#, c-format +msgid Error creating directory '%s': %s +msgstr Chyba při vytváření adresáře '%s': %s + +#: libxfce4util/xfce-license.c:33 +msgid + Redistribution and use in source and binary forms, with or without\n + modification, are permitted provided that the following conditions\n + are met:\n +\n + 1. Redistributions of source code must retain the above copyright\n +notice, this list of conditions and the following disclaimer.\n + 2. Redistributions in binary form must reproduce the above copyright\n +notice, this list of conditions and the following disclaimer in the\n +documentation and/or other materials provided with the distribution.\n +\n + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\n + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\n + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n +msgstr +Další šíření a použití ve zdrojové nebo binární podobě, s úpravami nebo \n +bez úprav, jsou povoleny, pokud jsou splněny následující podmínky:\n +\n +1. Další distribuce zdrojových kódů musí udržet původní zmínku o\n +autorských právech, tento seznam podmínek a níže uvedené zřeknutí se\n +zodpovědnosti.2.Další distribuce v binární podobě musí obsahovat předchozí zmínku o\n +autorských právech, tento seznam podmínek a níže uvedené zřeknutí se\n +zodpovědnosti v dokumentaci nebo v materiálech dodávaných s distribucí\n +\n + TENTO SOFTWARE JE POSKYTOVÁN AUTOREM ``TAK, JAK JE'' A JAKÝKOLIV VYJÁDŘENÝCH\n + NEBO VYPLÝVAJÍCÍ ZÁRUK, VČETNĚ ZÁRUK OBCHODOVATELNOSTI A VHODNOST\n + PRO KONKRÉTNÍ POUŽITÍ SE TÍMTO ZŘÍKÁ. AUTOR NENÍ ZODPOVĚDNÝ PŘÍMO ANI\n + NEPŘÍMO ZA ŠKODY, VČETNĚ JAKÝCHKOLI OBECNÝCH, MIMOŘÁDNÝCH, NÁHODNÝCH\n + NEBO NÁSLEDNÝCH ŠKOD (VČETNĚ, ALE NEJEN, ZPROSTŘEDKOVÁNÍ NÁHRADY ZBOŽÍ\n + NEBO SLUŽEB, ZTRÁTY DAT ČI UŠLÝCH ZISKŮ NEBO PŘERUŠENÍ OBCHODNÍCH STYKŮ),\n + A TO I V PŘÍPADĚ, ŽE NA TUTO SKUTEČNOST BYLA TŘETÍ STRANA O RIZICÍCH UPOZORNĚNA\n + VE SMLOUVĚ I MIMO NI (VČETNĚ NEDBALOSTI A JINÝCH PŘEČINŮ PŘI POUŽITÍ).\n + +#: libxfce4util/xfce-license.c:55 +msgid +This program is free software; you can redistribute it and/or modify it\n +under the terms of the GNU General Public License as published by the Free\n +Software Foundation; either version 2 of the License, or (at your option)\n +any later version.\n +\n +This program is distributed in
[Xfce4-commits] r22981 - xfce4-panel/trunk/panel
Author: pollux Date: 2006-09-01 17:16:45 + (Fri, 01 Sep 2006) New Revision: 22981 Modified: xfce4-panel/trunk/panel/panel-app.c Log: fix compiling with debugging enabled Modified: xfce4-panel/trunk/panel/panel-app.c === --- xfce4-panel/trunk/panel/panel-app.c 2006-09-01 12:07:15 UTC (rev 22980) +++ xfce4-panel/trunk/panel/panel-app.c 2006-09-01 17:16:45 UTC (rev 22981) @@ -304,7 +304,7 @@ break; default: -DBG (Signal caught: %d, sig); +DBG (Signal caught: %d, buf.signal); panel_app.runstate = PANEL_RUN_STATE_QUIT_NOCONFIRM; } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22918 - libexo/trunk/po xfcalendar/trunk/po
Author: pollux Date: 2006-08-28 15:09:43 + (Mon, 28 Aug 2006) New Revision: 22918 Modified: libexo/trunk/po/ChangeLog libexo/trunk/po/pl.po xfcalendar/trunk/po/ChangeLog xfcalendar/trunk/po/pl.po Log: Updated Polish translations Modified: libexo/trunk/po/ChangeLog === --- libexo/trunk/po/ChangeLog 2006-08-28 14:59:51 UTC (rev 22917) +++ libexo/trunk/po/ChangeLog 2006-08-28 15:09:43 UTC (rev 22918) @@ -1,3 +1,7 @@ +2006-08-28 Jean-François Wauthy [EMAIL PROTECTED] + + * pl.po: Updated Polish translations + 2006-08-27 Jean-François Wauthy [EMAIL PROTECTED] * cs.po: Updated Czech translations Modified: libexo/trunk/po/pl.po === --- libexo/trunk/po/pl.po 2006-08-28 14:59:51 UTC (rev 22917) +++ libexo/trunk/po/pl.po 2006-08-28 15:09:43 UTC (rev 22918) @@ -9,7 +9,7 @@ Project-Id-Version: exo 0.3.1.8beta2\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2006-08-26 14:01+0200\n -PO-Revision-Date: 2006-06-08 23:00+0200\n +PO-Revision-Date: 2006-08-28 13:00+0200\n Last-Translator: Szymon Kałasz [EMAIL PROTECTED]\n Language-Team: Polish [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -19,45 +19,46 @@ #: ../exo/exo-cell-renderer-ellipsized-text.c:138 #: ../exo/exo-cell-renderer-icon.c:145 msgid Follow state -msgstr +msgstr Zgodnie ze stanem #: ../exo/exo-cell-renderer-ellipsized-text.c:139 #: ../exo/exo-cell-renderer-icon.c:146 msgid Render differently based on the selection state. -msgstr +msgstr Renderuj zależnie od stanu zaznaczenia. #: ../exo/exo-cell-renderer-icon.c:167 -#, fuzzy msgid Icon -msgstr _Ikona: +msgstr Ikona #: ../exo/exo-cell-renderer-icon.c:168 msgid The icon to render. -msgstr +msgstr Ikona do renderowania. #: ../exo/exo-cell-renderer-icon.c:189 msgid size -msgstr +msgstr rozmiar #: ../exo/exo-cell-renderer-icon.c:190 msgid The size of the icon to render in pixels. -msgstr +msgstr Rozmiar ikony do renderowania w pikselach. #: ../exo/exo-gdk-pixbuf-extensions.c:770 -#, fuzzy, c-format +#, c-format msgid Failed to open file \%s\: %s -msgstr Nie udało się otworzyć \%s\. +msgstr Nie można otworzyć pliku \%s\: %s #: ../exo/exo-gdk-pixbuf-extensions.c:832 -#, fuzzy, c-format +#, c-format msgid Failed to read file \%s\: %s -msgstr Nie udało się utworzyć \%s\. +msgstr Nie można odczytać pliku \%s\: %s #: ../exo/exo-gdk-pixbuf-extensions.c:873 #, c-format msgid Failed to load image \%s\: Unknown reason, probably a corrupt image file msgstr +Nie można załadować obrazu \%s\: Nieznana przyczyna, prawdopodobnie +niepoprawny format obrazu #: ../exo/exo-icon-bar.c:249 ../exo/exo-icon-view.c:774 msgid Orientation @@ -69,11 +70,11 @@ #: ../exo/exo-icon-bar.c:266 ../exo/exo-icon-view.c:791 msgid Pixbuf column -msgstr +msgstr Kolumna ikon #: ../exo/exo-icon-bar.c:267 ../exo/exo-icon-view.c:792 msgid Model column used to retrieve the icon pixbuf from -msgstr +msgstr Kolumna modelowa używana do pobierania ikon #: ../exo/exo-icon-bar.c:282 ../exo/exo-icon-view.c:918 msgid Text column @@ -125,73 +126,68 @@ #. EXO_ICON_CHOOSER_CONTEXT_ACTIONS #: ../exo/exo-icon-chooser-dialog.c:85 -#, fuzzy msgid Action Icons -msgstr Wybierz ikonę +msgstr Ikony akcji #. EXO_ICON_CHOOSER_CONTEXT_ANIMATIONS #: ../exo/exo-icon-chooser-dialog.c:87 msgid Animations -msgstr +msgstr Animacje #. EXO_ICON_CHOOSER_CONTEXT_APPLICATIONS #: ../exo/exo-icon-chooser-dialog.c:89 -#, fuzzy msgid Application Icons -msgstr Przycisk wybierania aplikacji +msgstr Ikony aplikacji #. EXO_ICON_CHOOSER_CONTEXT_CATEGORIES #: ../exo/exo-icon-chooser-dialog.c:91 msgid Menu Icons -msgstr +msgstr Ikony menu #. EXO_ICON_CHOOSER_CONTEXT_DEVICES #: ../exo/exo-icon-chooser-dialog.c:93 msgid Device Icons -msgstr +msgstr Ikony urządzeń #. EXO_ICON_CHOOSER_CONTEXT_EMBLEMS #: ../exo/exo-icon-chooser-dialog.c:95 msgid Emblems -msgstr +msgstr Emblematy #. EXO_ICON_CHOOSER_CONTEXT_EMOTES #: ../exo/exo-icon-chooser-dialog.c:97 -#, fuzzy msgid Emoticons -msgstr Brak ikony +msgstr Emotikony #. EXO_ICON_CHOOSER_CONTEXT_INTERNATIONAL #: ../exo/exo-icon-chooser-dialog.c:99 msgid International Denominations -msgstr +msgstr Międzynarodowe znaki #. EXO_ICON_CHOOSER_CONTEXT_MIME_TYPES #: ../exo/exo-icon-chooser-dialog.c:101 msgid File Type Icons -msgstr +msgstr Ikony typów plików #. EXO_ICON_CHOOSER_CONTEXT_PLACES #: ../exo/exo-icon-chooser-dialog.c:103 msgid Location Icons -msgstr +msgstr Ikony położenia #. EXO_ICON_CHOOSER_CONTEXT_STATUS #: ../exo/exo-icon-chooser-dialog.c:105 -#, fuzzy msgid Status Icons -msgstr Wybierz ikonę +msgstr Ikony statusu #. EXO_ICON_CHOOSER_CONTEXT_OTHER #: ../exo/exo-icon-chooser-dialog.c:107 msgid Uncategorized Icons -msgstr +msgstr Ikony nieprzypisane do kategorii #. EXO_ICON_CHOOSER_CONTEXT_ALL #: ../exo/exo-icon-chooser-dialog.c:111 -#, fuzzy
[Xfce4-commits] r22903 - in xfburn/trunk: po xfburn
Author: pollux Date: 2006-08-27 11:50:56 + (Sun, 27 Aug 2006) New Revision: 22903 Added: xfburn/trunk/po/nl.po Modified: xfburn/trunk/po/ChangeLog xfburn/trunk/po/LINGUAS xfburn/trunk/xfburn/xfburn-main-window.c Log: add Dutch translations Modified: xfburn/trunk/po/ChangeLog === --- xfburn/trunk/po/ChangeLog 2006-08-27 11:47:48 UTC (rev 22902) +++ xfburn/trunk/po/ChangeLog 2006-08-27 11:50:56 UTC (rev 22903) @@ -1,3 +1,7 @@ +2006-08-27 Jean-François Wauthy [EMAIL PROTECTED] + + * nl.po: Add Dutch translations + 2006-08-24 Jean-François Wauthy [EMAIL PROTECTED] * pl.po: Update Polish translations Modified: xfburn/trunk/po/LINGUAS === --- xfburn/trunk/po/LINGUAS 2006-08-27 11:47:48 UTC (rev 22902) +++ xfburn/trunk/po/LINGUAS 2006-08-27 11:50:56 UTC (rev 22903) @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -ca cs de el eu fi fr gl he hu ja lt pl ru uk zh_TW +ca cs de el eu fi fr gl he hu ja lt nl pl ru uk zh_TW Added: xfburn/trunk/po/nl.po === --- xfburn/trunk/po/nl.po (rev 0) +++ xfburn/trunk/po/nl.po 2006-08-27 11:50:56 UTC (rev 22903) @@ -0,0 +1,627 @@ +# Dutch translations for xfburn package. +# Copyright (C) 2006 THE xfburn'S COPYRIGHT HOLDER +# This file is distributed under the same license as the xfburn package. +# Stephan Arts [EMAIL PROTECTED], 2006. +# +msgid +msgstr +Project-Id-Version: xfburn 0.0.3svn-21957\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-08-25 07:51+0200\n +PO-Revision-Date: 2006-08-10 18:53+0200\n +Last-Translator: Stephan Arts [EMAIL PROTECTED]\n +Language-Team: Dutch [EMAIL PROTECTED]\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=ASCII\n +Content-Transfer-Encoding: 8bit\n +Plural-Forms: nplurals=2; plural=(n != 1);\n + +#: ../xfburn/xfburn-adding-progress.c:89 +msgid Adding files to the composition +msgstr Bestanden toevoegen aan compositie + +#: ../xfburn/xfburn-blank-cd-dialog.c:94 +#: ../xfburn/xfburn-blank-cd-progress-dialog.c:151 +#: ../xfburn/xfburn-main-window.c:114 +msgid Blank CD-RW +msgstr CD-RW wissen + +#: ../xfburn/xfburn-blank-cd-dialog.c:105 +#: ../xfburn/xfburn-burn-data-composition-dialog.c:131 +#: ../xfburn/xfburn-burn-image-dialog.c:122 +#: ../xfburn/xfburn-copy-cd-dialog.c:131 +msgid Burning device +msgstr Brand apparaat + +#: ../xfburn/xfburn-blank-cd-dialog.c:111 +msgid Fast +msgstr Snel + +#: ../xfburn/xfburn-blank-cd-dialog.c:112 +msgid Complete +msgstr Klaar + +#: ../xfburn/xfburn-blank-cd-dialog.c:113 +msgid Reopen last session +msgstr Heropen laatste sessie + +#: ../xfburn/xfburn-blank-cd-dialog.c:114 +msgid Erase last session +msgstr Verwijder laatste sessie + +#: ../xfburn/xfburn-blank-cd-dialog.c:118 +msgid Blank type +msgstr Wis type + +#: ../xfburn/xfburn-blank-cd-dialog.c:126 +#: ../xfburn/xfburn-burn-data-composition-dialog.c:152 +#: ../xfburn/xfburn-burn-image-dialog.c:143 +#: ../xfburn/xfburn-copy-cd-dialog.c:139 +msgid Options +msgstr Opties + +#: ../xfburn/xfburn-blank-cd-dialog.c:130 +#, fuzzy +msgid _Force +msgstr _Force + +#: ../xfburn/xfburn-blank-cd-dialog.c:134 +#: ../xfburn/xfburn-burn-data-composition-dialog.c:156 +#: ../xfburn/xfburn-burn-image-dialog.c:147 +#: ../xfburn/xfburn-copy-cd-dialog.c:143 +msgid E_ject disk +msgstr Disk Uitw_erpen + +#: ../xfburn/xfburn-blank-cd-dialog.c:144 +msgid _Blank +msgstr _Wissen + +#: ../xfburn/xfburn-blank-cd-progress-dialog.c:133 +msgid Blanking... +msgstr Wissen... + +#: ../xfburn/xfburn-blank-cd-progress-dialog.c:136 +msgid Performing OPC... +msgstr OPC uitvoeren... + +#: ../xfburn/xfburn-burn-data-composition-dialog.c:123 +msgid Burn Composition +msgstr Compositie branden + +#: ../xfburn/xfburn-burn-data-composition-dialog.c:140 +#: ../xfburn/xfburn-burn-image-dialog.c:131 +msgid Write _mode : +msgstr Schrijf _modus: + +#: ../xfburn/xfburn-burn-data-composition-dialog.c:161 +#: ../xfburn/xfburn-burn-image-dialog.c:152 +#: ../xfburn/xfburn-copy-cd-dialog.c:148 +msgid _Dummy write +msgstr + +#: ../xfburn/xfburn-burn-data-composition-dialog.c:165 +#: ../xfburn/xfburn-burn-image-dialog.c:156 +#, fuzzy +msgid Burn_Free +msgstr Burn_Free + +#. create ISO ? +#: ../xfburn/xfburn-burn-data-composition-dialog.c:171 +#: ../xfburn/xfburn-copy-cd-dialog.c:157 +msgid Only create _ISO +msgstr Alleen _ISO maken + +#: ../xfburn/xfburn-burn-data-composition-dialog.c:208 +msgid _Burn Composition +msgstr Compositie _Branden + +#: ../xfburn/xfburn-burn-data-composition-progress-dialog.c:84 +#: ../xfburn/xfburn-burn-image-progress-dialog.c:89 +msgid Finishing +msgstr Afmaken + +#: ../xfburn/xfburn-burn-data-composition-progress-dialog.c:90 +#: ../xfburn/xfburn-burn-image-progress-dialog.c:95 +msgid Fixating... +msgstr Fixeren... + +#: ../xfburn/xfburn-burn-data-composition-progress-dialog.c:98
[Xfce4-commits] r22874 - xarchiver/trunk/po
Author: pollux Date: 2006-08-24 18:33:48 + (Thu, 24 Aug 2006) New Revision: 22874 Added: xarchiver/trunk/po/gl.po Modified: xarchiver/trunk/po/ChangeLog xarchiver/trunk/po/LINGUAS Log: Add Galician and update Polish translations Modified: xarchiver/trunk/po/ChangeLog === --- xarchiver/trunk/po/ChangeLog2006-08-24 18:29:24 UTC (rev 22873) +++ xarchiver/trunk/po/ChangeLog2006-08-24 18:33:48 UTC (rev 22874) @@ -1,3 +1,8 @@ +2006-08-24 Jean-François Wauthy [EMAIL PROTECTED] + + * gl.po: Add Galician translations + * pl.po: Update Polish translations + 2006-08-23 Jari Rahkonen [EMAIL PROTECTED] * fi.po: Updated Finnish translation. @@ -4,7 +9,7 @@ 2006-08-07 Piarres Beobide [EMAIL PROTECTED] -* eu.po: Basque translation update. + * eu.po: Basque translation update. 2006-08-06 Jari Rahkonen [EMAIL PROTECTED] Modified: xarchiver/trunk/po/LINGUAS === --- xarchiver/trunk/po/LINGUAS 2006-08-24 18:29:24 UTC (rev 22873) +++ xarchiver/trunk/po/LINGUAS 2006-08-24 18:33:48 UTC (rev 22874) @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -de el eu fi fr he hu ja nl pl ru sv zh_TW +de el eu fi fr gl he hu ja nl pl ru sv zh_TW Added: xarchiver/trunk/po/gl.po === --- xarchiver/trunk/po/gl.po(rev 0) +++ xarchiver/trunk/po/gl.po2006-08-24 18:33:48 UTC (rev 22874) @@ -0,0 +1,404 @@ +# Galician translation for xarchiver +# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 +# This file is distributed under the same license as the xarchiver package. +# FIRST AUTHOR [EMAIL PROTECTED], 2006. +# +#, fuzzy +msgid +msgstr +Project-Id-Version: xarchiver\n +Report-Msgid-Bugs-To: FULL NAME [EMAIL PROTECTED]\n +POT-Creation-Date: 2006-04-27 10:32+0200\n +PO-Revision-Date: 2006-08-17 19:16+\n +Last-Translator: Leandro Regueiro [EMAIL PROTECTED]\n +Language-Team: Galician [EMAIL PROTECTED]\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n + +#: src/main.c:61 +msgid Ready. +msgstr + +#: src/main.c:184 +#, c-format +msgid +xarchiver: invalid option %s\n +Try xarchiver -h for more information.\n +msgstr + +#: src/interface.c:49 +msgid _Archive +msgstr + +#: src/interface.c:79 +msgid _Action +msgstr + +#: src/interface.c:88 src/interface.c:195 +msgid Add File +msgstr + +#: src/interface.c:92 src/interface.c:204 +msgid Add Folder +msgstr + +#: src/interface.c:101 src/interface.c:218 +msgid Extract +msgstr Extraer + +#: src/interface.c:111 src/interface.c:237 +msgid View +msgstr Ver + +#: src/interface.c:136 +msgid Set Password +msgstr + +#: src/interface.c:141 +msgid View S_hell Output +msgstr + +#: src/interface.c:158 +msgid _About +msgstr _Acerca de + +#: src/interface.c:172 +msgid New +msgstr Novo + +#: src/interface.c:177 src/callbacks.c:699 +msgid Create a new archive +msgstr Crear un novo arquivo + +#: src/interface.c:181 +msgid Open +msgstr Abrir + +#: src/interface.c:186 src/callbacks.c:705 +msgid Open an archive +msgstr Abrir un arquivo + +#: src/interface.c:200 +msgid Add a file to the current archive +msgstr Engadir un ficheiro ó arquivo actual + +#: src/interface.c:209 +msgid Add an entire folder to the current archive +msgstr + +#: src/interface.c:223 +msgid +Extract files from the current archive; use the mouse to select files +individually +msgstr + +#: src/interface.c:227 +msgid Delete +msgstr + +#: src/interface.c:233 +msgid Delete files from the current archive +msgstr + +#: src/interface.c:243 +msgid View file content in the current archive +msgstr + +#: src/interface.c:301 +msgid This archive contains password protected files +msgstr Este arquivo contén ficheiros protexidos por contrasinal + +#: src/interface.c:419 +msgid Extract ONLY selected files +msgstr + +#: src/interface.c:420 +msgid Extract ALL files +msgstr + +#: src/interface.c:446 +msgid Choose a folder where to extract files +msgstr + +#: src/interface.c:461 +msgid Extract to: +msgstr Extraer a: + +#: src/interface.c:531 +msgid Enter Archive Password +msgstr Introduza o Contrasinal do Arquivo + +#: src/interface.c:551 +msgid Password: +msgstr Contrasinal: + +#: src/interface.c:566 +msgid Retype it: +msgstr + +#: src/interface.c:571 +msgid +Please note that the password is automatically resetted each time you open +or create a new archive. +msgstr + +#: src/interface.c:615 +msgid View File Window +msgstr + +#: src/callbacks.c:61 src/rpm.c:113 src/rpm.c:136 +msgid Operation failed. +msgstr + +#: src/callbacks.c:68 +msgid +An error occurred while accessing the archive.\n +Do you want to view the shell output ? +msgstr + +#: src/callbacks.c:83 +msgid Please wait while the content of the archive is being updated... +msgstr + +#:
[Xfce4-commits] r22846 - xfburn/trunk/xfburn
Author: pollux Date: 2006-08-21 14:52:02 + (Mon, 21 Aug 2006) New Revision: 22846 Added: xfburn/trunk/xfburn/xfburn-device-list.c xfburn/trunk/xfburn/xfburn-device-list.h Modified: xfburn/trunk/xfburn/Makefile.am xfburn/trunk/xfburn/xfburn-blank-cd-progress-dialog.c xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h xfburn/trunk/xfburn/xfburn-burn-data-composition-progress-dialog.c xfburn/trunk/xfburn/xfburn-burn-image-dialog.h xfburn/trunk/xfburn/xfburn-burn-image-progress-dialog.c xfburn/trunk/xfburn/xfburn-copy-cd-dialog.h xfburn/trunk/xfburn/xfburn-copy-cd-progress-dialog.c xfburn/trunk/xfburn/xfburn-create-iso-from-composition-progress-dialog.c xfburn/trunk/xfburn/xfburn-create-iso-progress-dialog.c xfburn/trunk/xfburn/xfburn-device-box.c xfburn/trunk/xfburn/xfburn-device-box.h xfburn/trunk/xfburn/xfburn-global.h xfburn/trunk/xfburn/xfburn-main.c xfburn/trunk/xfburn/xfburn-preferences-dialog.c xfburn/trunk/xfburn/xfburn-utils.c xfburn/trunk/xfburn/xfburn-utils.h Log: add xfburn-device-list.[ch] Modified: xfburn/trunk/xfburn/Makefile.am === --- xfburn/trunk/xfburn/Makefile.am 2006-08-21 13:16:43 UTC (rev 22845) +++ xfburn/trunk/xfburn/Makefile.am 2006-08-21 14:52:02 UTC (rev 22846) @@ -25,6 +25,7 @@ xfburn-create-iso-progress-dialog.h \ xfburn-create-iso-from-composition-progress-dialog.h\ xfburn-device-box.h \ + xfburn-device-list.h\ xfburn-progress-dialog.h\ xfburn-main-window.h\ xfburn-notebook-tab.h \ @@ -55,6 +56,7 @@ xfburn-copy-cd-dialog.c \ xfburn-copy-cd-progress-dialog.c\ xfburn-device-box.c \ + xfburn-device-list.c\ xfburn-progress-dialog.c\ xfburn-main.c \ xfburn-main-window.c\ Modified: xfburn/trunk/xfburn/xfburn-blank-cd-progress-dialog.c === --- xfburn/trunk/xfburn/xfburn-blank-cd-progress-dialog.c 2006-08-21 13:16:43 UTC (rev 22845) +++ xfburn/trunk/xfburn/xfburn-blank-cd-progress-dialog.c 2006-08-21 14:52:02 UTC (rev 22846) @@ -25,6 +25,8 @@ #include string.h #endif +#include libxfce4util/libxfce4util.h + #include xfburn-global.h #include xfburn-progress-dialog.h Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h === --- xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h 2006-08-21 13:16:43 UTC (rev 22845) +++ xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h 2006-08-21 14:52:02 UTC (rev 22846) @@ -25,6 +25,7 @@ #endif /* !HAVE_CONFIG_H */ #include gtk/gtk.h +#include libxfcegui4/libxfcegui4.h #include xfburn-data-composition.h Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-progress-dialog.c === --- xfburn/trunk/xfburn/xfburn-burn-data-composition-progress-dialog.c 2006-08-21 13:16:43 UTC (rev 22845) +++ xfburn/trunk/xfburn/xfburn-burn-data-composition-progress-dialog.c 2006-08-21 14:52:02 UTC (rev 22846) @@ -25,6 +25,8 @@ #include string.h #endif +#include libxfce4util/libxfce4util.h + #include xfburn-progress-dialog.h #include xfburn-burn-data-composition-progress-dialog.h Modified: xfburn/trunk/xfburn/xfburn-burn-image-dialog.h === --- xfburn/trunk/xfburn/xfburn-burn-image-dialog.h 2006-08-21 13:16:43 UTC (rev 22845) +++ xfburn/trunk/xfburn/xfburn-burn-image-dialog.h 2006-08-21 14:52:02 UTC (rev 22846) @@ -26,6 +26,8 @@ #include gtk/gtk.h +#include libxfcegui4/libxfcegui4.h + #include xfburn-global.h G_BEGIN_DECLS Modified: xfburn/trunk/xfburn/xfburn-burn-image-progress-dialog.c === --- xfburn/trunk/xfburn/xfburn-burn-image-progress-dialog.c 2006-08-21 13:16:43 UTC (rev 22845) +++ xfburn/trunk/xfburn/xfburn-burn-image-progress-dialog.c 2006-08-21 14:52:02 UTC (rev 22846) @@ -24,6 +24,7 @@ #ifdef HAVE_STRING_H #include string.h #endif +#include libxfce4util/libxfce4util.h #include xfburn-global.h #include xfburn-progress-dialog.h @@ -68,8 +69,6 @@ static void xfburn_burn_image_progress_dialog_class_init (XfburnBurnImageProgressDialogClass * klass) {
[Xfce4-commits] r22812 - libxfcegui4/trunk/po
Author: pollux Date: 2006-08-17 16:29:20 + (Thu, 17 Aug 2006) New Revision: 22812 Added: libxfcegui4/trunk/po/gl.po Modified: libxfcegui4/trunk/po/ChangeLog libxfcegui4/trunk/po/LINGUAS Log: Add Galician translations Modified: libxfcegui4/trunk/po/ChangeLog === --- libxfcegui4/trunk/po/ChangeLog 2006-08-17 13:26:51 UTC (rev 22811) +++ libxfcegui4/trunk/po/ChangeLog 2006-08-17 16:29:20 UTC (rev 22812) @@ -1,3 +1,7 @@ +2006-08-17 Jean-François Wauthy [EMAIL PROTECTED] + + * gl.po: Add Galician translations + 2006-06-12 Hydonsingore Cia [EMAIL PROTECTED] * zh_TW.po: Modify the translator's e-mail address. Modified: libxfcegui4/trunk/po/LINGUAS === --- libxfcegui4/trunk/po/LINGUAS2006-08-17 13:26:51 UTC (rev 22811) +++ libxfcegui4/trunk/po/LINGUAS2006-08-17 16:29:20 UTC (rev 22812) @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -be bn_IN ca cs de en_GB el eo es et eu fa fi fr gu he hu hy it ja ko lt mr nl pa pl pt_BR ro ru sk sv ta uk zh_CN zh_TW +be bn_IN ca cs de en_GB el eo es et eu fa fi fr gl gu he hu hy it ja ko lt mr nl pa pl pt_BR ro ru sk sv ta uk zh_CN zh_TW Added: libxfcegui4/trunk/po/gl.po === --- libxfcegui4/trunk/po/gl.po (rev 0) +++ libxfcegui4/trunk/po/gl.po 2006-08-17 16:29:20 UTC (rev 22812) @@ -0,0 +1,122 @@ +# Galician translation for libxfcegui4 +# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 +# This file is distributed under the same license as the libxfcegui4 package. +# FIRST AUTHOR [EMAIL PROTECTED], 2006. +# +msgid +msgstr +Project-Id-Version: libxfcegui4\n +Report-Msgid-Bugs-To: Xfce i18n xfce-i18n@xfce.org\n +POT-Creation-Date: 2006-04-30 17:26+0900\n +PO-Revision-Date: 2006-06-08 08:11+\n +Last-Translator: Ricardo Domínguez Rouco [EMAIL PROTECTED]\n +Language-Team: Galician [EMAIL PROTECTED]\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n + +#: libxfcegui4/netk-window-action-menu.c:215 +#: libxfcegui4/netk-window-action-menu.c:217 +msgid Workspace +msgstr Espazo de traballo + +#: libxfcegui4/netk-window-action-menu.c:246 +msgid S_how +msgstr _Amosar + +#: libxfcegui4/netk-window-action-menu.c:253 +msgid _Hide +msgstr A_gochar + +#: libxfcegui4/netk-window-action-menu.c:261 +msgid Un_maximize +msgstr _Restaurar + +#: libxfcegui4/netk-window-action-menu.c:268 +msgid Ma_ximize +msgstr Ma_ximizar + +#: libxfcegui4/netk-window-action-menu.c:276 +msgid Un_shade +msgstr Dese_nrolar + +#: libxfcegui4/netk-window-action-menu.c:283 +msgid _Shade +msgstr _Enrolar + +#: libxfcegui4/netk-window-action-menu.c:291 +msgid Uns_tick +msgstr De_spegar + +#: libxfcegui4/netk-window-action-menu.c:299 +msgid S_tick +msgstr _Pegar + +#: libxfcegui4/netk-window-action-menu.c:439 +msgid Send to... +msgstr Enviar a... + +#: libxfcegui4/netk-window-action-menu.c:463 +msgid _Close +msgstr _Pechar + +#: libxfcegui4/xfce-appmenuitem.c:162 +msgid Needs terminal +msgstr Precisa terminal + +#: libxfcegui4/xfce-appmenuitem.c:163 +msgid Whether or not the command needs a terminal to execute +msgstr O comando pode ou non precisar dun terminal para executarse + +#: libxfcegui4/xfce-appmenuitem.c:167 +msgid Command +msgstr Comando + +#: libxfcegui4/xfce-appmenuitem.c:168 +msgid The command to run when the item is clicked +msgstr Comando a executar cando o elemento sexa pulsado + +#: libxfcegui4/xfce-appmenuitem.c:172 +msgid Icon name +msgstr Nome da icona + +#: libxfcegui4/xfce-appmenuitem.c:173 +msgid The name of the themed icon to display next to the item +msgstr O nome da icona asociada para mostrar ó lado do elemento + +#: libxfcegui4/xfce_aboutdialog.c:647 +#, c-format +msgid About %s... +msgstr Acerca de %s... + +#: libxfcegui4/xfce_aboutdialog.c:1036 +msgid Visit homepage +msgstr Visitar a páxina web + +#: libxfcegui4/xfce_aboutdialog.c:1048 +msgid Info +msgstr Información + +#: libxfcegui4/xfce_aboutdialog.c:1070 +msgid Credits +msgstr Créditos + +#: libxfcegui4/xfce_aboutdialog.c:1092 +msgid License +msgstr Licenza + +#: libxfcegui4/xfce_systemtray.c:353 libxfcegui4/xfce_systemtray.c:357 +#, c-format +msgid Failed to acquire manager selection +msgstr Fallou a adqusición da selección de administración + +#: libxfcegui4/xfce_systemtray.c:484 +#, c-format +msgid tray icon has requested a size of (%i x %i), resizing to (%i x %i) +msgstr +O icono da Bandexa do Sistema pediu un tamaño de (%i x %i), redimensionandoo +a (%i x %i) + +#: libxfcegui4/xfce_systemtray.c:493 +msgid tray icon was not attached, destroying it +msgstr o icono da Bandexa do Sistema non foi adxuntado, destruíndoo ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22778 - in xfburn/trunk: . xfburn
Author: pollux Date: 2006-08-15 16:17:38 + (Tue, 15 Aug 2006) New Revision: 22778 Modified: xfburn/trunk/NEWS xfburn/trunk/xfburn/xfburn-burn-image-dialog.c xfburn/trunk/xfburn/xfburn-data-composition.c Log: - Fix wrong get_speed call in burn iso dialog - Directory are sort before files in data composition Modified: xfburn/trunk/NEWS === --- xfburn/trunk/NEWS 2006-08-15 15:25:40 UTC (rev 22777) +++ xfburn/trunk/NEWS 2006-08-15 16:17:38 UTC (rev 22778) @@ -1,6 +1,8 @@ xfburn 0.x == +- Fix wrong get_speed call in burn iso dialog +- Directory are sort before files in data composition - Fix segfault when removing a file and one of its parent directory together xfburn 0.2.0beta Modified: xfburn/trunk/xfburn/xfburn-burn-image-dialog.c === --- xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2006-08-15 15:25:40 UTC (rev 22777) +++ xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2006-08-15 16:17:38 UTC (rev 22778) @@ -39,7 +39,6 @@ GtkWidget *chooser_image; GtkWidget *device_box; - GtkWidget *combo_speed; GtkWidget *combo_mode; GtkWidget *check_eject; @@ -190,9 +189,8 @@ iso_path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (priv-chooser_image)); device = xfburn_device_box_get_selected_device (XFBURN_DEVICE_BOX (priv-device_box)); +speed = xfburn_device_box_get_speed (XFBURN_DEVICE_BOX (priv-device_box)); -speed = gtk_combo_box_get_active_text (GTK_COMBO_BOX (priv-combo_speed)); - write_mode = xfburn_write_mode_combo_box_get_cdrecord_param (XFBURN_WRITE_MODE_COMBO_BOX (priv-combo_mode)); command = g_strconcat (cdrecord -v gracetime=2, dev=, device-node_path, , write_mode, speed=, speed, Modified: xfburn/trunk/xfburn/xfburn-data-composition.c === --- xfburn/trunk/xfburn/xfburn-data-composition.c 2006-08-15 15:25:40 UTC (rev 22777) +++ xfburn/trunk/xfburn/xfburn-data-composition.c 2006-08-15 16:17:38 UTC (rev 22778) @@ -525,28 +525,22 @@ directory_tree_sortfunc (GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer user_data) { /* adapted from gnomebaker */ - gchar *aname, *bname, *apath, *bpath; - gboolean aisdir = FALSE; - gboolean bisdir = FALSE; + gchar *aname, *bname; + DataCompositionEntryType atype = -1, btype = -1; gint result = 0; - gtk_tree_model_get (model, a, DATA_COMPOSITION_COLUMN_CONTENT, aname, DATA_COMPOSITION_COLUMN_PATH, apath, -1); - gtk_tree_model_get (model, b, DATA_COMPOSITION_COLUMN_CONTENT, bname, DATA_COMPOSITION_COLUMN_PATH, bpath, -1); + gtk_tree_model_get (model, a, DATA_COMPOSITION_COLUMN_CONTENT, aname, DATA_COMPOSITION_COLUMN_TYPE, atype, -1); + gtk_tree_model_get (model, b, DATA_COMPOSITION_COLUMN_CONTENT, bname, DATA_COMPOSITION_COLUMN_TYPE, btype, -1); - aisdir = g_file_test (apath, G_FILE_TEST_IS_DIR); - bisdir = g_file_test (bpath, G_FILE_TEST_IS_DIR); - - if (aisdir !bisdir) + if ( (atype == DATA_COMPOSITION_TYPE_DIRECTORY) (btype != DATA_COMPOSITION_TYPE_DIRECTORY) ) result = -1; - else if (!aisdir bisdir) + else if ( (atype != DATA_COMPOSITION_TYPE_DIRECTORY) (btype == DATA_COMPOSITION_TYPE_DIRECTORY) ) result = 1; else result = g_ascii_strcasecmp (aname, bname); g_free (aname); - g_free (apath); g_free (bname); - g_free (bpath); return result; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22780 - libexo/trunk/po thunar/trunk/po xfce-utils/trunk/po xfce4-panel/trunk/po xfce4-terminal/trunk/po xfdesktop/trunk/po xfwm4/trunk/po
Author: pollux Date: 2006-08-15 19:21:07 + (Tue, 15 Aug 2006) New Revision: 22780 Modified: libexo/trunk/po/ChangeLog libexo/trunk/po/pl.po thunar/trunk/po/ChangeLog thunar/trunk/po/pl.po xfce-utils/trunk/po/ChangeLog xfce-utils/trunk/po/pl.po xfce4-panel/trunk/po/ChangeLog xfce4-panel/trunk/po/pl.po xfce4-terminal/trunk/po/ChangeLog xfce4-terminal/trunk/po/pl.po xfdesktop/trunk/po/ChangeLog xfdesktop/trunk/po/pl.po xfwm4/trunk/po/ChangeLog xfwm4/trunk/po/pl.po Log: updated Polish translations by piotr mali?\197?\132ski [EMAIL PROTECTED] Modified: libexo/trunk/po/ChangeLog === --- libexo/trunk/po/ChangeLog 2006-08-15 18:51:23 UTC (rev 22779) +++ libexo/trunk/po/ChangeLog 2006-08-15 19:21:07 UTC (rev 22780) @@ -1,3 +1,8 @@ +2006-08-15 Jean-François Wauthy [EMAIL PROTECTED] + + * pl.po: Update Polish translations by piotr maliński + [EMAIL PROTECTED] + 2006-08-15 Jari Rahkonen [EMAIL PROTECTED] * fi.po: Updated Finnish translation. Modified: libexo/trunk/po/pl.po === --- libexo/trunk/po/pl.po 2006-08-15 18:51:23 UTC (rev 22779) +++ libexo/trunk/po/pl.po 2006-08-15 19:21:07 UTC (rev 22780) @@ -34,11 +34,11 @@ #: ../exo/exo-icon-bar.c:282 ../exo/exo-icon-view.c:926 msgid Text column -msgstr +msgstr Kolumna tekstu #: ../exo/exo-icon-bar.c:283 ../exo/exo-icon-view.c:927 msgid Model column used to retrieve the text from -msgstr +msgstr Kolumna modelowa używana do pobierania tekstu #: ../exo/exo-icon-bar.c:295 msgid Icon Bar Model @@ -438,9 +438,9 @@ msgstr Skrypty powłoki #: ../exo-desktop-item-edit/exo-die-desktop-model.c:326 -#, fuzzy, c-format +#, c-format msgid Create Launcher b%s/b -msgstr Utwórz aktywator +msgstr Utwórz aktywator b%s/b #. TRANSLATORS: Label in Create Launcher/Create Link dialog, make sure to avoid mnemonic conflicts #: ../exo-desktop-item-edit/exo-die-editor.c:318 @@ -578,7 +578,7 @@ #. tell the user that we don't support the type #: ../exo-desktop-item-edit/main.c:225 -#, fuzzy, c-format +#, c-format msgid Unsupported desktop file type \%s\ msgstr Nieobsługiwany typ pliku pulpitu \%s\ @@ -879,7 +879,7 @@ #: ../exo-helper/helpers/urxvt.desktop.in.in.h:1 msgid RXVT Unicode -msgstr +msgstr Unikod RXVT #: ../exo-helper/helpers/xterm.desktop.in.in.h:1 msgid X Terminal Modified: thunar/trunk/po/ChangeLog === --- thunar/trunk/po/ChangeLog 2006-08-15 18:51:23 UTC (rev 22779) +++ thunar/trunk/po/ChangeLog 2006-08-15 19:21:07 UTC (rev 22780) @@ -1,3 +1,8 @@ +2006-08-15 Jean-François Wauthy [EMAIL PROTECTED] + + * pl.po: Updated Polish translations by piotr maliński + [EMAIL PROTECTED] + 2006-08-13 Benedikt Meurer [EMAIL PROTECTED] * Thunar.pot, *.po: Merge new strings. Modified: thunar/trunk/po/pl.po === --- thunar/trunk/po/pl.po 2006-08-15 18:51:23 UTC (rev 22779) +++ thunar/trunk/po/pl.po 2006-08-15 19:21:07 UTC (rev 22780) @@ -51,9 +51,8 @@ msgstr Nieprawidłowa nazwa pliku #: ../thunar-vfs/thunar-vfs-info.c:458 -#, fuzzy msgid Only local files may be renamed -msgstr Tylko lokalne pliki mogą zostać zmienione +msgstr Można zmieniać nazwy tylko lokalnych plików #. tell the user that we're preparing to unlink the files #: ../thunar-vfs/thunar-vfs-io-jobs.c:81 @@ -67,7 +66,7 @@ msgstr Nie udało się zmienić uprawnień do \%s\ #: ../thunar-vfs/thunar-vfs-io-jobs.c:347 -#, fuzzy, c-format +#, c-format msgid Failed to change file owner of \%s\ msgstr Nie udało się zmienić właściciela dla \%s\ @@ -242,19 +241,13 @@ msgstr Nie można przenosić ani kopiować plików w śmietniku #: ../thunar-vfs/thunar-vfs-job.c:831 -#, fuzzy msgid Do you want to overwrite it? msgstr -%s.\n -\n Czy chcesz go nadpisać? #: ../thunar-vfs/thunar-vfs-job.c:896 -#, fuzzy msgid Do you want to skip it? msgstr -%s.\n -\n Czy chcesz go pominąć? #: ../thunar-vfs/thunar-vfs-mime-database.c:1675 @@ -321,9 +314,8 @@ msgstr Identyfikator URI jest zbyt długi #: ../thunar-vfs/thunar-vfs-private.c:225 -#, fuzzy msgid Operation not supported -msgstr Nazwane rurki nie są wspierane +msgstr Operacja nie wspierana #. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396) #: ../thunar-vfs/thunar-vfs-private.c:327 @@ -555,9 +547,8 @@ #: ../thunar/thunar-location-buttons.c:1265 #: ../thunar/thunar-shortcuts-view.c:855 ../thunar/thunar-tree-view.c:1076 #: ../plugins/thunar-tpa/main.c:49 -#, fuzzy msgid _Empty Trash -msgstr _Opróżnij śmietnik +msgstr _Opróżnij Śmietnik #: ../thunar/thunar-application.c:1273 msgid @@ -848,9 +839,8 @@ msgstr Widok oszczędny #: ../thunar/thunar-create-dialog.c:166 -#, fuzzy msgid C_reate -msgstr Stwórz
[Xfce4-commits] r22742 - xfdesktop/trunk/menueditor
Author: pollux Date: 2006-08-13 10:15:44 + (Sun, 13 Aug 2006) New Revision: 22742 Modified: xfdesktop/trunk/menueditor/menueditor-main-window.c Log: warn the user if the menu file couldn't be opened in write mode Modified: xfdesktop/trunk/menueditor/menueditor-main-window.c === --- xfdesktop/trunk/menueditor/menueditor-main-window.c 2006-08-13 10:14:38 UTC (rev 22741) +++ xfdesktop/trunk/menueditor/menueditor-main-window.c 2006-08-13 10:15:44 UTC (rev 22742) @@ -123,7 +123,7 @@ static void cb_treeview_row_activated (GtkWidget *, GtkTreePath *, GtkTreeViewColumn *, MenuEditorMainWindow *); static gboolean load_menu_in_treeview (const gchar *, MenuEditorMainWindow *); -static gboolean save_treeview_in_file (MenuEditorMainWindow *window); +static void save_treeview_in_file (MenuEditorMainWindow *window); static void copy_menuelement_to (MenuEditorMainWindowPrivate *priv, GtkTreeIter *src, GtkTreeIter *dest, GtkTreeViewDropPosition position); @@ -1987,14 +1987,14 @@ return FALSE; } -static gboolean +static void save_treeview_in_file (MenuEditorMainWindow *window) { MenuEditorMainWindowPrivate *priv = MENUEDITOR_MAIN_WINDOW_GET_PRIVATE (window); FILE *file_menu; GtkAction *action; - g_return_val_if_fail (window != NULL, FALSE); + g_return_if_fail (window != NULL); file_menu = fopen (priv-menu_file_name, w+); @@ -2023,14 +2023,15 @@ } fprintf (file_menu, /xfdesktop-menu\n); + +action = gtk_action_group_get_action (priv-action_group, save-menu); +gtk_action_set_sensitive (action, FALSE); +priv-menu_modified = FALSE; + fclose (file_menu); + } else { +xfce_err (_(Unable to open the menu file %s in write mode), priv-menu_file_name); } - - action = gtk_action_group_get_action (priv-action_group, save-menu); - gtk_action_set_sensitive (action, FALSE); - priv-menu_modified = FALSE; - - return TRUE; } /* DnD */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22719 - in xfburn/trunk: . xfburn
Author: pollux Date: 2006-08-11 22:42:33 + (Fri, 11 Aug 2006) New Revision: 22719 Modified: xfburn/trunk/NEWS xfburn/trunk/xfburn/xfburn-data-composition.c Log: Fix segfault when removing a file and one of its parent directory together Modified: xfburn/trunk/NEWS === --- xfburn/trunk/NEWS 2006-08-11 19:42:35 UTC (rev 22718) +++ xfburn/trunk/NEWS 2006-08-11 22:42:33 UTC (rev 22719) @@ -1,3 +1,8 @@ +xfburn 0.x +== + +- Fix segfault when removing a file and one of its parent directory together + xfburn 0.2.0beta Modified: xfburn/trunk/xfburn/xfburn-data-composition.c === --- xfburn/trunk/xfburn/xfburn-data-composition.c 2006-08-11 19:42:35 UTC (rev 22718) +++ xfburn/trunk/xfburn/xfburn-data-composition.c 2006-08-11 22:42:33 UTC (rev 22719) @@ -716,70 +716,82 @@ } static void +remove_row_reference (GtkTreeRowReference *reference, XfburnDataCompositionPrivate *priv) +{ + GtkTreePath *path = NULL; + GtkTreeModel *model; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv-content)); + + path = gtk_tree_row_reference_get_path (reference); + if (path) { +GtkTreeIter iter; + +if (gtk_tree_model_get_iter (model, iter, path)) { + GtkTreeIter parent, iter_temp; + guint64 size = 0; + + gtk_tree_model_get (model, iter, DATA_COMPOSITION_COLUMN_SIZE, size, -1); + xfburn_data_disc_usage_sub_size (XFBURN_DATA_DISC_USAGE (priv-disc_usage), size); + + iter_temp = iter; + while (gtk_tree_model_iter_parent (model, parent, iter_temp)) { +guint64 old_size; +gchar *humansize = NULL; + +/* updates parent directories size */ +gtk_tree_model_get (model, parent, DATA_COMPOSITION_COLUMN_SIZE, old_size, -1); + +humansize = xfburn_humanreadable_filesize (old_size - size); +gtk_tree_store_set (GTK_TREE_STORE (model), parent, +DATA_COMPOSITION_COLUMN_HUMANSIZE, humansize, +DATA_COMPOSITION_COLUMN_SIZE, old_size - size, -1); + +iter_temp = parent; + +g_free (humansize); + } + + gtk_tree_store_remove (GTK_TREE_STORE (model), iter); +} + +gtk_tree_path_free (path); + } + + gtk_tree_row_reference_free (reference); +} + +static void action_remove_selection (GtkAction * action, XfburnDataComposition * dc) { XfburnDataCompositionPrivate *priv = XFBURN_DATA_COMPOSITION_GET_PRIVATE (dc); GtkTreeSelection *selection; GtkTreeModel *model; - GList *list_paths = NULL, *list_iters = NULL, *el; - + GList *list_paths = NULL, *el; + GList *references = NULL; + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv-content)); list_paths = gtk_tree_selection_get_selected_rows (selection, model); - /* recompute new disc usage */ el = list_paths; while (el) { GtkTreePath *path = NULL; -GtkTreeIter *iter = NULL; -GtkTreeIter parent, iter_temp; -guint64 size = 0; - +GtkTreeRowReference *reference = NULL; + path = (GtkTreePath *) el-data; -iter = g_new0 (GtkTreeIter, 1); - -gtk_tree_model_get_iter (model, iter, path); -list_iters = g_list_append (list_iters, iter); - -gtk_tree_model_get (model, iter, DATA_COMPOSITION_COLUMN_SIZE, size, -1); -xfburn_data_disc_usage_sub_size (XFBURN_DATA_DISC_USAGE (priv-disc_usage), size); - -iter_temp = *iter; -while (gtk_tree_model_iter_parent (model, parent, iter_temp)) { - guint64 old_size; - gchar *humansize = NULL; - - /* updates parent directories size */ - gtk_tree_model_get (model, parent, DATA_COMPOSITION_COLUMN_SIZE, old_size, -1); - - humansize = xfburn_humanreadable_filesize (old_size - size); - gtk_tree_store_set (GTK_TREE_STORE (model), parent, - DATA_COMPOSITION_COLUMN_HUMANSIZE, humansize, - DATA_COMPOSITION_COLUMN_SIZE, old_size - size, -1); - - iter_temp = parent; - - g_free (humansize); -} - +reference = gtk_tree_row_reference_new (model, path); gtk_tree_path_free (path); + +if (reference) + references = g_list_prepend (references, reference); + el = g_list_next (el); - } + } g_list_free (list_paths); - - /* remove rows from the list */ - el = list_iters; - while (el) { -GtkTreeIter *iter = NULL; - -iter = (GtkTreeIter *) el-data; -gtk_tree_store_remove (GTK_TREE_STORE (model), iter); - -g_free (iter); -el = g_list_next (el); - } - g_list_free (list_iters); - + + g_list_foreach (references, (GFunc) remove_row_reference, priv); + g_list_free (references); } static void @@ -905,7 +917,7 @@ reference = gtk_tree_row_reference_new (model, temp); gtk_tree_path_free (temp); - references = g_list_append (references, reference); +
[Xfce4-commits] r22704 - xfburn/trunk/xfburn
Author: pollux Date: 2006-08-10 13:14:41 + (Thu, 10 Aug 2006) New Revision: 22704 Added: xfburn/trunk/xfburn/xfburn-device-box.c xfburn/trunk/xfburn/xfburn-device-box.h Modified: xfburn/trunk/xfburn/Makefile.am xfburn/trunk/xfburn/xfburn-blank-cd-dialog.c xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c xfburn/trunk/xfburn/xfburn-burn-image-dialog.c xfburn/trunk/xfburn/xfburn-copy-cd-dialog.c Log: Add the XfburnDeviceBox class and use it in the burning dialogs Modified: xfburn/trunk/xfburn/Makefile.am === --- xfburn/trunk/xfburn/Makefile.am 2006-08-10 13:01:08 UTC (rev 22703) +++ xfburn/trunk/xfburn/Makefile.am 2006-08-10 13:14:41 UTC (rev 22704) @@ -24,6 +24,7 @@ xfburn-copy-cd-progress-dialog.h\ xfburn-create-iso-progress-dialog.h \ xfburn-create-iso-from-composition-progress-dialog.h\ + xfburn-device-box.h \ xfburn-progress-dialog.h\ xfburn-main-window.h\ xfburn-notebook-tab.h \ @@ -53,6 +54,7 @@ xfburn-settings.c \ xfburn-copy-cd-dialog.c \ xfburn-copy-cd-progress-dialog.c\ + xfburn-device-box.c \ xfburn-progress-dialog.c\ xfburn-main.c \ xfburn-main-window.c\ Modified: xfburn/trunk/xfburn/xfburn-blank-cd-dialog.c === --- xfburn/trunk/xfburn/xfburn-blank-cd-dialog.c2006-08-10 13:01:08 UTC (rev 22703) +++ xfburn/trunk/xfburn/xfburn-blank-cd-dialog.c2006-08-10 13:14:41 UTC (rev 22704) @@ -24,6 +24,7 @@ #include xfburn-global.h #include xfburn-utils.h #include xfburn-blank-cd-progress-dialog.h +#include xfburn-device-box.h #include xfburn-stock.h #include xfburn-blank-cd-dialog.h @@ -37,9 +38,9 @@ struct XfburnBlankCdDialogPrivate { - GtkWidget *combo_device; + GtkWidget *device_box; GtkWidget *combo_type; - GtkWidget *combo_speed; + GtkWidget *check_force; GtkWidget *check_eject; }; @@ -85,15 +86,10 @@ { GtkBox *box = GTK_BOX (GTK_DIALOG (obj)-vbox); XfburnBlankCdDialogPrivate *priv; - GList *device; - GtkWidget *img; GdkPixbuf *icon = NULL; GtkWidget *frame; GtkWidget *vbox; - GtkWidget *hbox; - GtkWidget *label; GtkWidget *button; - int i; obj-priv = g_new0 (XfburnBlankCdDialogPrivate, 1); @@ -105,58 +101,15 @@ icon = gtk_widget_render_icon (GTK_WIDGET (obj), XFBURN_STOCK_BLANK_CDRW, GTK_ICON_SIZE_DIALOG, NULL); gtk_window_set_icon (GTK_WINDOW (obj), icon); g_object_unref (icon); - - vbox = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox); - frame = xfce_create_framebox_with_content (_(Burning device), vbox); + /* devices list */ + priv-device_box = xfburn_device_box_new (TRUE, TRUE); + gtk_widget_show (priv-device_box); + + frame = xfce_create_framebox_with_content (_(Burning device), priv-device_box); gtk_widget_show (frame); gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER); - /* devices list */ - priv-combo_device = gtk_combo_box_new_text (); - gtk_widget_show (priv-combo_device); - gtk_box_pack_start (GTK_BOX (vbox), priv-combo_device, FALSE, FALSE, BORDER); - - device = list_devices; - while (device) { -XfburnDevice *device_data = (XfburnDevice *) device-data; - -gtk_combo_box_append_text (GTK_COMBO_BOX (priv-combo_device), device_data-name); - -device = g_list_next (device); - } - gtk_combo_box_set_active (GTK_COMBO_BOX (priv-combo_device), 0); - - /* speed */ - hbox = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, BORDER); - - label = gtk_label_new_with_mnemonic (_(_Speed :)); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, BORDER); - - priv-combo_speed = gtk_combo_box_new_text (); - gtk_widget_show (priv-combo_speed); - gtk_box_pack_start (GTK_BOX (hbox), priv-combo_speed, TRUE, TRUE, BORDER); - - for (i = 2; i = 24; i += 2) { -gchar *str; - -str = g_strdup_printf (%d, i); -gtk_combo_box_append_text (GTK_COMBO_BOX (priv-combo_speed), str); -g_free (str); - } - gtk_combo_box_set_active (GTK_COMBO_BOX (priv-combo_speed), 4); - - img = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_widget_show (img); - button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (button), img); -
[Xfce4-commits] r22706 - xfburn/trunk
Author: pollux Date: 2006-08-10 14:41:11 + (Thu, 10 Aug 2006) New Revision: 22706 Modified: xfburn/trunk/NEWS xfburn/trunk/class diagram.zuml xfburn/trunk/configure.in.in Log: * Update NEWS * Update Class Diagram * Bump version Modified: xfburn/trunk/NEWS === --- xfburn/trunk/NEWS 2006-08-10 13:50:29 UTC (rev 22705) +++ xfburn/trunk/NEWS 2006-08-10 14:41:11 UTC (rev 22706) @@ -1,7 +1,8 @@ -xfburn 0.x -== +xfburn 0.2.0beta + -- add DnD inside data composition +- Data composition uses ExoTreeView instead of GtkTreeView +- Add DnD inside data composition - Prevent having two 'New directory' entries in a data composition - Add support of SAO mode (bug #2121) - Add create directory action in data composition Modified: xfburn/trunk/class diagram.zuml === (Binary files differ) Modified: xfburn/trunk/configure.in.in === --- xfburn/trunk/configure.in.in2006-08-10 13:50:29 UTC (rev 22705) +++ xfburn/trunk/configure.in.in2006-08-10 14:41:11 UTC (rev 22706) @@ -2,8 +2,8 @@ dnl Version information m4_define([xfburn_version_major], [0]) -m4_define([xfburn_version_minor], [1]) -m4_define([xfburn_version_micro], [1]) +m4_define([xfburn_version_minor], [2]) +m4_define([xfburn_version_micro], [0]) m4_define([xfburn_version_build], [EMAIL PROTECTED]@]) m4_define([xfburn_version_tag], [svn]) m4_define([xfburn_version], [xfburn_version_major().xfburn_version_minor().xfburn_version_micro()ifelse(xfburn_version_tag(), [svn], [xfburn_version_tag()-xfburn_version_build()], [xfburn_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22691 - xfce-utils/trunk/po
Author: pollux Date: 2006-08-08 18:16:54 + (Tue, 08 Aug 2006) New Revision: 22691 Modified: xfce-utils/trunk/po/ChangeLog xfce-utils/trunk/po/fr.po Log: updated French translations Modified: xfce-utils/trunk/po/ChangeLog === --- xfce-utils/trunk/po/ChangeLog 2006-08-08 10:43:05 UTC (rev 22690) +++ xfce-utils/trunk/po/ChangeLog 2006-08-08 18:16:54 UTC (rev 22691) @@ -1,3 +1,7 @@ +2006-08-08 Jean-François Wauthy [EMAIL PROTECTED] + + * fr.po: Updated French translations by Gerald Barre [EMAIL PROTECTED] + 2006-08-08 Jari Rahkonen [EMAIL PROTECTED] * fi.po: Updated Finnish translation. @@ -4,7 +8,7 @@ 2006-08-07 Piarres Beobide [EMAIL PROTECTED] -* eu.po: Basque translation update + * eu.po: Basque translation update 2006-08-04 Stavros Giannouris [EMAIL PROTECTED] Modified: xfce-utils/trunk/po/fr.po === --- xfce-utils/trunk/po/fr.po 2006-08-08 10:43:05 UTC (rev 22690) +++ xfce-utils/trunk/po/fr.po 2006-08-08 18:16:54 UTC (rev 22691) @@ -8,8 +8,8 @@ Project-Id-Version: xfce-utils 4.3.90.2\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2006-08-08 00:54+0200\n -PO-Revision-Date: 2006-08-01 17:54+0100\n -Last-Translator: Maximilian Schleiss [EMAIL PROTECTED]\n +PO-Revision-Date: 2006-08-08 17:42+0100\n +Last-Translator: Gerald Barre [EMAIL PROTECTED]\n Language-Team: French xfce-i18n@xfce.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n @@ -17,7 +17,7 @@ #: xfce4-about/info.c:171 msgid Unable to load -msgstr Incapable de charger +msgstr Impossible de charger #. Project lead #: xfce4-about/info.c:200 @@ -31,15 +31,13 @@ #. Active contributors #: xfce4-about/info.c:208 -#, fuzzy msgid Active contributors -msgstr Contributeurs +msgstr Contributeurs en activité #. Previous contributors #: xfce4-about/info.c:212 -#, fuzzy msgid Previous contributors -msgstr Contributeurs +msgstr Contributeurs précédents #: xfce4-about/info.c:217 msgid Web Hosting and Mailing Lists provided by @@ -48,13 +46,12 @@ #. Server admins #: xfce4-about/info.c:249 msgid Server maintained by -msgstr Serveur maintenu par +msgstr Maintenance du serveur par #. Goodies supervision #: xfce4-about/info.c:253 -#, fuzzy msgid Goodies supervision -msgstr Supervision des traductions +msgstr Supervision des goodies #. Translations supervision #: xfce4-about/info.c:257 @@ -68,9 +65,7 @@ #: xfce4-about/info.c:292 msgid If you know of anyone missing from this list, please let us know on -msgstr -Si vous pensez à qu'une personne devrait figurer sur cette liste, s'il vous -plaît faites le nous savoir à +msgstr Si vous pensez qu'une personne devrait figurer sur cette liste, s'il vous plaît faites le nous savoir à #: xfce4-about/info.c:296 msgid Thanks to all who helped making this software available. @@ -116,7 +111,7 @@ #. we don't support daemon mode #: xfrun/xfrun.c:50 msgid Daemon Mode -msgstr Mode daemon +msgstr Mode Daemon #: xfrun/xfrun.c:52 msgid Daemon mode is not supported. @@ -124,13 +119,12 @@ #: xfrun/xfrun.c:53 msgid Xfrun must be compiled with D-BUS support to enable daemon mode. -msgstr -Xfrun doit être compilé avec le support D-BUS pour activer le mode daemon. +msgstr Xfrun doit être compilé avec le support D-BUS pour activer le mode daemon. #: xfrun/xfrun-dbus.c:141 #, c-format msgid Unable to open display \%s\. -msgstr Échec à l'ouverture de l'affichage \%s\. +msgstr Impossible d'ouvrir l'affichage \%s\. #: xfrun/xfrun-dbus.c:200 #, c-format @@ -138,13 +132,15 @@ msgstr Bus de messages D-BUS déconnecté. Fermeture ...\n #. failed -#: xfrun/xfrun-dbus.c:340 xfrun/xfrun-dbus.c:351 +#: xfrun/xfrun-dbus.c:340 +#: xfrun/xfrun-dbus.c:351 msgid System Error msgstr Erreur système -#: xfrun/xfrun-dbus.c:342 xfrun/xfrun-dbus.c:353 +#: xfrun/xfrun-dbus.c:342 +#: xfrun/xfrun-dbus.c:353 msgid Unable to fork to background: -msgstr Échec de passage au fond d'écran: +msgstr Impossible de passer le processus en arrière-plan : #: xfrun/xfrun-dialog.c:216 msgid Run in _terminal @@ -175,3 +171,4 @@ #: xfrun/xfrun-dialog.c:753 msgid Run program msgstr Exécuter un programme + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22692 - xfburn/trunk/po
Author: pollux Date: 2006-08-08 20:14:56 + (Tue, 08 Aug 2006) New Revision: 22692 Modified: xfburn/trunk/po/ChangeLog xfburn/trunk/po/de.po Log: updated German translations Modified: xfburn/trunk/po/ChangeLog === --- xfburn/trunk/po/ChangeLog 2006-08-08 18:16:54 UTC (rev 22691) +++ xfburn/trunk/po/ChangeLog 2006-08-08 20:14:56 UTC (rev 22692) @@ -1,3 +1,8 @@ +2006-08-08 Jean-François Wauthy [EMAIL PROTECTED] + + * de.po: Update German translations by Enrico Tröger + [EMAIL PROTECTED] + 2006-08-08 Jari Rahkonen [EMAIL PROTECTED] * fi.po: Updated Finnish translation. @@ -4,7 +9,7 @@ 2006-08-07 Piarres Beobide [EMAIL PROTECTED] -* eu.po: Basque translation update. + * eu.po: Basque translation update. 2006-08-05 Jari Rahkonen [EMAIL PROTECTED] Modified: xfburn/trunk/po/de.po === --- xfburn/trunk/po/de.po 2006-08-08 18:16:54 UTC (rev 22691) +++ xfburn/trunk/po/de.po 2006-08-08 20:14:56 UTC (rev 22692) @@ -3,8 +3,8 @@ Project-Id-Version: xfburn 0.0.3svn\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2006-08-06 00:02+0200\n -PO-Revision-Date: 2006-07-31 10:43+0100\n -Last-Translator: Enrico Troeger [EMAIL PROTECTED]\n +PO-Revision-Date: 2006-08-08 21:50+0100\n +Last-Translator: Enrico Tröger [EMAIL PROTECTED]\n Language-Team: German [EMAIL PROTECTED]\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n @@ -204,37 +204,32 @@ msgstr Hinzufügen #: ../xfburn/xfburn-data-composition.c:136 -#, fuzzy msgid Add the selected file(s) to the composition -msgstr Ausgewählte Datei(en) zu der CD hinzufügen +msgstr Ausgewählte Datei(en) zu der Zusammenstellung hinzufügen #: ../xfburn/xfburn-data-composition.c:138 -#, fuzzy msgid Create directory -msgstr Verzeichnis für temporäre Dateien +msgstr Neues Verzeichnis #: ../xfburn/xfburn-data-composition.c:138 -#, fuzzy msgid Add a new directory to the composition -msgstr Dateien zur Zusammenstellung hinzufügen +msgstr Fügt ein neues Verzeichnis zur Zusammenstellung hinzu #: ../xfburn/xfburn-data-composition.c:140 msgid Remove msgstr Entfernen #: ../xfburn/xfburn-data-composition.c:140 -#, fuzzy msgid Remove the selected file(s) from the composition -msgstr Ausgewählte Datei(en) von der CD entfernen +msgstr Ausgewählte Datei(en) von der zusammenstellung entfernen #: ../xfburn/xfburn-data-composition.c:142 msgid Clear msgstr Leeren #: ../xfburn/xfburn-data-composition.c:142 -#, fuzzy msgid Clear the content of the composition -msgstr Inhalt der CD leeren +msgstr Inhalt der Zusammenstellung leeren #: ../xfburn/xfburn-data-composition.c:144 msgid Import @@ -271,22 +266,18 @@ #: ../xfburn/xfburn-data-composition.c:598 msgid You must give a name to the file -msgstr +msgstr Sie müssen der Datei einen Namen geben. #: ../xfburn/xfburn-data-composition.c:607 #: ../xfburn/xfburn-data-composition.c:966 msgid A file with the same name is already present in the composition -msgstr -Eine Datei mit dem selben Dateinamen ist in der Zusammenstellung bereits -vorhanden. +msgstr Eine Datei mit dem selben Dateinamen ist in der Zusammenstellung bereits vorhanden. #: ../xfburn/xfburn-data-composition.c:686 -#, fuzzy msgid New directory -msgstr Verzeichnis für temporäre Dateien +msgstr Neues Verzeichnis #: ../xfburn/xfburn-data-disc-usage.c:129 -#, fuzzy msgid Burn composition msgstr Zusammenstellung brennen @@ -307,7 +298,8 @@ msgid Type msgstr Typ -#: ../xfburn/xfburn-fs-browser.c:93 ../xfburn/xfburn-fs-browser.c:259 +#: ../xfburn/xfburn-fs-browser.c:93 +#: ../xfburn/xfburn-fs-browser.c:259 msgid Filesystem msgstr Dateisystem @@ -317,7 +309,8 @@ msgid %s's home msgstr %s' Home -#: ../xfburn/xfburn-main.c:58 ../xfburn.desktop.in.h:2 +#: ../xfburn/xfburn-main.c:58 +#: ../xfburn.desktop.in.h:2 msgid Xfburn msgstr Xfburn @@ -348,7 +341,8 @@ msgid Close composition msgstr Zusammenstellung schließen -#: ../xfburn/xfburn-main-window.c:103 ../xfburn/xfburn-main-window.c:436 +#: ../xfburn/xfburn-main-window.c:103 +#: ../xfburn/xfburn-main-window.c:436 msgid _Quit msgstr _Beenden @@ -606,7 +600,6 @@ msgstr Programm auswählen #: ../xfburn/xfburn-write-mode-combo-box.c:41 -#, fuzzy msgid Default msgstr Standard @@ -616,18 +609,14 @@ #~ msgid Burn Data CD #~ msgstr Daten-CD brennen - #~ msgid New audio composition #~ msgstr Neue Audiozusammenstellung - #~ msgid Load composition #~ msgstr Zusammenstellung laden - #~ msgid Show disc content toolbar #~ msgstr Zeige CD-Inhaltswerzeugleiste - #~ msgid Show/hide the disc content toolbar #~ msgstr Zeigt oder verbirgt die CD-Inhaltswerzeugleiste - #~ msgid Xfburn preferences #~ msgstr Xfburn Einstellungen + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org
[Xfce4-commits] r22659 - xfwm4/trunk/po
Author: pollux Date: 2006-08-04 20:55:25 + (Fri, 04 Aug 2006) New Revision: 22659 Modified: xfwm4/trunk/po/ChangeLog xfwm4/trunk/po/fr.po Log: fix typos in French translations (patch from Gerald Barre [EMAIL PROTECTED]) Modified: xfwm4/trunk/po/ChangeLog === --- xfwm4/trunk/po/ChangeLog2006-08-04 20:34:01 UTC (rev 22658) +++ xfwm4/trunk/po/ChangeLog2006-08-04 20:55:25 UTC (rev 22659) @@ -1,6 +1,6 @@ 2006-08-04 Jean-François Wauthy [EMAIL PROTECTED] - * fr.po: Fix typo (bug #2120) + * fr.po: Fix typos (including bug #2120) 2006-08-01 Jari Rahkonen [EMAIL PROTECTED] Modified: xfwm4/trunk/po/fr.po === --- xfwm4/trunk/po/fr.po2006-08-04 20:34:01 UTC (rev 22658) +++ xfwm4/trunk/po/fr.po2006-08-04 20:55:25 UTC (rev 22659) @@ -8,8 +8,8 @@ Project-Id-Version: xfwm4 4.3.90.2\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2006-07-08 21:17+0200\n -PO-Revision-Date: 2006-02-02 21:32+0100\n -Last-Translator: Olivier Fourdan [EMAIL PROTECTED]\n +PO-Revision-Date: 2006-08-04 16:36+0100\n +Last-Translator: Gerald Barre [EMAIL PROTECTED]\n Language-Team: French [EMAIL PROTECTED]\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -20,11 +20,8 @@ msgstr Marges de l'espace de travail #: ../mcs-plugin/margins.c:136 -msgid -Margins are areas on the edges of the screen where no window will be placed -msgstr -Les marges sont des zones sur les bords de l'écran où aucune fenêtre ne sera -placée +msgid Margins are areas on the edges of the screen where no window will be placed +msgstr Les marges sont des zones sur les bords de l'écran où aucune fenêtre ne sera placée #: ../mcs-plugin/margins.c:167 msgid Left : @@ -51,7 +48,8 @@ msgid Workspaces and Margins msgstr Marges et espaces de travail -#: ../mcs-plugin/workspaces_plugin.c:162 ../mcs-plugin/wmtweaks_plugin.c:511 +#: ../mcs-plugin/workspaces_plugin.c:162 +#: ../mcs-plugin/wmtweaks_plugin.c:511 #: ../mcs-plugin/workspaces.c:516 msgid Workspaces msgstr Espaces de travail @@ -70,11 +68,8 @@ msgstr Peaufinages des fenêtres #: ../mcs-plugin/wmtweaks_plugin.c:396 -msgid -Include windows that have \skip pager\ or \skip taskbar\ properties set -msgstr -Inclure les fenêtres qui présentent les propriétés \skip pager\ ou \skip -taskbar\ +msgid Include windows that have \skip pager\ or \skip taskbar\ properties set +msgstr Inclure les fenêtres qui présentent les propriétés \skip pager\ ou \skip taskbar\ #: ../mcs-plugin/wmtweaks_plugin.c:402 msgid Include hidden (i.e. iconified) windows @@ -96,7 +91,8 @@ msgid Honor the standard ICCCM focus hint msgstr Suivre le standard ICCCM pour le focus -#: ../mcs-plugin/wmtweaks_plugin.c:436 ../mcs-plugin/xfwm4_plugin.c:1683 +#: ../mcs-plugin/wmtweaks_plugin.c:436 +#: ../mcs-plugin/xfwm4_plugin.c:1683 msgid Focus msgstr Focalisation @@ -129,11 +125,8 @@ msgstr Basculer d'écran à l'aide de la molette de la souris sur le bureau #: ../mcs-plugin/wmtweaks_plugin.c:492 -msgid -Remember and recall previous workspace when switching via keyboard shortcuts -msgstr -Mémoriser et revenir à l'espace précédent en changeant d'espace de travail à -l'aide du clavier +msgid Remember and recall previous workspace when switching via keyboard shortcuts +msgstr Mémoriser et revenir à l'espace précédent en changeant d'espace de travail à l'aide du clavier #: ../mcs-plugin/wmtweaks_plugin.c:499 msgid Wrap workspaces depending on the actual desktop layout @@ -142,7 +135,7 @@ #: ../mcs-plugin/wmtweaks_plugin.c:506 msgid Wrap workspaces when the first or last workspace is reached msgstr -Basculer d'écran après avoir atteint le permier\n +Basculer d'écran après avoir atteint le premier\n ou le dernier espace de travail #: ../mcs-plugin/wmtweaks_plugin.c:523 @@ -175,16 +168,20 @@ #: ../mcs-plugin/wmtweaks_plugin.c:574 msgid Opacity of window decorations -msgstr Opacité des décorations autour des fénêtres +msgstr Opacité des décorations autour des fenêtres -#: ../mcs-plugin/wmtweaks_plugin.c:574 ../mcs-plugin/wmtweaks_plugin.c:580 -#: ../mcs-plugin/wmtweaks_plugin.c:586 ../mcs-plugin/wmtweaks_plugin.c:592 +#: ../mcs-plugin/wmtweaks_plugin.c:574 +#: ../mcs-plugin/wmtweaks_plugin.c:580 +#: ../mcs-plugin/wmtweaks_plugin.c:586 +#: ../mcs-plugin/wmtweaks_plugin.c:592 #: ../mcs-plugin/wmtweaks_plugin.c:598 msgid Transparent msgstr Transparent -#: ../mcs-plugin/wmtweaks_plugin.c:575 ../mcs-plugin/wmtweaks_plugin.c:581 -#: ../mcs-plugin/wmtweaks_plugin.c:587 ../mcs-plugin/wmtweaks_plugin.c:593 +#: ../mcs-plugin/wmtweaks_plugin.c:575 +#: ../mcs-plugin/wmtweaks_plugin.c:581 +#: ../mcs-plugin/wmtweaks_plugin.c:587 +#: ../mcs-plugin/wmtweaks_plugin.c:593 #: ../mcs-plugin/wmtweaks_plugin.c:599 msgid Opaque msgstr Opaque @@ -195,11 +192,11 @@ #: ../mcs-plugin/wmtweaks_plugin.c:586 msgid Opacity of windows
[Xfce4-commits] r22594 - xfburn/trunk/xfburn
Author: pollux Date: 2006-07-31 16:29:07 + (Mon, 31 Jul 2006) New Revision: 22594 Added: xfburn/trunk/xfburn/NEWS Modified: xfburn/trunk/xfburn/xfburn-settings.c Log: Avoid segfault on exit when ~/.config/xfburn doesn't exist (fix bug #2095) Added: xfburn/trunk/xfburn/NEWS === --- xfburn/trunk/xfburn/NEWS(rev 0) +++ xfburn/trunk/xfburn/NEWS2006-07-31 16:29:07 UTC (rev 22594) @@ -0,0 +1,10 @@ +xfburn 0.x +== + +- Avoid segfault on exit when ~/.config/xfburn doesn't exist (bug #2095) + +xfburn 0.1.0alpha += + +- First public release +- Supports cdrw blanking, cd copying, creating iso, composition of files Modified: xfburn/trunk/xfburn/xfburn-settings.c === --- xfburn/trunk/xfburn/xfburn-settings.c 2006-07-31 13:27:41 UTC (rev 22593) +++ xfburn/trunk/xfburn/xfburn-settings.c 2006-07-31 16:29:07 UTC (rev 22594) @@ -147,15 +147,7 @@ priv-settings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) value_destroy); - path = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, xfburn/); - - if (path) { -priv-full_path = g_build_filename (path, settings.xml, NULL); -g_free (path); - } - else { -g_message (no settings file found, using defaults); - } + priv-full_path = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, xfburn/settings.xml, TRUE); } /*/ @@ -277,7 +269,7 @@ #endif if (stat (priv-full_path, st) 0) { -g_warning (Unable to open the settings file); +g_message (No existing settings file, using default settings); goto cleanup; } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22595 - in xfburn/trunk: . xfburn
Author: pollux Date: 2006-07-31 16:40:38 + (Mon, 31 Jul 2006) New Revision: 22595 Removed: xfburn/trunk/xfburn/NEWS Modified: xfburn/trunk/NEWS xfburn/trunk/xfburn/xfburn-burn-image-dialog.c Log: Prevent cdrecord failure if there is a space in the path to an iso (bug #1198) Modified: xfburn/trunk/NEWS === --- xfburn/trunk/NEWS 2006-07-31 16:29:07 UTC (rev 22594) +++ xfburn/trunk/NEWS 2006-07-31 16:40:38 UTC (rev 22595) @@ -0,0 +1,12 @@ +xfburn 0.x +== + +- Avoid segfault on exit when ~/.config/xfburn doesn't exist (bug #2095) +- Prevent cdrecord failure if there is a space in the path to an iso (bug #1198) + +xfburn 0.1.0alpha += + +- First public release +- Supports cdrw blanking, cd copying, creating iso, composition of files + Deleted: xfburn/trunk/xfburn/NEWS Modified: xfburn/trunk/xfburn/xfburn-burn-image-dialog.c === --- xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2006-07-31 16:29:07 UTC (rev 22594) +++ xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2006-07-31 16:40:38 UTC (rev 22595) @@ -276,7 +276,7 @@ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-check_eject)) ? -eject : , gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-check_dummy)) ? -dummy : , gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-check_burnfree)) ? driveropts=burnfree - : , , iso_path, NULL); + : , ', iso_path, ', NULL); g_free (device_name); g_free (write_mode); g_free (speed); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22563 - xfburn/trunk/xfburn
Author: pollux Date: 2006-07-30 12:09:37 + (Sun, 30 Jul 2006) New Revision: 22563 Added: xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h xfburn/trunk/xfburn/xfburn-burn-data-composition-progress-dialog.c xfburn/trunk/xfburn/xfburn-burn-data-composition-progress-dialog.h Removed: xfburn/trunk/xfburn/xfburn-burn-composition-dialog.c xfburn/trunk/xfburn/xfburn-burn-composition-dialog.h xfburn/trunk/xfburn/xfburn-burn-composition-progress-dialog.c xfburn/trunk/xfburn/xfburn-burn-composition-progress-dialog.h Modified: xfburn/trunk/xfburn/Makefile.am xfburn/trunk/xfburn/xfburn-data-composition.c xfburn/trunk/xfburn/xfburn-main.c Log: * rename XfburnBurnCompositionDialog and XfburnBurnCompositionProgressDialog into XfburnBurnDataCompositionDialog and XfburnBurnDataCompositionProgressDialog (gosh it's long) * the generated filelist is now mkisofs compliant Modified: xfburn/trunk/xfburn/Makefile.am === --- xfburn/trunk/xfburn/Makefile.am 2006-07-30 08:31:55 UTC (rev 22562) +++ xfburn/trunk/xfburn/Makefile.am 2006-07-30 12:09:37 UTC (rev 22563) @@ -12,8 +12,8 @@ xfburn-adding-progress.h\ xfburn-blank-cd-dialog.h\ xfburn-blank-cd-progress-dialog.h \ - xfburn-burn-composition-dialog.h\ - xfburn-burn-composition-progress-dialog.h \ + xfburn-burn-data-composition-dialog.h \ + xfburn-burn-data-composition-progress-dialog.h \ xfburn-burn-image-dialog.h \ xfburn-burn-image-progress-dialog.h \ xfburn-settings.h \ @@ -40,8 +40,8 @@ xfburn-adding-progress.c\ xfburn-blank-cd-dialog.c\ xfburn-blank-cd-progress-dialog.c \ - xfburn-burn-composition-dialog.c\ - xfburn-burn-composition-progress-dialog.c \ + xfburn-burn-data-composition-dialog.c \ + xfburn-burn-data-composition-progress-dialog.c \ xfburn-burn-image-dialog.c \ xfburn-burn-image-progress-dialog.c \ xfburn-composition.c\ Deleted: xfburn/trunk/xfburn/xfburn-burn-composition-dialog.c Deleted: xfburn/trunk/xfburn/xfburn-burn-composition-dialog.h Deleted: xfburn/trunk/xfburn/xfburn-burn-composition-progress-dialog.c Deleted: xfburn/trunk/xfburn/xfburn-burn-composition-progress-dialog.h Copied: xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c (from rev 22560, xfburn/trunk/xfburn/xfburn-burn-composition-dialog.c) === --- xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c (rev 0) +++ xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c 2006-07-30 12:09:37 UTC (rev 22563) @@ -0,0 +1,383 @@ +/* $Id$ */ +/* + * Copyright (c) 2005-2006 Jean-François Wauthy ([EMAIL PROTECTED]) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include config.h +#endif /* !HAVE_CONFIG_H */ + +#include xfburn-global.h +#include xfburn-utils.h +#include xfburn-settings.h +#include xfburn-burn-data-composition-progress-dialog.h +#include xfburn-create-iso-from-composition-progress-dialog.h + +#include xfburn-burn-data-composition-dialog.h + +/* prototypes */ +static void xfburn_burn_data_composition_dialog_class_init (XfburnBurnDataCompositionDialogClass * klass); +static void xfburn_burn_data_composition_dialog_init (XfburnBurnDataCompositionDialog * obj); +static void xfburn_burn_data_composition_dialog_finalize (GObject * object); + +static void cb_check_only_iso_toggled (GtkToggleButton * button,
[Xfce4-commits] r22564 - in xfburn/trunk: . xfburn
Author: pollux Date: 2006-07-30 14:03:23 + (Sun, 30 Jul 2006) New Revision: 22564 Modified: xfburn/trunk/xfburn-toolbars.ui xfburn/trunk/xfburn.ui xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h xfburn/trunk/xfburn/xfburn-data-composition.c xfburn/trunk/xfburn/xfburn-data-composition.h xfburn/trunk/xfburn/xfburn-disc-usage.c xfburn/trunk/xfburn/xfburn-main-window.c Log: * deactivate the save/load actions * add volume name support Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c === --- xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c 2006-07-30 12:09:37 UTC (rev 22563) +++ xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c 2006-07-30 14:03:23 UTC (rev 22564) @@ -57,6 +57,7 @@ GtkWidget *check_dummy; gchar *file_list; + XfburnDataComposition *composition; }; /* globals */ @@ -297,6 +298,8 @@ static void cb_dialog_response (XfburnBurnDataCompositionDialog * dialog, gint response_id, XfburnBurnDataCompositionDialogPrivate * priv) { + gchar *dummy_dir = NULL; + if (response_id == GTK_RESPONSE_OK) { gchar *command = NULL; GtkWidget *dialog_progress = NULL; @@ -308,9 +311,10 @@ dialog_progress = xfburn_create_iso_from_composition_progress_dialog_new (); } else { - gchar *speed; - gchar *write_mode; - gchar *device_name; + gchar *speed = NULL; + gchar *write_mode = NULL; + gchar *device_name = NULL; + gchar *volid = NULL; XfburnDevice *device; device_name = gtk_combo_box_get_active_text (GTK_COMBO_BOX (priv-combo_device)); @@ -334,8 +338,10 @@ write_mode = g_strdup ( -tao); } + volid = xfburn_data_composition_get_volume_id (priv-composition); + command = g_strconcat (sh -c \mkisofs -gui -graft-points -joliet -full-iso9660-filenames -iso-level 2 -path-list , - priv-file_list, | cdrecord -v gracetime=2, dev=, device-node_path, write_mode, speed=, speed, + priv-file_list, -volid , volid, | cdrecord -v gracetime=2, dev=, device-node_path, write_mode, speed=, speed, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-check_eject)) ? -eject : , gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-check_dummy)) ? -dummy : , gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-check_burnfree)) ? driveropts=burnfree : , @@ -343,6 +349,8 @@ g_free (device_name); g_free (speed); g_free (write_mode); + g_free (volid); + dialog_progress = xfburn_burn_data_composition_progress_dialog_new (); } @@ -351,10 +359,15 @@ g_object_set_data (G_OBJECT (dialog_progress), command, command); gtk_dialog_run (GTK_DIALOG (dialog_progress)); - -unlink (priv-file_list); + g_free (command); } + + unlink (priv-file_list); + dummy_dir = xfburn_data_composition_get_dummy_dir (priv-composition); + if (dummy_dir) { +rmdir (dummy_dir); + } } /* public */ @@ -371,13 +384,14 @@ } GtkWidget * -xfburn_burn_data_composition_dialog_new (const gchar * file_list) +xfburn_burn_data_composition_dialog_new (XfburnDataComposition *composition, const gchar * file_list) { XfburnBurnDataCompositionDialog *obj; obj = XFBURN_BURN_COMPOSITION_DIALOG (g_object_new (XFBURN_TYPE_BURN_COMPOSITION_DIALOG, NULL)); obj-priv-file_list = g_strdup (file_list); - + obj-priv-composition = composition; + return GTK_WIDGET (obj); } Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h === --- xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h 2006-07-30 12:09:37 UTC (rev 22563) +++ xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.h 2006-07-30 14:03:23 UTC (rev 22564) @@ -26,6 +26,8 @@ #include gtk/gtk.h +#include xfburn-data-composition.h + G_BEGIN_DECLS #define XFBURN_TYPE_BURN_COMPOSITION_DIALOG (xfburn_burn_data_composition_dialog_get_type ()) @@ -48,7 +50,7 @@ } XfburnBurnDataCompositionDialogClass; GtkType xfburn_burn_data_composition_dialog_get_type (); -GtkWidget *xfburn_burn_data_composition_dialog_new (const gchar *file_list); +GtkWidget *xfburn_burn_data_composition_dialog_new (XfburnDataComposition *composition, const gchar *file_list); gchar *xfburn_burn_data_composition_dialog_get_command_iso (XfburnBurnDataCompositionDialog *dialog); gchar *xfburn_burn_data_composition_dialog_get_command_burn (XfburnBurnDataCompositionDialog *dialog); Modified: xfburn/trunk/xfburn/xfburn-data-composition.c === --- xfburn/trunk/xfburn/xfburn-data-composition.c 2006-07-30
[Xfce4-commits] r22565 - xfburn/trunk/xfburn
Author: pollux Date: 2006-07-30 14:10:59 + (Sun, 30 Jul 2006) New Revision: 22565 Added: xfburn/trunk/xfburn/xfburn-data-disc-usage.c xfburn/trunk/xfburn/xfburn-data-disc-usage.h Removed: xfburn/trunk/xfburn/xfburn-disc-usage.c xfburn/trunk/xfburn/xfburn-disc-usage.h Modified: xfburn/trunk/xfburn/Makefile.am xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c xfburn/trunk/xfburn/xfburn-data-composition.c Log: Rename XfburnDiscUsage into XfburnDataDiscUsage Modified: xfburn/trunk/xfburn/Makefile.am === --- xfburn/trunk/xfburn/Makefile.am 2006-07-30 14:03:23 UTC (rev 22564) +++ xfburn/trunk/xfburn/Makefile.am 2006-07-30 14:10:59 UTC (rev 22565) @@ -28,7 +28,7 @@ xfburn-notebook-tab.h \ xfburn-file-browser.h \ xfburn-data-composition.h \ - xfburn-disc-usage.h \ + xfburn-data-disc-usage.h\ xfburn-fs-browser.h \ xfburn-directory-browser.h \ xfburn-preferences-dialog.h \ @@ -57,7 +57,7 @@ xfburn-notebook-tab.c \ xfburn-file-browser.c \ xfburn-data-composition.c \ - xfburn-disc-usage.c \ + xfburn-data-disc-usage.c\ xfburn-fs-browser.c \ xfburn-directory-browser.c \ xfburn-preferences-dialog.c \ Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c === --- xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c 2006-07-30 14:03:23 UTC (rev 22564) +++ xfburn/trunk/xfburn/xfburn-burn-data-composition-dialog.c 2006-07-30 14:10:59 UTC (rev 22565) @@ -233,7 +233,7 @@ gtk_widget_set_sensitive (priv-hbox_iso, FALSE); priv-entry_path_iso = gtk_entry_new (); - tmp_dir = xfburn_settings_get_string (temporary-dir, /tmp); + tmp_dir = xfburn_settings_get_string (temporary-dir, g_get_tmp_dir ()); default_path = g_build_filename (tmp_dir, xfburn.iso, NULL); gtk_entry_set_text (GTK_ENTRY (priv-entry_path_iso), default_path); g_free (default_path); Modified: xfburn/trunk/xfburn/xfburn-data-composition.c === --- xfburn/trunk/xfburn/xfburn-data-composition.c 2006-07-30 14:03:23 UTC (rev 22564) +++ xfburn/trunk/xfburn/xfburn-data-composition.c 2006-07-30 14:10:59 UTC (rev 22565) @@ -51,7 +51,7 @@ #include xfburn-composition.h #include xfburn-burn-data-composition-dialog.h -#include xfburn-disc-usage.h +#include xfburn-data-disc-usage.h #include xfburn-main-window.h #include xfburn-utils.h @@ -75,7 +75,7 @@ static void data_composition_action_rename_selection (GtkAction * action, XfburnDataComposition * dc); static gboolean cb_treeview_button_pressed (GtkTreeView * treeview, GdkEventButton * event, XfburnDataComposition * dc); -static void cb_begin_burn (XfburnDiscUsage * du, XfburnDataComposition * dc); +static void cb_begin_burn (XfburnDataDiscUsage * du, XfburnDataComposition * dc); static void cell_file_edited_cb (GtkCellRenderer * renderer, gchar * path, gchar * newtext, XfburnDataComposition * dc); static void content_drag_data_rcv_cb (GtkWidget *, GdkDragContext *, guint, guint, GtkSelectionData *, guint, guint, @@ -336,7 +336,7 @@ #endif /* disc usage */ - priv-disc_usage = xfburn_disc_usage_new (); + priv-disc_usage = xfburn_data_disc_usage_new (); gtk_box_pack_start (GTK_BOX (composition), priv-disc_usage, FALSE, FALSE, 5); gtk_widget_show (priv-disc_usage); g_signal_connect (G_OBJECT (priv-disc_usage), begin-burn, G_CALLBACK (cb_begin_burn), composition); @@ -391,7 +391,7 @@ } static void -cb_begin_burn (XfburnDiscUsage * du, XfburnDataComposition * dc) +cb_begin_burn (XfburnDataDiscUsage * du, XfburnDataComposition * dc) { XfburnMainWindow *mainwin = xfburn_main_window_get_instance (); GtkWidget *dialog; @@ -589,7 +589,7 @@ list_iters = g_list_append (list_iters, iter); gtk_tree_model_get (model, iter, DATA_COMPOSITION_COLUMN_SIZE, size, -1); -xfburn_disc_usage_sub_size (XFBURN_DISC_USAGE (priv-disc_usage), size); +xfburn_data_disc_usage_sub_size (XFBURN_DISC_USAGE (priv-disc_usage), size); iter_temp = *iter; while (gtk_tree_model_iter_parent (model, parent, iter_temp)) { @@ -639,7 +639,7 @@ model =