[Xfce4-commits] parole:master Added better audiobox support for Audio CDs, remote streams, and unknown media. Don't show subtitle options for DVD media.
Updating branch refs/heads/master to b200875632fec3876157f0c6ff02fd2ae14f495e (commit) from 6efd6b3562333bd8c143ef505d6f6461ffe27e5e (commit) commit b200875632fec3876157f0c6ff02fd2ae14f495e Author: Sean Davis smd.seanda...@gmail.com Date: Fri Dec 7 06:23:56 2012 -0500 Added better audiobox support for Audio CDs, remote streams, and unknown media. Don't show subtitle options for DVD media. data/interfaces/parole.ui | 12 ++-- src/gst/parole-gst.c | 38 +- src/parole-player.c | 11 +++ 3 files changed, 50 insertions(+), 11 deletions(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index 53e1c6e..05c5292 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -472,9 +472,9 @@ property name=use_underlineTrue/property property name=imageimage_volume_up/property property name=use_stockFalse/property -accelerator key=plus signal=activate/ -accelerator key=equal signal=activate/ accelerator key=KP_Add signal=activate/ +accelerator key=equal signal=activate/ +accelerator key=plus signal=activate/ signal name=activate handler=parole_player_volume_up swapped=no/ /object /child @@ -487,8 +487,8 @@ property name=use_underlineTrue/property property name=imageimage_volume_down/property property name=use_stockFalse/property -accelerator key=KP_Subtract signal=activate/ accelerator key=minus signal=activate/ +accelerator key=KP_Subtract signal=activate/ signal name=activate handler=parole_player_volume_down swapped=no/ /object /child @@ -720,7 +720,7 @@ property name=can_focusFalse/property property name=xalign0/property property name=yalign1/property -property name=label translatable=yeslt;bgt;lt;biggt;Song Titlelt;/biggt;lt;/bgt;/property +property name=label translatable=yeslt;span color='#F4F4F4'gt;lt;bgt;lt;biggt;Unknown Songlt;/biggt;lt;/bgt;lt;/spangt;/property property name=use_markupTrue/property property name=ellipsizeend/property /object @@ -735,7 +735,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yeslt;biggt;on Song Album (2012)lt;/biggt;/property +property name=label translatable=yeslt;biggt;lt;span color='#BB'gt;lt;igt;onlt;/igt;lt;/spangt; lt;span color='#F4F4F4'gt;Unknown Albumlt;/spangt;lt;/biggt;/property property name=use_markupTrue/property property name=ellipsizeend/property /object @@ -751,7 +751,7 @@ property name=can_focusFalse/property property name=xalign0/property property name=yalign0/property -property name=label translatable=yeslt;biggt;by Song Artistlt;/biggt;/property +property name=label translatable=yeslt;biggt;lt;span color='#BB'gt;lt;igt;bylt;/igt;lt;/spangt; lt;span color='#F4F4F4'gt;Unknown Artistlt;/spangt;lt;/biggt;/property property name=use_markupTrue/property property name=ellipsizeend/property /object diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c index be44b5d..ba67e64 100644 --- a/src/gst/parole-gst.c +++ b/src/gst/parole-gst.c @@ -1236,7 +1236,18 @@ parole_gst_get_meta_data_cdda (ParoleGst *gst, GstTagList *tag) g_object_set (G_OBJECT (gst-priv-stream), num-tracks, num_tracks, track, track, + title, g_strdup_printf(_(Track %i), track), + artist, NULL, + year, NULL, + album, _(Audio CD), + comment, NULL,
[Xfce4-commits] www:master l10n: Updated Polish (pl) translation to 79%
Updating branch refs/heads/master to d1f6802fed973d777a00f6b4f665f8c167f7379f (commit) from 978d7a50c52a4b822af81cdcab34b86989777658 (commit) commit d1f6802fed973d777a00f6b4f665f8c167f7379f Author: Piotr Sokół pso...@jabster.pl Date: Fri Dec 7 12:48:06 2012 +0100 l10n: Updated Polish (pl) translation to 79% New status: 472 messages complete with 2 fuzzies and 123 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/pl.po | 83 -- 1 files changed, 63 insertions(+), 20 deletions(-) diff --git a/lib/po/pl.po b/lib/po/pl.po index e49a07e..3d35bf1 100644 --- a/lib/po/pl.po +++ b/lib/po/pl.po @@ -8,7 +8,7 @@ msgstr Project-Id-Version: www.xfce.org\n Report-Msgid-Bugs-To: https://bugzilla.xfce.org\n; POT-Creation-Date: 2012-05-02 18:32+0200\n -PO-Revision-Date: 2012-12-04 20:03+0100\n +PO-Revision-Date: 2012-12-07 12:46+0100\n Last-Translator: Piotr Sokół pso...@jabster.pl\n Language-Team: polski \n MIME-Version: 1.0\n @@ -711,9 +711,8 @@ msgstr zasady, do których należy się odwoływać podczas planowania wydań. #: about/releasemodel.php:27 -#, fuzzy msgid The Xfce Core Desktop -msgstr Rdzeń środowiska Xfce +msgstr Główne komponenty środowiska Xfce #: about/releasemodel.php:51 msgid @@ -907,10 +906,13 @@ msgid During the first 2 weeks of the planning phase each maintainer is required to msgstr +Podczas pierwszych 2 tygodni fazy planowania opiekun każdego komponentu +powinien #: about/releasemodel.php:145 msgid List the features he wants to implement in the release cycle msgstr +sporządzić listę funkcji, które chce zaimplementować w trakcie cyklu wydania, #: about/releasemodel.php:146 msgid Investigate which dependencies are implied by that @@ -1016,7 +1018,7 @@ msgid release: msgstr W czasie fazy publikowania, ogłoszone zostaną trzy wydania testowe i jedno -końcowe: +finalne: #: about/releasemodel.php:206 msgid Xfce X.Ypre1 (after 0 weeks, feature freeze), @@ -1043,6 +1045,12 @@ msgid from the naming scheme above. E.g. for Xfce 4.8.0pre2, xfwm4 could have the version 4.7.17 and Thunar could have 1.1.9. msgstr +gdzie Y jest liczbą parzystą. Każde z tych wydać powinno zawierać ostatnie +wersje robocze (lub stabilne, jeśli nie wydano żadnej wersji roboczej od +czasu ostatniego wydania finalnego) wszystkich głównych komponentów +środowiska. Numeracja wersji tych komponentów może (a nawet powinna) różnić +się od wzoru podanego powyżej. Na przykład w wydaniu Xfce 4.8.0pre2, może +znajdować się program xfwm4 w wersji 4.7.17 a program Thunar w wersji 1.1.9. #: about/releasemodel.php:217 msgid @@ -1051,6 +1059,11 @@ msgid always picks the latest available development or stable release of each component for pre-releases and the final release. msgstr +Oznacza to, że opiekunowie poszczególnych komponentów nie mają obowiązku +publikować nowych wersji oprogramowania wraz z kolejnymi wydaniami +środowiska. Zespół wydania podczas kompletowania pakietów do wersji testowej +lub finalnej, wybiera zawsze ostatnią dostępną, roboczą lub stabilną wersję +każdego komponentu. #: about/releasemodel.php:221 msgid @@ -1060,11 +1073,13 @@ msgstr #: about/releasemodel.php:224 msgid Freezing before Releases -msgstr +msgstr Wstrzymywanie zmian przed publikowaniem wydań #: about/releasemodel.php:227 msgid There are different freeze types before releases. msgstr +Przed opublikowaniem poszczególnych wydań wstrzymywane są zmiany różnych +cech oprogramowania. #: about/releasemodel.php:230 msgid Feature Freeze @@ -1076,10 +1091,13 @@ msgid there on only translations and bugfixes are allowed to go into the master branch. msgstr +Wraz z wydaniem Xfce X.Ypre1, we wszystkich kluczowych komponentach zostają +wstrzymane zmiany funkcji. Oznacza to, że od tego momentu w głównej gałęzi +możliwe jest tylko uaktualnianie tłumaczeń i naprawianie błędów. #: about/releasemodel.php:236 msgid String/UI Freeze -msgstr +msgstr Wstrzymanie zmian komunikatów/interfejsu użytkownika #: about/releasemodel.php:239 msgid @@ -1087,10 +1105,13 @@ msgid from there on no strings which affect translations may be changed. Same goes for the user interface which may not be changed after this point. msgstr +Wydanie Xfce X.Ypre2 powoduje wstrzymanie zmian tłumaczonych komunikatów +oraz interfejsu użytkownika. Od tej chwili nie można modyfikować +wspomnianych elementów oprogramowania. #: about/releasemodel.php:242 msgid Code Freeze -msgstr +msgstr Wstrzymanie zmian kodu #: about/releasemodel.php:245 msgid @@ -1098,6 +1119,9 @@ msgid period of time, no commits may be sent unless they are signed off by the release manager. msgstr +Przed wydaniem każdej wersji testowej następuje krótkie, 2-dniowe +wstrzymanie zmian w kodzie. W tym czasie, do repozytorium nie można wysyłać +żadnych poprawek, chyba że zezwoli na to menedżer wydania.
[Xfce4-commits] libxfce4ui:master l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to 0f1adc8711512f230fef092c07e36459a1147f6f (commit) from c5c3d037e18b53e850eff2f3de657335cff35910 (commit) commit 0f1adc8711512f230fef092c07e36459a1147f6f Author: jc jc1 jc1.quebe...@gmail.com Date: Fri Dec 7 13:42:34 2012 +0100 l10n: Updated French (fr) translation to 100% New status: 92 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 239 +- 1 files changed, 81 insertions(+), 158 deletions(-) diff --git a/po/fr.po b/po/fr.po index f90e27b..bf314c3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,114 +2,104 @@ # Copyright (C) 2008 The Xfce development team. # This file is distributed under the same license as the libxfce4ui package. # Maximilian Schleiss maximil...@xfce.org, 2008. -# +# msgid msgstr Project-Id-Version: libxfce4ui\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-02-03 13:21+\n -PO-Revision-Date: 2008-10-12 23:17+0100\n -Last-Translator: Maximilian Schleiss maximil...@xfce.org\n +POT-Creation-Date: 2012-12-07 09:27+\n +PO-Revision-Date: 2012-12-07 13:41+0100\n +Last-Translator: \n Language-Team: French i18n-x...@xfce.org\n +Language: fr\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: fr\n -#: ../libxfce4ui/xfce-dialogs.c:80 +#: ../libxfce4ui/xfce-dialogs.c:98 msgid Failed to open web browser for online documentation msgstr Échec de l'ouverture du navigateur web pour la documentation en ligne -#: ../libxfce4ui/xfce-dialogs.c:195 +#: ../libxfce4ui/xfce-dialogs.c:213 #, c-format msgid Do you want to read the %s manual online? msgstr Souhaitez-vous consulter le manuel %s en ligne ? -#: ../libxfce4ui/xfce-dialogs.c:197 +#: ../libxfce4ui/xfce-dialogs.c:215 msgid Do you want to read the manual online? msgstr Souhaitez-vous consulter le manuel en ligne ? -#: ../libxfce4ui/xfce-dialogs.c:200 +#: ../libxfce4ui/xfce-dialogs.c:218 msgid Online Documentation msgstr Documentation en ligne -#: ../libxfce4ui/xfce-dialogs.c:203 -msgid -You will be redirected to the documentation website where the help pages are -maintained and translated. +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid You will be redirected to the documentation website where the help pages are maintained and translated. msgstr Vous allez être redirigé vers le site de documentation en ligne où les pages d'aide sont maintenues et traduites. -#: ../libxfce4ui/xfce-dialogs.c:207 +#: ../libxfce4ui/xfce-dialogs.c:225 msgid _Read Online msgstr _Lire en ligne -#: ../libxfce4ui/xfce-dialogs.c:219 +#: ../libxfce4ui/xfce-dialogs.c:237 msgid _Always go directly to the online documentation msgstr _Toujours aller directement sur la documentation en ligne -#: ../libxfce4ui/xfce-dialogs.c:263 +#: ../libxfce4ui/xfce-dialogs.c:281 msgid Information msgstr Information -#: ../libxfce4ui/xfce-dialogs.c:296 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid Warning msgstr Avertissement -#: ../libxfce4ui/xfce-dialogs.c:330 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid Error msgstr Erreur -#: ../libxfce4ui/xfce-dialogs.c:381 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid Question msgstr Question -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1403 msgid Session management client ID msgstr ID client du gestionnaire de session -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1403 msgid ID msgstr ID -#: ../libxfce4ui/xfce-sm-client.c:1403 +#: ../libxfce4ui/xfce-sm-client.c:1404 msgid Disable session management msgstr Désactiver la gestion de session -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1414 msgid Session management options msgstr Options du gestionnaire de session -#: ../libxfce4ui/xfce-sm-client.c:1414 +#: ../libxfce4ui/xfce-sm-client.c:1415 msgid Show session management options msgstr Afficher les options du gestionnaires de session -#: ../libxfce4ui/xfce-sm-client.c:1590 +#: ../libxfce4ui/xfce-sm-client.c:1591 #, c-format msgid Failed to connect to the session manager: %s msgstr Échec de connexion au gestionnaire de session : %s -#: ../libxfce4ui/xfce-sm-client.c:1597 +#: ../libxfce4ui/xfce-sm-client.c:1598 #, c-format msgid Session manager did not return a valid client id msgstr Le gestionnaire de session n'a pas retourné un id client valable #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:406 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format -msgid -Working directory \%s\ does not exist. It won't be used when spawning \%s -\. -msgstr -Le dossier de travail \%s\ n'existe pas. Il ne sera pas utilisé à la -réouverture de \%s\. +msgid Working directory \%s\ does not exist. It won't be used when spawning \%s\. +msgstr Le dossier de travail « %s » n'existe pas. Il ne sera pas utilisé à la réouverture de « %s ». #:
[Xfce4-commits] xfwm4:master l10n: Updated French (fr) translation to 98%
Updating branch refs/heads/master to e01cc2d8765cf13991a4e79ca488c43ce6ad57a6 (commit) from d4f2512d3826f745593a015a1699f9d867c030b8 (commit) commit e01cc2d8765cf13991a4e79ca488c43ce6ad57a6 Author: jc jc1 jc1.quebe...@gmail.com Date: Fri Dec 7 13:55:43 2012 +0100 l10n: Updated French (fr) translation to 98% New status: 232 messages complete with 3 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 196 -- 1 files changed, 89 insertions(+), 107 deletions(-) diff --git a/po/fr.po b/po/fr.po index 465f301..ad12f62 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,9 +9,9 @@ msgid msgstr Project-Id-Version: xfwm4\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-04-15 09:03+\n -PO-Revision-Date: 2012-04-15 16:54+0200\n -Last-Translator: Iliyas Jorio inv.jo...@gmail.com\n +POT-Creation-Date: 2012-12-07 09:03+\n +PO-Revision-Date: 2012-12-07 13:54+0100\n +Last-Translator: \n Language-Team: French xfce-i...@xfce.org\n Language: fr\n MIME-Version: 1.0\n @@ -65,8 +65,7 @@ msgid Try %s --help to see a full list of available command line options.\n msgstr %s : %s\n -Essayez %s --help pour afficher une liste complète des options de ligne de -commande.\n +Essayez %s --help pour afficher une liste complète des options de ligne de commande.\n #: ../settings-dialogs/workspace-settings.c:74 #: ../settings-dialogs/workspace-settings.c:89 @@ -89,7 +88,7 @@ msgid Configure window behavior and shortcuts msgstr Configurer le comportement et les raccourcis des fenêtres #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2 -#: ../settings-dialogs/xfwm4-dialog.glade.h:48 +#: ../settings-dialogs/xfwm4-dialog.glade.h:47 msgid Window Manager msgstr Gestionnaire de fenêtres @@ -99,7 +98,7 @@ msgid Fine-tune window behaviour and effects msgstr Ajuster le comportement des fenêtres et leurs effets #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2 -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:38 msgid Window Manager Tweaks msgstr Peaufinage des fenêtres @@ -142,17 +141,17 @@ msgid bRaise on focus/b msgstr bMettre les fenêtres focalisées au premier plan/b #: ../settings-dialogs/xfwm4-dialog.glade.h:8 +msgid bThe_me/b +msgstr b_Thème/b + +#: ../settings-dialogs/xfwm4-dialog.glade.h:9 msgid bTitle _alignment/b msgstr bA_lignement du titre/b -#: ../settings-dialogs/xfwm4-dialog.glade.h:9 +#: ../settings-dialogs/xfwm4-dialog.glade.h:10 msgid bTitle fon_t/b msgstr b_Police du titre/b -#: ../settings-dialogs/xfwm4-dialog.glade.h:10 -msgid bWindow _shortcuts/b -msgstr bRacc_ourcis de gestion des fenêtres/b - #: ../settings-dialogs/xfwm4-dialog.glade.h:11 msgid bWindows snapping/b msgstr bAimantation des fenêtres/b @@ -162,8 +161,9 @@ msgid bWrap workspaces/b msgstr bBasculer d'espace de travail/b #: ../settings-dialogs/xfwm4-dialog.glade.h:13 -msgid b_Theme/b -msgstr b_Thème/b +#, fuzzy +msgid b_Window shortcuts/b +msgstr bRacc_ourcis de gestion des fenêtres/b #. Raise focus delay #: ../settings-dialogs/xfwm4-dialog.glade.h:15 @@ -204,13 +204,13 @@ msgid Automatically give focus to _newly created windows msgstr Focaliser automatiquement les _nouvelles fenêtres #: ../settings-dialogs/xfwm4-dialog.glade.h:26 -msgid Clic_k to focus -msgstr Cli_quer pour focaliser - -#: ../settings-dialogs/xfwm4-dialog.glade.h:27 msgid Click and drag the buttons to change the layout msgstr Faire glisser les boutons pour modifier leur agencement +#: ../settings-dialogs/xfwm4-dialog.glade.h:27 +msgid Click to foc_us +msgstr Cli_quer pour focaliser + #: ../settings-dialogs/xfwm4-dialog.glade.h:28 msgid Close msgstr Fermer @@ -240,76 +240,74 @@ msgid Hide content of windows when _resizing msgstr Cacher le contenu des fenêtres lors de leur _redimensionnement #: ../settings-dialogs/xfwm4-dialog.glade.h:36 -msgid Ke_yboard -msgstr _Clavier - -#: ../settings-dialogs/xfwm4-dialog.glade.h:37 msgid Maximize msgstr Maximiser -#: ../settings-dialogs/xfwm4-dialog.glade.h:38 +#: ../settings-dialogs/xfwm4-dialog.glade.h:37 msgid Menu msgstr Menu -#: ../settings-dialogs/xfwm4-dialog.glade.h:39 +#: ../settings-dialogs/xfwm4-dialog.glade.h:38 msgid Minimize msgstr Réduire -#: ../settings-dialogs/xfwm4-dialog.glade.h:40 +#: ../settings-dialogs/xfwm4-dialog.glade.h:39 msgid Raise window when clicking _inside application window msgstr Mettre une fenêtre au premier plan en cl_iquant à l'intérieur -#: ../settings-dialogs/xfwm4-dialog.glade.h:41 +#: ../settings-dialogs/xfwm4-dialog.glade.h:40 msgid Shade msgstr Enrouler -#: ../settings-dialogs/xfwm4-dialog.glade.h:42 +#: ../settings-dialogs/xfwm4-dialog.glade.h:41 msgid Snap windows to other _windows msgstr _Aimanter les fenêtres entre elles -#: ../settings-dialogs/xfwm4-dialog.glade.h:43 +#:
[Xfce4-commits] midori:master Replace error:nodocs with about:nodocs
Updating branch refs/heads/master
to 4173d2f0cce95547ea0559220a85aaa2aa081c80 (commit)
from 21ed1ea2e7a4aba0f7f6aea2d471d9fec4898985 (commit)
commit 4173d2f0cce95547ea0559220a85aaa2aa081c80
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Dec 6 20:34:26 2012 +0100
Replace error:nodocs with about:nodocs
midori/midori-browser.c |4 +---
midori/midori-view.c| 10 --
tests/tab.vala |4 ++--
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index f7e8fa0..55b0c40 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4673,12 +4673,10 @@ midori_browser_get_docs (gboolean error)
if (found)
return g_filename_to_uri (path, NULL, NULL);
#endif
-#ifdef DOCDIR
if (g_access (DOCDIR /faq.html, F_OK) == 0)
return g_strdup (file:// DOCDIR /faq.html);
else
-#endif
-return error ? g_strdup_printf (error:nodocs %s/faq.html, DOCDIR) :
NULL;
+return error ? g_strdup (about:nodocs) : NULL;
}
static void
diff --git a/midori/midori-view.c b/midori/midori-view.c
index f2d70d6..ea9e354 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3772,7 +3772,7 @@ list_video_formats (JSContextRef js_context)
static const gchar* valid_about_uris[] = {
about:widgets,
about:private,
-error:nodocs,
+about:nodocs,
http://.invalid;,
about:geolocation,
about:paths,
@@ -3841,12 +3841,10 @@ midori_view_set_uri (MidoriView* view,
}
#endif
}
-/* This is not prefectly elegant, but creating
- special pages inline is the simplest solution. */
-else if (g_str_has_prefix (uri, error:) || midori_uri_is_blank (uri))
+else if (midori_uri_is_blank (uri))
{
data = NULL;
-if (!strncmp (uri, error:nodocs , 13))
+if (!strcmp (uri, about:nodocs))
{
gchar* title = g_strdup_printf (_(No documentation
installed));
data = g_strdup_printf (
@@ -3860,7 +3858,7 @@ midori_view_set_uri (MidoriView* view,
verify that the build is setup properly.
a href=\http://wiki.xfce.org/midori/faq\;View the FAQ
online/a
/body/html,
-title, title, uri[13]);
+title, title, DOCDIR);
g_free (title);
}
else if (!strcmp (uri, about:widgets))
diff --git a/tests/tab.vala b/tests/tab.vala
index a4b6d20..1b63761 100644
--- a/tests/tab.vala
+++ b/tests/tab.vala
@@ -111,9 +111,9 @@ void tab_special () {
assert (tab.special);
assert (!tab.can_save ());
-tab.set_uri (error:nodocs file:///some/docs/path);
+tab.set_uri (about:nodocs);
do { loop.iteration (true); } while (tab.load_status !=
Midori.LoadStatus.FINISHED);
-assert (!tab.is_blank ());
+assert (tab.is_blank ());
assert (!tab.can_view_source ());
assert (tab.special);
assert (!tab.can_save ());
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Fix typo s/#if/#ifdef/ in midori_location_action_popup_timeout_cb
Updating branch refs/heads/master to b862afd9c630ea8b6c24dcfa5a459ba2dbb61457 (commit) from 4173d2f0cce95547ea0559220a85aaa2aa081c80 (commit) commit b862afd9c630ea8b6c24dcfa5a459ba2dbb61457 Author: Christian Dywan christ...@twotoasts.de Date: Thu Dec 6 20:38:23 2012 +0100 Fix typo s/#if/#ifdef/ in midori_location_action_popup_timeout_cb midori/midori-locationaction.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index c8fa3ea..79b3731 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -714,7 +714,7 @@ midori_location_action_popup_timeout_cb (gpointer data) cell-background, MIDORI_AUTOCOMPLETER_COLUMNS_BACKGROUND, NULL); renderer = gtk_cell_renderer_text_new (); -#if HAVE_GRANITE +#ifdef HAVE_GRANITE gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), renderer, FALSE); #else gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), renderer, TRUE); @@ -722,7 +722,7 @@ midori_location_action_popup_timeout_cb (gpointer data) gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer, cell-background, MIDORI_AUTOCOMPLETER_COLUMNS_BACKGROUND, NULL); -#if HAVE_GRANITE +#ifdef HAVE_GRANITE gtk_tree_view_column_set_expand (column, TRUE); gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (column), renderer, midori_location_entry_render_title_cb, action, NULL); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Fix url completion highlight regression and add test cases
Updating branch refs/heads/master
to 2d9bfff212b882e272509557b4e1ad7fedfd5804 (commit)
from b862afd9c630ea8b6c24dcfa5a459ba2dbb61457 (commit)
commit 2d9bfff212b882e272509557b4e1ad7fedfd5804
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Dec 7 01:30:04 2012 +0100
Fix url completion highlight regression and add test cases
Fixes: https://bugs.launchpad.net/midori/+bug/1087251
midori/midori-locationaction.c | 66
midori/midori-locationaction.h |8 +
midori/midori.vapi |6
tests/completion.vala | 28 +
4 files changed, 82 insertions(+), 26 deletions(-)
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 79b3731..52b96d3 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -224,9 +224,9 @@ midori_location_action_class_init
(MidoriLocationActionClass* class)
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
}
-static gchar*
-midori_location_entry_render_uri (gchar** keys,
- const gchar* uri_escaped)
+gchar*
+midori_location_action_render_uri (gchar** keys,
+ const gchar* uri_escaped)
{
gchar* uri_unescaped = midori_uri_unescape (uri_escaped);
gchar* uri = g_strescape (uri_unescaped, NULL);
@@ -238,19 +238,28 @@ midori_location_entry_render_uri (gchar** keys,
gchar* desc_iter = stripped_uri;
gint key_idx = 0;
gchar* key = keys[key_idx];
-gint offset = 0;
gchar* start;
gchar* desc_uri = NULL;
-while (key (start = strstr (temp_iter, key)) start)
+while (key (start = strstr (temp_iter, key)))
{
gsize len = strlen (key);
if (len)
{
-offset = (start - temp_iter);
+gint offset = (start - temp_iter);
gchar* skey = g_strndup (desc_iter + offset, len);
gchar** parts = g_strsplit (desc_iter, skey, 2);
if (parts[0] parts[1])
-desc_uri = g_markup_printf_escaped (%sb%s/b, parts[0],
skey);
+{
+if (desc_uri)
+{
+gchar* temp_markup = g_markup_printf_escaped
(%sb%s/b, parts[0], skey);
+gchar* temp_concat = g_strconcat (desc_uri, temp_markup,
NULL);
+g_free (temp_markup);
+katze_assign (desc_uri, temp_concat);
+}
+else
+desc_uri = g_markup_printf_escaped (%sb%s/b,
parts[0], skey);
+}
g_strfreev (parts);
g_free (skey);
@@ -264,43 +273,50 @@ midori_location_entry_render_uri (gchar** keys,
break;
}
if (key)
-katze_assign (desc_uri, NULL);
-if (desc_uri)
+katze_assign (desc_uri,g_markup_escape_text (stripped_uri, -1));
+else
{
gchar* temp_markup = g_markup_escape_text (desc_iter, -1);
gchar* temp_concat = g_strconcat (desc_uri, temp_markup, NULL);
g_free (temp_markup);
katze_assign (desc_uri, temp_concat);
}
-else
-desc_uri = g_markup_escape_text (stripped_uri, -1);
g_free (temp);
g_free (stripped_uri);
return desc_uri;
}
-static gchar*
-midori_location_entry_render_title (gchar** keys,
-const gchar* title)
+gchar*
+midori_location_action_render_title (gchar** keys,
+ const gchar* title)
{
gchar* temp;
gchar* temp_iter = temp = g_utf8_strdown (title, -1);
const gchar* desc_iter = title;
gint key_idx = 0;
gchar* key = keys[key_idx];
-gint offset = 0;
gchar* start;
gchar* desc_title = NULL;
-while (key (start = strstr (temp_iter, key)) start)
+while (key (start = strstr (temp_iter, key)))
{
gsize len = strlen (key);
if (len)
{
-offset = (start - temp_iter);
+gint offset = (start - temp_iter);
gchar* skey = g_strndup (desc_iter + offset, len);
gchar** parts = g_strsplit (desc_iter, skey, 2);
if (parts[0] parts[1])
-desc_title = g_markup_printf_escaped (%sb%s/b, parts[0],
skey);
+{
+if (desc_title)
+{
+gchar* temp_markup = g_markup_printf_escaped
(%sb%s/b, parts[0], skey);
+gchar* temp_concat = g_strconcat (desc_title, temp_markup,
NULL);
+g_free (temp_markup);
+katze_assign (desc_title, temp_concat);
+}
+else
+desc_title = g_markup_printf_escaped (%sb%s/b,
parts[0], skey);
+}
g_strfreev (parts);
g_free (skey);
@@ -314,16 +330,14 @@
[Xfce4-commits] xfce4-session:master l10n: Updated French (fr) translation to 98%
Updating branch refs/heads/master to 5b7bbd48a648ce9363da7c8327fbd1d36f20b3c2 (commit) from 9b7c500549c0aeec3e37a7cd8ae125eba46cb1d5 (commit) commit 5b7bbd48a648ce9363da7c8327fbd1d36f20b3c2 Author: jc jc1 jc1.quebe...@gmail.com Date: Fri Dec 7 14:25:04 2012 +0100 l10n: Updated French (fr) translation to 98% New status: 204 messages complete with 4 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 210 +++-- 1 files changed, 107 insertions(+), 103 deletions(-) diff --git a/po/fr.po b/po/fr.po index eb7ef53..de97ae7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,9 +9,9 @@ msgid msgstr Project-Id-Version: xfce4-session\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-04-12 15:57+\n -PO-Revision-Date: 2012-04-13 18:38+0100\n -Last-Translator: Iliyas Jorio inv.jo...@gmail.com\n +POT-Creation-Date: 2012-12-07 07:24+\n +PO-Revision-Date: 2012-12-07 14:24+0100\n +Last-Translator: \n Language-Team: French xfce-i...@xfce.org\n Language: fr\n MIME-Version: 1.0\n @@ -168,13 +168,13 @@ msgstr Saisissez '%s --help' pour afficher l'aide. #: ../settings/main.c:87 #: ../xfce4-session/main.c:267 -#: ../xfce4-session-logout/main.c:124 +#: ../xfce4-session-logout/main.c:136 msgid The Xfce development team. All rights reserved. msgstr L'équipe de développement Xfce. Tous droits réservés. #: ../settings/main.c:88 #: ../xfce4-session/main.c:268 -#: ../xfce4-session-logout/main.c:127 +#: ../xfce4-session-logout/main.c:139 #, c-format msgid Please report bugs to %s. msgstr Veuillez signaler tout bogue à %s. @@ -189,8 +189,9 @@ msgid Unable to create user interface from embedded definition data msgstr La création d'une interface utilisateur depuis les données de définition incrustées a échoué #: ../settings/main.c:128 -msgid _Application Autostart -msgstr _Démarrage automatique +#, fuzzy +msgid App_lication Autostart +msgstr _Démarrage automatique d'application #: ../settings/session-editor.c:61 msgid If running @@ -256,7 +257,7 @@ msgid The application will lose any unsaved state and will not be restarted in msgstr L'application va perdre tout état non sauvegardé et ne sera pas redémarrée dans votre prochaine session. #: ../settings/session-editor.c:256 -#: ../settings/xfce4-session-settings.glade.h:40 +#: ../settings/xfce4-session-settings.glade.h:41 msgid _Quit Program msgstr _Quitter le programme @@ -384,7 +385,7 @@ msgid Disable binding to TCP ports msgstr Désactiver la liaison aux ports TCP #: ../xfce4-session/main.c:77 -#: ../xfce4-session-logout/main.c:81 +#: ../xfce4-session-logout/main.c:91 msgid Print version information and exit msgstr Information sur la version et quitter @@ -435,7 +436,7 @@ msgstr Créer une nouvelle session. msgid The client doesn't have any properties set yet msgstr Aucune propriété n'est pour l'instant définie pour le client -#: ../xfce4-session/xfsm-compat-gnome.c:246 +#: ../xfce4-session/xfsm-compat-gnome.c:247 msgid Starting The Gnome Keyring Daemon msgstr Démarrage de Gnome Keyring Daemon @@ -468,54 +469,54 @@ msgstr Continuer quand même msgid Try again msgstr Réessayer -#: ../xfce4-session/xfsm-manager.c:609 +#: ../xfce4-session/xfsm-manager.c:611 #, c-format msgid Unable to determine failsafe session name. Possible causes: xfconfd isn't running (D-Bus setup problem); environment variable $XDG_CONFIG_DIRS is set incorrectly (must include \%s\), or xfce4-session is installed incorrectly. msgstr Échec à l'identification du nom de la session sans échec. Causes possibles : xfconfd n'est pas en cours (problème D-Bus) ; la variable d'environnement $XDG_CONFIG_DIRS n'est pas définie correctement (elle doit contenir \%s\) ; ou xfce4-session n'est pas installé correctement. -#: ../xfce4-session/xfsm-manager.c:620 +#: ../xfce4-session/xfsm-manager.c:622 #, c-format msgid The specified failsafe session (\%s\) is not marked as a failsafe session. msgstr La session sans échec « %s » n'est pas marquée comme telle. -#: ../xfce4-session/xfsm-manager.c:667 +#: ../xfce4-session/xfsm-manager.c:669 msgid The list of applications in the failsafe session is empty. msgstr La liste d'applications de la session sans échec est vide. #. FIXME: migrate this into the splash screen somehow so the #. * window doesn't look ugly (right now now WM is running, so it #. * won't have window decorations). -#: ../xfce4-session/xfsm-manager.c:714 +#: ../xfce4-session/xfsm-manager.c:716 msgid Session Manager Error msgstr Erreur du gestionnaire de session -#: ../xfce4-session/xfsm-manager.c:716 +#: ../xfce4-session/xfsm-manager.c:718 msgid Unable to load a failsafe session msgstr Aucune session sans échec n'a pu être chargée -#: ../xfce4-session/xfsm-manager.c:1123 +#: ../xfce4-session/xfsm-manager.c:1127 msgid Shutdown Failed msgstr Mise hors tension échouée -#:
[Xfce4-commits] xfburn:master l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to 4c884fc60296b0bae792dba3f497225db633501d (commit) from 52a8deb0fc377e3c37432e0d3f970c3f332c569e (commit) commit 4c884fc60296b0bae792dba3f497225db633501d Author: jc jc1 jc1.quebe...@gmail.com Date: Fri Dec 7 14:32:26 2012 +0100 l10n: Updated French (fr) translation to 100% New status: 282 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 96 - 1 files changed, 50 insertions(+), 46 deletions(-) diff --git a/po/fr.po b/po/fr.po index a30869f..658da91 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,8 +11,8 @@ msgid msgstr Project-Id-Version: xfburn\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-08-24 16:24+\n -PO-Revision-Date: 2012-08-26 14:10+0100\n +POT-Creation-Date: 2012-12-07 10:54+\n +PO-Revision-Date: 2012-12-07 14:31+0100\n Last-Translator: \n Language-Team: French xfce-i...@xfce.org\n Language: fr\n @@ -62,7 +62,7 @@ msgstr Nettoyage de disque #: ../xfburn/xfburn-blank-dialog.c:209 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:195 -#: ../xfburn/xfburn-burn-image-dialog.c:198 +#: ../xfburn/xfburn-burn-image-dialog.c:200 #: ../xfburn/xfburn-copy-cd-dialog.c:131 #: ../xfburn/xfburn-copy-dvd-dialog.c:131 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:160 @@ -76,7 +76,7 @@ msgstr Mode vierge #: ../xfburn/xfburn-blank-dialog.c:230 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:227 -#: ../xfburn/xfburn-burn-image-dialog.c:206 +#: ../xfburn/xfburn-burn-image-dialog.c:208 #: ../xfburn/xfburn-copy-cd-dialog.c:139 #: ../xfburn/xfburn-copy-dvd-dialog.c:139 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:194 @@ -85,7 +85,7 @@ msgstr Options #: ../xfburn/xfburn-blank-dialog.c:234 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:231 -#: ../xfburn/xfburn-burn-image-dialog.c:210 +#: ../xfburn/xfburn-burn-image-dialog.c:212 #: ../xfburn/xfburn-copy-cd-dialog.c:143 #: ../xfburn/xfburn-copy-dvd-dialog.c:143 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:198 @@ -127,14 +127,14 @@ msgstr Terminé #: ../xfburn/xfburn-blank-dialog.c:444 #: ../xfburn/xfburn-perform-burn.c:372 -#: ../xfburn/xfburn-progress-dialog.c:603 +#: ../xfburn/xfburn-progress-dialog.c:637 msgid Failure msgstr Échec #: ../xfburn/xfburn-blank-dialog.c:461 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:610 -#: ../xfburn/xfburn-burn-image-dialog.c:395 -#: ../xfburn/xfburn-burn-image-dialog.c:565 +#: ../xfburn/xfburn-burn-image-dialog.c:402 +#: ../xfburn/xfburn-burn-image-dialog.c:578 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:397 msgid Unable to grab the drive. msgstr Impossible de joindre le lecteur. @@ -165,7 +165,7 @@ msgid smallWould you like to change the default composition name?/small msgstr smallVoulez-vous changer le nom par défaut de la composition ?/small #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:236 -#: ../xfburn/xfburn-burn-image-dialog.c:215 +#: ../xfburn/xfburn-burn-image-dialog.c:217 #: ../xfburn/xfburn-copy-cd-dialog.c:148 #: ../xfburn/xfburn-copy-dvd-dialog.c:148 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:203 @@ -173,7 +173,7 @@ msgid _Dummy write msgstr _Simulation #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:240 -#: ../xfburn/xfburn-burn-image-dialog.c:219 +#: ../xfburn/xfburn-burn-image-dialog.c:221 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:207 msgid Burn_Free msgstr Burn_Free @@ -219,78 +219,82 @@ msgstr Le mode écriture n'est pas encore supporté. msgid Could not create ISO source structure. msgstr Échec à la création du fichier ISO source. -#: ../xfburn/xfburn-burn-image-dialog.c:159 +#: ../xfburn/xfburn-burn-image-dialog.c:161 msgid Burn image msgstr Graver l'image #. file -#: ../xfburn/xfburn-burn-image-dialog.c:166 -#: ../xfburn/xfburn-burn-image-dialog.c:183 +#: ../xfburn/xfburn-burn-image-dialog.c:168 +#: ../xfburn/xfburn-burn-image-dialog.c:185 msgid Image to burn msgstr Image à graver -#: ../xfburn/xfburn-burn-image-dialog.c:170 +#: ../xfburn/xfburn-burn-image-dialog.c:172 msgid All files msgstr Tous les fichiers -#: ../xfburn/xfburn-burn-image-dialog.c:174 +#: ../xfburn/xfburn-burn-image-dialog.c:176 msgid ISO images msgstr Images ISO -#: ../xfburn/xfburn-burn-image-dialog.c:229 +#: ../xfburn/xfburn-burn-image-dialog.c:226 +msgid _Quit after successful completion +msgstr _Quitter après la réussite + +#: ../xfburn/xfburn-burn-image-dialog.c:236 msgid _Burn image msgstr _Graver l'image -#: ../xfburn/xfburn-burn-image-dialog.c:278 +#: ../xfburn/xfburn-burn-image-dialog.c:285 msgid Burn mode is not currently implemented. msgstr Le mode de gravure n'est pas encore implémenté. -#: ../xfburn/xfburn-burn-image-dialog.c:329 -#: ../xfburn/xfburn-burn-image-dialog.c:358 +#: ../xfburn/xfburn-burn-image-dialog.c:336 +#:
[Xfce4-commits] parole:master l10n: Updated French (fr) translation to 99%
Updating branch refs/heads/master to 64b3d9073e287e26a78eefaba5a538dfb59a1d56 (commit) from b200875632fec3876157f0c6ff02fd2ae14f495e (commit) commit 64b3d9073e287e26a78eefaba5a538dfb59a1d56 Author: jc jc1 jc1.quebe...@gmail.com Date: Fri Dec 7 14:44:37 2012 +0100 l10n: Updated French (fr) translation to 99% New status: 209 messages complete with 2 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 333 ++ 1 files changed, 225 insertions(+), 108 deletions(-) diff --git a/po/fr.po b/po/fr.po index ae70e91..7dd261c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,8 +8,8 @@ msgid msgstr Project-Id-Version: ast\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-08-24 15:21+\n -PO-Revision-Date: 2012-08-26 14:09+0100\n +POT-Creation-Date: 2012-12-07 09:51+\n +PO-Revision-Date: 2012-12-07 14:44+0100\n Last-Translator: \n Language-Team: \n Language: \n @@ -32,116 +32,132 @@ msgid 4:3 (TV) msgstr 4:3 (TV) #: ../data/interfaces/parole.ui.h:4 +msgid bbigSong Title/big/b +msgstr bbigPar titre de chanson/big/b + +#: ../data/interfaces/parole.ui.h:5 +msgid bigby Song Artist/big +msgstr bigPar chanson d'artiste/big + +#: ../data/interfaces/parole.ui.h:6 +msgid bigon Song Album (2012)/big +msgstr bigsur l'album de chansons (2012)/big + +#: ../data/interfaces/parole.ui.h:7 #: ../src/misc/parole-filters.c:64 msgid Audio msgstr Audio -#: ../data/interfaces/parole.ui.h:5 +#: ../data/interfaces/parole.ui.h:8 msgid Audio Track: msgstr Piste Précédente -#: ../data/interfaces/parole.ui.h:6 +#: ../data/interfaces/parole.ui.h:9 msgid Auto msgstr Auto -#: ../data/interfaces/parole.ui.h:8 +#: ../data/interfaces/parole.ui.h:11 #, no-c-format msgid Buffering (0%) msgstr Mise en tampon -#: ../data/interfaces/parole.ui.h:9 -#: ../src/parole-player.c:663 +#: ../data/interfaces/parole.ui.h:12 +#: ../src/parole-player.c:707 msgid Empty msgstr Vide -#: ../data/interfaces/parole.ui.h:10 -#: ../src/parole-disc.c:125 -#: ../src/parole-disc.c:385 +#: ../data/interfaces/parole.ui.h:13 +#: ../src/parole-disc.c:111 +#: ../src/parole-disc.c:157 msgid Insert Disc msgstr Insérer un disque -#: ../data/interfaces/parole.ui.h:11 +#: ../data/interfaces/parole.ui.h:14 msgid Languages msgstr Langues -#: ../data/interfaces/parole.ui.h:12 +#: ../data/interfaces/parole.ui.h:15 msgid Media player msgstr Lecteur Média -#: ../data/interfaces/parole.ui.h:13 +#: ../data/interfaces/parole.ui.h:16 msgid None msgstr Aucun -#: ../data/interfaces/parole.ui.h:14 -msgid Open _location +#: ../data/interfaces/parole.ui.h:17 +msgid Open Recent +msgstr Ouvrir récent + +#: ../data/interfaces/parole.ui.h:18 +msgid Open _Location msgstr Ouvrir un _emplacement -#: ../data/interfaces/parole.ui.h:15 -#: ../src/parole-about.c:55 +#: ../data/interfaces/parole.ui.h:19 +#: ../src/parole-about.c:68 msgid Parole Media Player msgstr Lecteur Média Parole -#: ../data/interfaces/parole.ui.h:16 +#: ../data/interfaces/parole.ui.h:20 msgid Pl_ugins msgstr Greffons -#: ../data/interfaces/parole.ui.h:17 +#: ../data/interfaces/parole.ui.h:21 msgid Select Text Subtitles... msgstr Sélectionner le fichier de sous-titres -#: ../data/interfaces/parole.ui.h:18 +#: ../data/interfaces/parole.ui.h:22 msgid Show _playlist msgstr Afficher la liste de lecture -#: ../data/interfaces/parole.ui.h:19 +#: ../data/interfaces/parole.ui.h:23 msgid Square msgstr Carré -#: ../data/interfaces/parole.ui.h:20 +#: ../data/interfaces/parole.ui.h:24 msgid Subtitles msgstr Sous-titres -#: ../data/interfaces/parole.ui.h:21 +#: ../data/interfaces/parole.ui.h:25 msgid Subtitles: msgstr Sous-titres : -#: ../data/interfaces/parole.ui.h:22 +#: ../data/interfaces/parole.ui.h:26 msgid Volume _Down msgstr Diminuer le Volume -#: ../data/interfaces/parole.ui.h:23 +#: ../data/interfaces/parole.ui.h:27 msgid Volume _Up msgstr Augmenter le Volume -#: ../data/interfaces/parole.ui.h:24 +#: ../data/interfaces/parole.ui.h:28 msgid _Aspect Ratio msgstr _Ratio d'Aspect -#: ../data/interfaces/parole.ui.h:25 +#: ../data/interfaces/parole.ui.h:29 msgid _Edit msgstr _Éditer -#: ../data/interfaces/parole.ui.h:26 +#: ../data/interfaces/parole.ui.h:30 msgid _Help msgstr Aid_e -#: ../data/interfaces/parole.ui.h:27 +#: ../data/interfaces/parole.ui.h:31 msgid _Media msgstr _Média -#: ../data/interfaces/parole.ui.h:28 +#: ../data/interfaces/parole.ui.h:32 msgid _Mute msgstr _Mettre en sourdine -#: ../data/interfaces/parole.ui.h:29 +#: ../data/interfaces/parole.ui.h:33 msgid _Repeat msgstr _Répéter -#: ../data/interfaces/parole.ui.h:30 +#: ../data/interfaces/parole.ui.h:34 msgid _Shuffle msgstr _Aléatoire -#: ../data/interfaces/parole.ui.h:31 +#: ../data/interfaces/parole.ui.h:35 msgid _View msgstr _Affichage @@ -154,30 +170,55 @@ msgid _Open msgstr _Ouvrir #:
[Xfce4-commits] xfce4-mixer:master l10n: Updated French (fr) translation to 80%
Updating branch refs/heads/master to a9210f517cf9ea7c9c3099811a56f52121d03ace (commit) from c5abd29e7075bc9ae34ed769bb401397dc555249 (commit) commit a9210f517cf9ea7c9c3099811a56f52121d03ace Author: jc jc1 jc1.quebe...@gmail.com Date: Fri Dec 7 15:13:04 2012 +0100 l10n: Updated French (fr) translation to 80% New status: 29 messages complete with 7 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 94 + 1 files changed, 39 insertions(+), 55 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0ea46cc..039c188 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,8 +9,8 @@ msgstr Project-Id-Version: xfce4-mixer\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-09-29 13:30+\n -PO-Revision-Date: 2008-10-07 22:18+0100\n -Last-Translator: Mike Massonnet mmasson...@xfce.org\n +PO-Revision-Date: 2012-12-07 15:12+0100\n +Last-Translator: \n Language-Team: French xfce-i...@xfce.org\n Language: fr\n MIME-Version: 1.0\n @@ -21,66 +21,53 @@ msgstr #. Add menu item for muting #: ../panel-plugin/xfce-mixer-plugin.c:306 msgid Mu_te -msgstr +msgstr Sourdine #: ../panel-plugin/xfce-mixer-plugin.c:314 msgid Run Audio Mi_xer -msgstr +msgstr Exécuter le mélangeur audio -#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148 -msgid -GStreamer was unable to detect any sound devices. Some sound system specific -GStreamer packages may be missing. It may also be a permissions problem. -msgstr -GStreamer n'a pas détecté de cartes son. Certains paquets de GStreamer -peuvent être manquants. Il peut aussi s'agir d'un problème de permissions. +#: ../panel-plugin/xfce-mixer-plugin.c:581 +#: ../xfce4-mixer/main.c:148 +msgid GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem. +msgstr GStreamer n'a pas détecté de cartes son. Certains paquets de GStreamer peuvent être manquants. Il peut aussi s'agir d'un problème de permissions. #: ../panel-plugin/xfce-mixer-plugin.c:931 -#, fuzzy msgid No command defined -msgstr Pas de commande définie pour clic-gauche +msgstr Pas de commande définie #. Generate error message and insert the current command #: ../panel-plugin/xfce-mixer-plugin.c:939 #, c-format -msgid -Could not execute the command \%s\. Ensure that either the location of the -command is included in the PATH environment variable or that you are -providing the full path to the command. -msgstr -Impossible d'exécuter la commande « %s ». Vérifier que le chemin vers la -commande est inclue dans la variable d'environnement PATH ou que vous -fournisser le chemin complet vers la commande. +msgid Could not execute the command \%s\. Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command. +msgstr Impossible d'exécuter la commande « %s ». Vérifier que le chemin vers la commande est inclue dans la variable d'environnement PATH ou que vous fournisser le chemin complet vers la commande. #: ../panel-plugin/xfce-plugin-dialog.c:150 -#, fuzzy msgid Audio Mixer Plugin -msgstr Mixer +msgstr mélangeur #: ../panel-plugin/xfce-plugin-dialog.c:152 -#, fuzzy msgid Configure the sound card and mixer track -msgstr Configurer la carte son et contrôler le volume +msgstr Configurer la carte son et contrôleur de volume #: ../panel-plugin/xfce-plugin-dialog.c:165 #: ../xfce4-mixer/xfce-mixer-window.c:185 -#, fuzzy msgid Sound _card: msgstr Carte son : #: ../panel-plugin/xfce-plugin-dialog.c:174 -#, fuzzy msgid Mixer _track: -msgstr Piste mixer +msgstr Piste mélangeur : #: ../panel-plugin/xfce-volume-button.c:854 +#, fuzzy msgid No valid device and/or element. -msgstr +msgstr Pas d'appareil et / ou d'élément valide. #: ../panel-plugin/xfce-volume-button.c:859 #, c-format msgid %s: muted -msgstr +msgstr %s: en sourdine #: ../panel-plugin/xfce-volume-button.c:861 #, c-format @@ -88,19 +75,19 @@ msgid %s: %i%% msgstr %s : %i%% #. Set application name -#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99 +#: ../panel-plugin/mixer.desktop.in.h:1 +#: ../xfce4-mixer/main.c:99 #: ../xfce4-mixer/xfce-mixer-window.c:150 #: ../xfce4-mixer/xfce-mixer-window.c:413 #: ../xfce4-mixer/xfce-mixer-window.c:427 #: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1 -#, fuzzy msgid Audio Mixer -msgstr Mixer +msgstr Mélangeur audio #: ../panel-plugin/mixer.desktop.in.h:2 #: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2 msgid Adjust volume levels -msgstr +msgstr Réglez les niveaux du volume #: ../libxfce4mixer/libxfce4mixer.c:422 #, c-format @@ -109,16 +96,16 @@ msgstr Périphérique inconnu %d #: ../xfce4-mixer/main.c:86 msgid Enable debugging output -msgstr +msgstr Activer la sortie du débogage #: ../xfce4-mixer/main.c:87 msgid Show version and exit
[Xfce4-commits] xfce4-places-plugin:master l10n: Updated French (fr) translation to 100%
Updating branch refs/heads/master to f79da6ecadde26375cdfa0dce2ffa3f92dfc6f02 (commit) from 53113f2de66ab6b030f999216a580fe709d3b556 (commit) commit f79da6ecadde26375cdfa0dce2ffa3f92dfc6f02 Author: jc jc1 jc1.quebe...@gmail.com Date: Fri Dec 7 15:19:33 2012 +0100 l10n: Updated French (fr) translation to 100% New status: 44 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 55 +-- 1 files changed, 25 insertions(+), 30 deletions(-) diff --git a/po/fr.po b/po/fr.po index f2d0c7d..db3f88c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -30,8 +30,8 @@ msgstr Project-Id-Version: \n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-09-28 17:07+0100\n -PO-Revision-Date: 2007-10-24 11:42+0100\n -Last-Translator: Mike Massonnet mmasson...@gmail.com\n +PO-Revision-Date: 2012-12-07 15:19+0100\n +Last-Translator: \n Language-Team: \n Language: \n MIME-Version: 1.0\n @@ -39,8 +39,10 @@ msgstr Content-Transfer-Encoding: 8bit\n #. vim: set ai et tabstop=4: -#: ../panel-plugin/places.desktop.in.h:1 ../panel-plugin/cfg.c:102 -#: ../panel-plugin/cfg.c:201 ../panel-plugin/cfg.c:406 +#: ../panel-plugin/places.desktop.in.h:1 +#: ../panel-plugin/cfg.c:102 +#: ../panel-plugin/cfg.c:201 +#: ../panel-plugin/cfg.c:406 msgid Places msgstr Raccourcis @@ -65,17 +67,18 @@ msgstr Système de fichiers #: ../panel-plugin/model_volumes.c:71 #, c-format msgid Failed to eject \%s\ -msgstr Echec de l'éjection de \%s\ +msgstr Echec à l'éjection de « %s » #: ../panel-plugin/model_volumes.c:120 #, c-format msgid Failed to unmount \%s\ -msgstr Echec de démontage de \%s\ +msgstr Echec au démontage de « %s » -#: ../panel-plugin/model_volumes.c:170 ../panel-plugin/model_volumes.c:193 +#: ../panel-plugin/model_volumes.c:170 +#: ../panel-plugin/model_volumes.c:193 #, c-format msgid Failed to mount \%s\ -msgstr Echec de montage de \%s\ +msgstr Echec au montage de « %s » #: ../panel-plugin/model_volumes.c:478 msgid Mount and Open @@ -101,12 +104,8 @@ msgstr Démontage du périphérique #. TRANSLATORS: Please use the same translation here as in Thunar #: ../panel-plugin/model_volumes_notify.c:131 #, c-format -msgid -The device \%s\ is being unmounted by the system. Please do not remove the -media or disconnect the drive -msgstr -Le périphérique « %s » est en train d'être retiré du système. Veuillez ne -pas déconnecter le média. +msgid The device \%s\ is being unmounted by the system. Please do not remove the media or disconnect the drive +msgstr Le périphérique « %s » est en train d'être retiré du système. Veuillez ne pas déconnecter le média. #. TRANSLATORS: Please use the same translation here as in Thunar #: ../panel-plugin/model_volumes_notify.c:138 @@ -118,12 +117,8 @@ msgstr Écriture des données sur le périphérique #: ../panel-plugin/model_volumes_notify.c:141 #: ../panel-plugin/model_volumes_notify.c:265 #, c-format -msgid -There is data that needs to be written to the device \%s\ before it can be -removed. Please do not remove the media or disconnect the drive -msgstr -Des données doivent être écrites sur « %s » avant que ce périphérique puisse -être retiré. Veuillez ne pas déconnecter le média. +msgid There is data that needs to be written to the device \%s\ before it can be removed. Please do not remove the media or disconnect the drive +msgstr Des données doivent être écrites sur « %s » avant que ce périphérique puisse être retiré. Veuillez ne pas déconnecter le média. #. TRANSLATORS: Please use the same translation here as in Thunar #: ../panel-plugin/model_volumes_notify.c:253 @@ -134,14 +129,14 @@ msgstr Éjection du périphérique #: ../panel-plugin/model_volumes_notify.c:256 #, c-format msgid The device \%s\ is being ejected. This may take some time -msgstr -Le périphérique « %s » est en cours d'éjection. Cela va prendre un instant. +msgstr Le périphérique « %s » est en cours d'éjection. Cela va prendre un instant. #: ../panel-plugin/view.c:637 msgid Search for Files msgstr Recherche de fichiers -#: ../panel-plugin/view.c:690 ../panel-plugin/cfg.c:555 +#: ../panel-plugin/view.c:690 +#: ../panel-plugin/cfg.c:555 msgid Recent Documents msgstr Documents récents @@ -224,25 +219,25 @@ msgstr Ouvrir un terminal à cet emplacement #: ../panel-plugin/xfce4-popup-places.sh:28 msgid Usage: -msgstr +msgstr Usage : #: ../panel-plugin/xfce4-popup-places.sh:29 msgid OPTION -msgstr +msgstr OPTION #: ../panel-plugin/xfce4-popup-places.sh:31 msgid Options: -msgstr +msgstr Options : #: ../panel-plugin/xfce4-popup-places.sh:32 msgid Popup menu at current mouse position -msgstr +msgstr Menu contextuel à la position actuelle de la souris #: ../panel-plugin/xfce4-popup-places.sh:33 -#, fuzzy msgid Show help options -msgstr Afficher l'option _effacer +msgstr Afficher les options d'aide #:
[Xfce4-commits] xfce4-settings:ochosi/primary Set all connected displays to secondary when the active one is set to primary
Updating branch refs/heads/ochosi/primary
to fd388c938d047aa17301f4de69c649b058f4796c (commit)
from 7379317c553beb34e2b1a61027c1e7ad0afa3487 (commit)
commit fd388c938d047aa17301f4de69c649b058f4796c
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Fri Dec 7 17:07:26 2012 +0100
Set all connected displays to secondary when the active one is set to
primary
dialogs/display-settings/main.c | 12
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 8646acb..7ed4761 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1211,11 +1211,23 @@ static void
display_setting_primary_toggled (GtkToggleButton *togglebutton,
GtkBuilder *builder)
{
+guint m;
+
if (!xfce_randr)
return;
if (gtk_toggle_button_get_active (togglebutton))
+{
+/* Set currently active display as primary and all others as secondary */
xfce_randr-status[active_output]=XFCE_OUTPUT_STATUS_PRIMARY;
+for (m = 0; m xfce_randr-noutput; ++m)
+{
+if (m != active_output)
+{
+xfce_randr-status[m]=XFCE_OUTPUT_STATUS_SECONDARY;
+}
+}
+}
else
xfce_randr-status[active_output]=XFCE_OUTPUT_STATUS_SECONDARY;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-embed-plugin:master l10n: New French translation
Updating branch refs/heads/master
to 698f7fe4cc5f079e8a849b59bcf1c9429e4f0fcb (commit)
from e6adc24600c165e316364aecd30f740063a016c3 (commit)
commit 698f7fe4cc5f079e8a849b59bcf1c9429e4f0fcb
Author: jc jc1 jc1.quebe...@gmail.com
Date: Fri Dec 7 17:36:41 2012 +0100
l10n: New French translation
New status: 30 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{de.po = fr.po} | 98 ---
1 files changed, 46 insertions(+), 52 deletions(-)
diff --git a/po/de.po b/po/fr.po
similarity index 63%
copy from po/de.po
copy to po/fr.po
index ef18ffa..b8a2821 100644
--- a/po/de.po
+++ b/po/fr.po
@@ -1,4 +1,4 @@
-# German translation for xfce4-embed-plugin.
+# French translation for xfce4-embed-plugin.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the xfce4-embed-plugin
package.
# Mario Blättermann mario.blaetterm...@gmail.com, 2012.
@@ -8,57 +8,57 @@ msgstr
Project-Id-Version: xfce4-embed-plugin master\n
Report-Msgid-Bugs-To: \n
POT-Creation-Date: 2012-04-25 13:15+\n
-PO-Revision-Date: 2012-04-25 20:40+0100\n
-Last-Translator: Mario Blättermann mario.blaetterm...@gmail.com\n
-Language-Team: German Xfce translations xfce-i18n...@xfce.org\n
+PO-Revision-Date: 2012-12-07 17:28+0100\n
+Last-Translator: \n
+Language-Team: French Xfce translations xfce-i18n...@xfce.org\n
Language: \n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=utf-8\n
Content-Transfer-Encoding: 8bit\n
Plural-Forms: nplurals=2; plural=(n != 1)\n
-X-Poedit-Language: German\n
-X-Poedit-Country: GERMANY\n
+X-Poedit-Language: French\n
+X-Poedit-Country: FRANCE\n
#: ../panel-plugin/embed.c:48
msgid Embed
-msgstr Einbetten
+msgstr Embarqué
#. pop out menu item, not shown by default
#: ../panel-plugin/embed.c:244
msgid Pop _Out
-msgstr A_usklappen
+msgstr Sortir
#. embed menu item, shown by default.
#: ../panel-plugin/embed.c:249
msgid _Embed
-msgstr _Einbetten
+msgstr _Embarqué
#. focus menu item, not shown by default
#: ../panel-plugin/embed.c:255
msgid _Focus
-msgstr _Fokus
+msgstr _Focus
#: ../panel-plugin/embed-dialogs.c:51
#, c-format
msgid Unable to open the following url: %s
-msgstr Die folgende Adresse kann nicht geöffnet werden: %s
+msgstr Impossible d'ouvrir l'url suivante : %s
#: ../panel-plugin/embed-dialogs.c:100
msgid Input is valid
-msgstr Eingabe ist gültig
+msgstr L'entrée est valide
#: ../panel-plugin/embed-dialogs.c:105
msgid Input is invalid
-msgstr Eingabe ist ungültig
+msgstr L'entrée est invalide
#: ../panel-plugin/embed-dialogs.c:317
#: ../panel-plugin/embed.desktop.in.h:1
msgid Embed Plugin
-msgstr Einbettungs-Plugin
+msgstr Extension embarquée
#: ../panel-plugin/embed-dialogs.c:326
msgid Application Launching
-msgstr Anwendungen starten
+msgstr Lancement d'application
#: ../panel-plugin/embed-dialogs.c:328
#, c-format
@@ -68,11 +68,10 @@ msgid
that matches the below criteria, or it can use the socket ID passed\n
to it (%s) to embed itself automatically.
msgstr
-Falls ein Fenster nicht gefunden wird (und keine Kriterien verfügbar\n
-sind), kann wahlweise ein Befehl ausgeführt werden. Das Ergebnis des\n
-Befehls kann entweder ein Fenster sein, dass den nachfolgenden Kriterien\n
-entspricht, oder die Socket-Kennung kann übergeben werden (%s), um es\n
-automatisch einzubetten.
+Si une fenêtre n'est pas trouvée (ou sans critères), une commande peut\n
+éventuellement être lancée. La commande peut se traduire par une fenêtre\n
+qui correspond aux critères ci-dessous, ou il peut utiliser l'ID de la socket
passé\n
+pour (%s) s'embarquer automatiquement.
#: ../panel-plugin/embed-dialogs.c:336
#, c-format
@@ -80,12 +79,12 @@ msgid
Leave blank to not launch anything\n
%s expands to the socket ID
msgstr
-Leer lassen, um nichts auszuführen\n
-%s wird zur Socket-Kennung expandiert
+Laisser vide pour ne rien lancer\n
+%s étendu à l'ID de la socket
#: ../panel-plugin/embed-dialogs.c:339
msgid L_aunch command
-msgstr Befehl _ausführen
+msgstr Commande de _lancement
#. poll_delay
#. No UI element. Generally polling is unnecessary, unless you have a very
@@ -93,60 +92,55 @@ msgstr Befehl _ausführen
#. * identifiable when it is mapped.
#: ../panel-plugin/embed-dialogs.c:348
msgid Selection Criteria
-msgstr Auswahlkriterien
+msgstr Critères de sélection
#: ../panel-plugin/embed-dialogs.c:350
msgid
The window to embed must match all of the non-blank criteria.\n
Leave everything blank to rely on a launch command with socket ID.
msgstr
-Das Fenster muss alle nicht-leeren Kriterien erfüllen.\n
-Alles leer lassen, um nur einen Befehl mit der\n
-Socket-Kennung auszuführen.
+La fenêtre intégrée doit correspondre à tous les critères non-vierges.\n
+Laisser tout vide pour s'appuyer sur une commande de lancement avec l'ID
socket.
#:
[Xfce4-commits] xfce4-settings:master l10n: Updated Polish (pl) translation to 100%
Updating branch refs/heads/master to 7b8e172aa1f6ce82af338d40c828477dfbf102da (commit) from 4785866271e8eb54f7804ce225a9ae40a4595ed4 (commit) commit 7b8e172aa1f6ce82af338d40c828477dfbf102da Author: Piotr Sokół pso...@jabster.pl Date: Fri Dec 7 18:26:12 2012 +0100 l10n: Updated Polish (pl) translation to 100% New status: 348 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pl.po | 49 - 1 files changed, 24 insertions(+), 25 deletions(-) diff --git a/po/pl.po b/po/pl.po index 8bd6e96..e963ac0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,8 +8,8 @@ msgid msgstr Project-Id-Version: xfce4-settings 4.7.7\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-11-27 06:45+\n -PO-Revision-Date: 2012-11-27 12:50+0100\n +POT-Creation-Date: 2012-12-07 12:51+\n +PO-Revision-Date: 2012-12-07 17:17+\n Last-Translator: Piotr Sokół pso...@jabster.pl\n Language-Team: polski \n Language: \n @@ -364,8 +364,8 @@ msgid the mouse over the menu item and pressing the new key combination for the shortcut msgstr -Umożliwia zmianę klawiszy skrótów w menu programów umieszczając kursor myszy -nad elementem menu i wciskając nową kombinację klawiszy +Umożliwia modyfikowanie klawiszy skrótów w menu programów umieszczając +kursor myszy nad elementem menu i wciskając nową kombinację klawiszy #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19 msgid @@ -542,50 +542,44 @@ msgid msgstr Poprzednia konfiguracja zostanie przywrócona w przeciągu 10 sekund. #: ../dialogs/display-settings/display-dialog.glade.h:1 -msgid -Automatically show the \minimal dialog\ to quickly configure newly -connected displays. -msgstr Wyświetla okno podstawowych ustawień w czasie podłączania ekranów - -#: ../dialogs/display-settings/display-dialog.glade.h:2 msgid Configure _new displays when connected msgstr Konfigurowanie p_odłączanych ekranów -#: ../dialogs/display-settings/display-dialog.glade.h:3 +#: ../dialogs/display-settings/display-dialog.glade.h:2 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:1 msgid Configure screen settings and layout msgstr Konfiguruje ustawienia i układ ekranu -#: ../dialogs/display-settings/display-dialog.glade.h:4 +#: ../dialogs/display-settings/display-dialog.glade.h:3 #: ../dialogs/display-settings/xfce-display-settings.desktop.in.h:2 msgid Display msgstr Ekran -#: ../dialogs/display-settings/display-dialog.glade.h:5 +#: ../dialogs/display-settings/display-dialog.glade.h:4 msgid P_osition: msgstr P_ołożenie: -#: ../dialogs/display-settings/display-dialog.glade.h:6 +#: ../dialogs/display-settings/display-dialog.glade.h:5 msgid R_esolution: msgstr _Rozdzielczość: -#: ../dialogs/display-settings/display-dialog.glade.h:7 +#: ../dialogs/display-settings/display-dialog.glade.h:6 msgid Ref_lection: msgstr _Odbicie: -#: ../dialogs/display-settings/display-dialog.glade.h:8 +#: ../dialogs/display-settings/display-dialog.glade.h:7 msgid Refresh _rate: msgstr Częstotliwość _odświeżania: -#: ../dialogs/display-settings/display-dialog.glade.h:9 +#: ../dialogs/display-settings/display-dialog.glade.h:8 msgid Ro_tation: msgstr _Orientacja: -#: ../dialogs/display-settings/display-dialog.glade.h:10 +#: ../dialogs/display-settings/display-dialog.glade.h:9 msgid _Mirror displays msgstr _Ten sam obraz na wszystkich ekranach -#: ../dialogs/display-settings/display-dialog.glade.h:11 +#: ../dialogs/display-settings/display-dialog.glade.h:10 msgid _Use this output msgstr _Użycie tego ekranu @@ -595,7 +589,7 @@ msgstr Zaawansowane #: ../dialogs/display-settings/minimal-display-dialog.glade.h:2 msgid Displays -msgstr Wyświetlanie +msgstr Ekrany #: ../dialogs/display-settings/minimal-display-dialog.glade.h:3 msgid Extend to the right @@ -603,7 +597,7 @@ msgstr Rozszerz do prawej #: ../dialogs/display-settings/minimal-display-dialog.glade.h:4 msgid Mirror Displays -msgstr Wyświetlanie lustrzane +msgstr Wyświetlaj ten sam obraz #: ../dialogs/display-settings/minimal-display-dialog.glade.h:5 msgid Only Display 1 @@ -619,7 +613,7 @@ msgstr Pole jednokrotnego wyboru #: ../dialogs/display-settings/main.c:91 msgid Same as -msgstr Tak samo jak +msgstr Takie same jak #: ../dialogs/display-settings/main.c:92 msgid Above @@ -659,7 +653,7 @@ msgstr Pionowo #: ../dialogs/display-settings/main.c:139 msgid Minimal interface to set up an external output -msgstr Minimalny interfejs do skonfigurowania zewnętrznego wyjścia +msgstr Otwiera okno podstawowej konfiguracji ekranów #: ../dialogs/display-settings/main.c:227 #, c-format @@ -702,7 +696,7 @@ msgstr Nie można uzyskać wersji używanego rozszerzenia RandR #: ../dialogs/display-settings/main.c:1974 #: ../dialogs/display-settings/main.c:2010 msgid Unable to start the Xfce Display Settings -msgstr Nie można uruchomić preferencji ekranu
[Xfce4-commits] midori:master Fix wrong unref in session saving, add timeout testing
Updating branch refs/heads/master
to 08d8ceb253f8e5ac47340678e292e6c17b5bbb61 (commit)
from b4122d4ba156889abea7d4f6db5092c5484debda (commit)
commit 08d8ceb253f8e5ac47340678e292e6c17b5bbb61
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Dec 7 18:50:21 2012 +0100
Fix wrong unref in session saving, add timeout testing
Midori.Test.idle_timeouts is a hook for unit tests to change
second timeouts into idle callbacks.
extensions/cookie-manager/cookie-manager.c |3 ++-
extensions/feed-panel/main.c |5 ++---
katze/katze-http-cookies.c |5 +++--
midori/midori-browser.c|3 ++-
midori/midori-dialog.vala | 13 +
midori/midori-session.c|5 ++---
tests/app.vala |6 ++
7 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/extensions/cookie-manager/cookie-manager.c
b/extensions/cookie-manager/cookie-manager.c
index 4ca57ca..18f4c0d 100644
--- a/extensions/cookie-manager/cookie-manager.c
+++ b/extensions/cookie-manager/cookie-manager.c
@@ -234,7 +234,8 @@ static void cookie_manager_jar_changed_cb(SoupCookieJar
*jar, SoupCookie *old, S
/* We delay these events a little bit to avoid too many rebuilds of the
tree.
* Some websites (like Flyspray bugtrackers sent a whole bunch of
cookies at once. */
if (priv-timer_id == 0)
- priv-timer_id = g_timeout_add_seconds(1, (GSourceFunc)
cookie_manager_delayed_refresh, cm);
+ priv-timer_id = midori_timeout_add_seconds(
+ 1, (GSourceFunc) cookie_manager_delayed_refresh, cm,
NULL);
}
diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c
index 8cad47a..bff7bd9 100644
--- a/extensions/feed-panel/main.c
+++ b/extensions/feed-panel/main.c
@@ -16,7 +16,6 @@
#include midori/midori.h
#define EXTENSION_NAME Feed Panel
-#define UPDATE_FREQ 10
#define feed_get_flags(feed) \
GPOINTER_TO_INT (g_object_get_data (G_OBJECT ((feed)), flags))
@@ -488,8 +487,8 @@ feed_app_add_browser_cb (MidoriApp* app,
g_signal_connect (extension, deactivate,
G_CALLBACK (feed_deactivate_cb), priv);
-priv-source_id = g_timeout_add_seconds (UPDATE_FREQ * 60,
-(GSourceFunc) update_feeds, priv);
+priv-source_id = midori_timeout_add_seconds (
+600, (GSourceFunc) update_feeds, priv, NULL);
}
static void
diff --git a/katze/katze-http-cookies.c b/katze/katze-http-cookies.c
index 1ccb8d9..ac77130 100644
--- a/katze/katze-http-cookies.c
+++ b/katze/katze-http-cookies.c
@@ -14,6 +14,7 @@
#endif
#include katze-http-cookies.h
+#include midori/midori-core.h
#include stdlib.h
#ifdef HAVE_UNISTD_H
@@ -267,8 +268,8 @@ katze_http_cookies_jar_changed_cb (SoupCookieJar*jar,
http_cookies-counter++;
if (!http_cookies-timeout (old_cookie || new_cookie-expires))
-http_cookies-timeout = g_timeout_add_seconds (5,
-(GSourceFunc)katze_http_cookies_update_jar, http_cookies);
+http_cookies-timeout = midori_timeout_add_seconds (
+5, (GSourceFunc)katze_http_cookies_update_jar, http_cookies, NULL);
}
static void
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 55b0c40..c773c51 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -5502,7 +5502,8 @@ midori_browser_set_inactivity_reset (MidoriBrowser*
browser,
MidoriInactivityTimeout* mit = g_new (MidoriInactivityTimeout, 1);
mit-browser = browser;
mit-timeout = inactivity_reset;
-g_timeout_add_seconds (inactivity_reset, midori_inactivity_timeout,
mit);
+midori_timeout_add_seconds (
+inactivity_reset, midori_inactivity_timeout, mit, NULL);
}
}
diff --git a/midori/midori-dialog.vala b/midori/midori-dialog.vala
index 48d6405..5fd4611 100644
--- a/midori/midori-dialog.vala
+++ b/midori/midori-dialog.vala
@@ -10,7 +10,20 @@
*/
namespace Midori {
+namespace Timeout {
+public uint add_seconds (uint interval, owned SourceFunc function) {
+if (Test.test_idle_timeouts)
+return GLib.Idle.add (function);
+return GLib.Timeout.add_seconds (interval, function);
+}
+}
+
namespace Test {
+internal static bool test_idle_timeouts = false;
+public void idle_timeouts () {
+test_idle_timeouts = true;
+}
+
public void log_set_fatal_handler_for_icons () {
GLib.Test.log_set_fatal_handler ((domain, log_levels, message)= {
return !message.contains (Error loading theme icon)
diff --git a/midori/midori-session.c b/midori/midori-session.c
index 4c480f3..be2f09a 100644
--- a/midori/midori-session.c
+++ b/midori/midori-session.c
@@ -427,8 +427,6 @@ midori_session_save_timeout_cb (KatzeArray* session)
g_free
[Xfce4-commits] midori:master Move icon path setup and clearing into Midori.Paths
Updating branch refs/heads/master
to d107b6e07496eb6eeca4ee10bfaa9d5afb9844a0 (commit)
from 08d8ceb253f8e5ac47340678e292e6c17b5bbb61 (commit)
commit d107b6e07496eb6eeca4ee10bfaa9d5afb9844a0
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Dec 7 18:53:14 2012 +0100
Move icon path setup and clearing into Midori.Paths
katze/katze-net.c |3 +-
katze/katze-net.h |3 ++
katze/midori-paths.vala | 15 ++
midori/midori-browser.c | 60 +--
midori/midori-frontend.c|2 +-
midori/midori-privatedata.c | 17 +---
midori/midori-session.c |6
midori/midori-view.c|9 +-
midori/midori-view.h|3 --
9 files changed, 42 insertions(+), 76 deletions(-)
diff --git a/katze/katze-net.c b/katze/katze-net.c
index 05841e5..fc82510 100644
--- a/katze/katze-net.c
+++ b/katze/katze-net.c
@@ -22,7 +22,6 @@
#include glib/gstdio.h
#include libsoup/soup.h
-#include webkit/webkit.h
struct _KatzeNet
{
@@ -78,6 +77,7 @@ katze_net_priv_free (KatzeNetPriv* priv)
g_slice_free (KatzeNetPriv, priv);
}
+#if !WEBKIT_CHECK_VERSION (1, 8, 0)
gchar*
katze_net_get_cached_path (KatzeNet*net,
const gchar* uri,
@@ -110,6 +110,7 @@ katze_net_get_cached_path (KatzeNet*net,
g_free (cached_filename);
return cached_path;
}
+#endif
static void
katze_net_got_body_cb (SoupMessage* msg,
diff --git a/katze/katze-net.h b/katze/katze-net.h
index eea2df4..87c0912 100644
--- a/katze/katze-net.h
+++ b/katze/katze-net.h
@@ -12,6 +12,7 @@
#ifndef __KATZE_NET_H__
#define __KATZE_NET_H__
+#include webkit/webkit.h
#include katze-utils.h
G_BEGIN_DECLS
@@ -66,10 +67,12 @@ katze_net_load_uri (KatzeNet*
net,
KatzeNetTransferCb transfer_cb,
gpointer user_data);
+#if !WEBKIT_CHECK_VERSION (1, 8, 0)
gchar*
katze_net_get_cached_path(KatzeNet* net,
const gchar* uri,
const gchar* subfolder);
+#endif
G_END_DECLS
diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala
index 6c1ed41..2f62a90 100644
--- a/katze/midori-paths.vala
+++ b/katze/midori-paths.vala
@@ -116,6 +116,10 @@ namespace Midori {
tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S,
Environment.get_tmp_dir (), midori- +
Environment.get_user_name ());
}
+#if HAVE_WEBKIT_1_8_0
+if (user_data_dir != null)
+WebKit.get_favicon_database ().set_path (Path.build_filename
(user_data_dir, webkit, icondatabase));
+#endif
if (strcmp (Environment.get_variable (MIDORI_DEBUG), paths) ==
0) {
stdout.printf (config: %s\ncache: %s\nuser_data: %s\ntmp:
%s\n,
config_dir, cache_dir, user_data_dir, tmp_dir);
@@ -364,6 +368,17 @@ namespace Midori {
#endif
}
+public static void clear_icons () {
+assert (cache_dir != null);
+assert (user_data_dir != null);
+#if HAVE_WEBKIT_1_8_0
+WebKit.get_favicon_database ().clear ();
+#endif
+/* FIXME: Exclude search engine icons */
+remove_path (Path.build_filename (cache_dir, icons));
+remove_path (Path.build_filename (user_data_dir, webkit,
icondatabase));
+}
+
public static Gdk.Pixbuf? get_icon (string? uri, Gtk.Widget? widget) {
if (!Midori.URI.is_resource (uri))
return null;
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index c773c51..df60c75 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2411,23 +2411,18 @@ _action_add_desktop_shortcut_activate (GtkAction*
action,
KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (tab));
const gchar* app_name = katze_item_get_name (item);
gchar* app_exec = g_strconcat (midori -a , katze_item_get_uri (item),
NULL);
-const gchar* icon_uri = midori_view_get_icon_uri (MIDORI_VIEW (tab));
-gchar* app_icon;
GKeyFile* keyfile = g_key_file_new ();
-gchar* filename = g_strconcat (app_name, .desktop, NULL);
-gchar* app_dir;
-int i = 0;
-while (filename[i] != '\0')
-{
-if (filename[i] == '/')
-filename[i] = '_';
-i++;
-}
-app_dir = g_build_filename (g_get_user_data_dir (),
-applications, filename, NULL);
-app_icon = katze_net_get_cached_path (NULL, icon_uri, icons);
+gchar* filename = g_strdelimit (g_strconcat (app_name, .desktop, NULL),
/, '_');
+gchar* app_dir = g_build_filename (g_get_user_data_dir (), applications,
filename, NULL);
+#if WEBKIT_CHECK_VERSION (1, 8, 0)
+/* FIXME:
[Xfce4-commits] midori:master Add basic formhistory unit test and assertions
Updating branch refs/heads/master
to 89bcd9e540800e86c544b95d7f2db1f0704ac678 (commit)
from d107b6e07496eb6eeca4ee10bfaa9d5afb9844a0 (commit)
commit 89bcd9e540800e86c544b95d7f2db1f0704ac678
Author: Christian Dywan christ...@twotoasts.de
Date: Fri Dec 7 20:17:52 2012 +0100
Add basic formhistory unit test and assertions
extensions/formhistory/formhistory-gdom-frontend.c |4 +-
extensions/formhistory/formhistory-js-frontend.c |4 +-
extensions/formhistory/formhistory.c | 84 +++
midori/midori-extension.c |3 +-
4 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/extensions/formhistory/formhistory-gdom-frontend.c
b/extensions/formhistory/formhistory-gdom-frontend.c
index 76e0361..b601f35 100644
--- a/extensions/formhistory/formhistory-gdom-frontend.c
+++ b/extensions/formhistory/formhistory-gdom-frontend.c
@@ -14,9 +14,7 @@
FormHistoryPriv*
formhistory_private_new ()
{
-FormHistoryPriv* priv;
-
-priv = g_slice_new (FormHistoryPriv);
+FormHistoryPriv* priv = g_slice_new (FormHistoryPriv);
priv-oldkeyword = g_strdup ();
priv-selection_index = -1;
return priv;
diff --git a/extensions/formhistory/formhistory-js-frontend.c
b/extensions/formhistory/formhistory-js-frontend.c
index ec64d7a..2596335 100644
--- a/extensions/formhistory/formhistory-js-frontend.c
+++ b/extensions/formhistory/formhistory-js-frontend.c
@@ -13,9 +13,7 @@
FormHistoryPriv*
formhistory_private_new ()
{
-FormHistoryPriv* priv;
-
-priv = g_slice_new (FormHistoryPriv);
+FormHistoryPriv* priv = g_slice_new (FormHistoryPriv);
return priv;
}
diff --git a/extensions/formhistory/formhistory.c
b/extensions/formhistory/formhistory.c
index fca8aad..d999cd4 100644
--- a/extensions/formhistory/formhistory.c
+++ b/extensions/formhistory/formhistory.c
@@ -29,8 +29,7 @@ formhistory_update_database (gpointer db,
if (!(value *value))
return;
-sqlcmd = sqlite3_mprintf (INSERT INTO forms VALUES
- ('%q', '%q', '%q'),
+sqlcmd = sqlite3_mprintf (INSERT INTO forms VALUES('%q', '%q', '%q'),
host, key, value);
success = sqlite3_exec (db, sqlcmd, NULL, NULL, errmsg);
sqlite3_free (sqlcmd);
@@ -44,16 +43,21 @@ formhistory_update_database (gpointer db,
static gchar*
formhistory_get_login_data (gpointer db,
-const gchar* domain)
+const gchar* uri)
{
+gchar* domain;
static sqlite3_stmt* stmt;
-const char* sqlcmd;
gint result;
gchar* value = NULL;
+g_return_val_if_fail (db != NULL, NULL);
+g_return_val_if_fail (uri != NULL, NULL);
+domain = midori_uri_parse_hostname (uri, NULL);
+g_return_val_if_fail (domain != NULL, NULL);
+
if (!stmt)
{
-sqlcmd = SELECT value FROM forms WHERE domain = ?1 and field =
'MidoriPasswordManager' limit 1;
+const gchar* sqlcmd = SELECT value FROM forms WHERE domain = ?1 and
field = 'MidoriPasswordManager' limit 1;
sqlite3_prepare_v2 (db, sqlcmd, strlen (sqlcmd) + 1, stmt, NULL);
}
sqlite3_bind_text (stmt, 1, domain, -1, NULL);
@@ -62,6 +66,7 @@ formhistory_get_login_data (gpointer db,
value = g_strdup ((gchar*)sqlite3_column_text (stmt, 0));
sqlite3_reset (stmt);
sqlite3_clear_bindings (stmt);
+g_free (domain);
return value;
}
@@ -233,18 +238,13 @@ formhistory_navigation_decision_cb (WebKitWebView*
web_view,
#if WEBKIT_CHECK_VERSION (1, 3, 8)
else
{
-gchar* data;
-gchar* domain;
#if 0
FormhistoryPasswordEntry* entry;
#endif
-
-domain = midori_uri_parse_hostname
(webkit_web_frame_get_uri (web_frame), NULL);
-data = formhistory_get_login_data (priv-db, domain);
+gchar* data = formhistory_get_login_data (priv-db,
webkit_web_frame_get_uri (web_frame));
if (data)
{
g_free (data);
-g_free (domain);
break;
}
#if 0
@@ -367,7 +367,6 @@ formhistory_frame_loaded_cb (WebKitWebView* web_view,
FormHistoryPriv* priv;
JSContextRef js_context;
gchar* data;
-gchar* domain;
gchar* count;
page_uri = webkit_web_frame_get_uri (web_frame);
@@ -385,9 +384,7 @@ formhistory_frame_loaded_cb (WebKitWebView* web_view,
g_free (count);
priv = g_object_get_data (G_OBJECT (extension), priv);
-domain = midori_uri_parse_hostname (webkit_web_frame_get_uri (web_frame),
NULL);
-data = formhistory_get_login_data (priv-db, domain);
-g_free (domain);
+data = formhistory_get_login_data (priv-db,
[Xfce4-commits] thunar:master Keybindings to switch to tab with Alt+N (bug #9585).
Updating branch refs/heads/master
to a065d09122165121f5948c7bd3f92727ec0a8ec6 (commit)
from dcef5e94755e351f098ee8711650586d7b09e9cc (commit)
commit a065d09122165121f5948c7bd3f92727ec0a8ec6
Author: Nick Schermer n...@xfce.org
Date: Fri Dec 7 20:09:26 2012 +0100
Keybindings to switch to tab with Alt+N (bug #9585).
thunar/thunar-marshal.list |1 +
thunar/thunar-window.c | 47
2 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/thunar/thunar-marshal.list b/thunar/thunar-marshal.list
index 24d26e0..b183497 100644
--- a/thunar/thunar-marshal.list
+++ b/thunar/thunar-marshal.list
@@ -1,5 +1,6 @@
BOOLEAN:POINTER
BOOLEAN:VOID
+BOOLEAN:INT
FLAGS:OBJECT,OBJECT
FLAGS:STRING,FLAGS
VOID:STRING,STRING
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index defdb3d..47398c1 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -86,6 +86,7 @@ enum
ZOOM_IN,
ZOOM_OUT,
ZOOM_RESET,
+ TAB_CHANGE,
LAST_SIGNAL,
};
@@ -110,6 +111,8 @@ static void thunar_window_toggle_menubar_deactivate
(GtkWidget
static gboolean thunar_window_zoom_in (ThunarWindow
*window);
static gboolean thunar_window_zoom_out(ThunarWindow
*window);
static gboolean thunar_window_zoom_reset (ThunarWindow
*window);
+static gboolean thunar_window_tab_change (ThunarWindow
*window,
+ gint
nth);
static void thunar_window_realize (GtkWidget
*widget);
static void thunar_window_unrealize (GtkWidget
*widget);
static gboolean thunar_window_configure_event (GtkWidget
*widget,
@@ -256,6 +259,8 @@ struct _ThunarWindowClass
gboolean (*zoom_in) (ThunarWindow *window);
gboolean (*zoom_out)(ThunarWindow *window);
gboolean (*zoom_reset) (ThunarWindow *window);
+ gboolean (*tab_change) (ThunarWindow *window,
+ gint idx);
};
struct _ThunarWindow
@@ -391,6 +396,7 @@ thunar_window_class_init (ThunarWindowClass *klass)
GtkWidgetClass *gtkwidget_class;
GtkBindingSet *binding_set;
GObjectClass *gobject_class;
+ guint i;
gobject_class = G_OBJECT_CLASS (klass);
gobject_class-dispose = thunar_window_dispose;
@@ -410,6 +416,7 @@ thunar_window_class_init (ThunarWindowClass *klass)
klass-zoom_in = thunar_window_zoom_in;
klass-zoom_out = thunar_window_zoom_out;
klass-zoom_reset = thunar_window_zoom_reset;
+ klass-tab_change = thunar_window_tab_change;
/**
* ThunarWindow:current-directory:
@@ -584,6 +591,24 @@ thunar_window_class_init (ThunarWindowClass *klass)
_thunar_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
+ /**
+ * ThunarWindow::tab-chage:
+ * @window : a #ThunarWindow instance.
+ * @idx: tab index,
+ *
+ * Emitted whenever the user uses a Alt+N combination to
+ * switch tabs.
+ **/
+ window_signals[TAB_CHANGE] =
+g_signal_new (I_(tab-change),
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (ThunarWindowClass, tab_change),
+ g_signal_accumulator_true_handled, NULL,
+ _thunar_marshal_BOOLEAN__INT,
+ G_TYPE_BOOLEAN, 1,
+ G_TYPE_INT);
+
/* setup the key bindings for the windows */
binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0, back, 0);
@@ -594,6 +619,13 @@ thunar_window_class_init (ThunarWindowClass *klass)
gtk_binding_entry_add_signal (binding_set, GDK_KP_Subtract,
GDK_CONTROL_MASK, zoom-out, 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_0, GDK_CONTROL_MASK,
zoom-reset, 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Insert, GDK_CONTROL_MASK,
zoom-reset, 0);
+
+ /* setup the key bindings for Alt+N */
+ for (i = 0; i 10; i++)
+{
+ gtk_binding_entry_add_signal (binding_set, GDK_0 + i, GDK_MOD1_MASK,
+tab-change, 1, G_TYPE_UINT, i - 1);
+}
}
@@ -1232,6 +1264,21 @@ thunar_window_zoom_reset (ThunarWindow *window)
+static gboolean
+thunar_window_tab_change (ThunarWindow *window,
+ gint nth)
+{
+ _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
+
+ /* Alt+0 is 10th tab */
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (window-notebook),
+ nth == -1 ? 8 : nth);
+
+ return TRUE;
+}
+
+
+
static void
thunar_window_realize (GtkWidget *widget)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
[Xfce4-commits] thunar:master Make tabs scrollable.
Updating branch refs/heads/master to a5ba2d88a8534cfc0173ab10f3ad5a777ee92f0f (commit) from a065d09122165121f5948c7bd3f92727ec0a8ec6 (commit) commit a5ba2d88a8534cfc0173ab10f3ad5a777ee92f0f Author: Nick Schermer n...@xfce.org Date: Fri Dec 7 20:12:41 2012 +0100 Make tabs scrollable. This avoids resizing the window with a lot of tabs. thunar/thunar-window.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c index 47398c1..d900efb 100644 --- a/thunar/thunar-window.c +++ b/thunar/thunar-window.c @@ -864,6 +864,7 @@ thunar_window_init (ThunarWindow *window) g_signal_connect (G_OBJECT (window-notebook), create-window, G_CALLBACK (thunar_window_notebook_create_window), window); gtk_notebook_set_show_border (GTK_NOTEBOOK (window-notebook), FALSE); gtk_notebook_set_homogeneous_tabs (GTK_NOTEBOOK (window-notebook), TRUE); + gtk_notebook_set_scrollable (GTK_NOTEBOOK (window-notebook), TRUE); gtk_container_set_border_width (GTK_CONTAINER (window-notebook), 0); gtk_notebook_set_group_name (GTK_NOTEBOOK (window-notebook), thunar-tabs); gtk_widget_show (window-notebook); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Session save mount operation passwords.
Updating branch refs/heads/master
to 65dd2ddba44e7bf809fc0bbacb63bd6eb4d24d99 (commit)
from a5ba2d88a8534cfc0173ab10f3ad5a777ee92f0f (commit)
commit 65dd2ddba44e7bf809fc0bbacb63bd6eb4d24d99
Author: Nick Schermer n...@xfce.org
Date: Fri Dec 7 20:42:49 2012 +0100
Session save mount operation passwords.
Also centralize the code.
thunar/thunar-browser.c| 25 +++
thunar/thunar-gtk-extensions.c | 23 ++
thunar/thunar-gtk-extensions.h | 50 ---
thunar/thunar-launcher.c |6 +
thunar/thunar-shortcuts-view.c |8 +
thunar/thunar-tree-view.c | 16 +++-
6 files changed, 60 insertions(+), 68 deletions(-)
diff --git a/thunar/thunar-browser.c b/thunar/thunar-browser.c
index 9813936..a6e5b80 100644
--- a/thunar/thunar-browser.c
+++ b/thunar/thunar-browser.c
@@ -28,6 +28,7 @@
#include thunar/thunar-file.h
#include thunar/thunar-private.h
#include thunar/thunar-util.h
+#include thunar/thunar-gtk-extensions.h
@@ -187,24 +188,6 @@ thunar_browser_poke_device_data_free (PokeDeviceData
*poke_data)
-static GMountOperation *
-thunar_browser_mount_operation_new (gpointer parent)
-{
- GMountOperation *mount_operation;
- GtkWindow *window = NULL;
- GdkScreen *screen = NULL;
-
- mount_operation = gtk_mount_operation_new (NULL);
-
- screen = thunar_util_parse_parent (parent, window);
- gtk_mount_operation_set_screen (GTK_MOUNT_OPERATION (mount_operation),
screen);
- gtk_mount_operation_set_parent (GTK_MOUNT_OPERATION (mount_operation),
window);
-
- return mount_operation;
-}
-
-
-
static void
thunar_browser_poke_mountable_file_finish (GFile *location,
ThunarFile *file,
@@ -473,7 +456,7 @@ thunar_browser_poke_file_internal (ThunarBrowser
*browser,
poke_data = thunar_browser_poke_file_data_new (browser, location,
source,
file, func,
location_func, user_data);
- mount_operation = thunar_browser_mount_operation_new (widget);
+ mount_operation = thunar_gtk_mount_operation_new (widget);
g_file_mount_mountable (thunar_file_get_file (file),
G_MOUNT_MOUNT_NONE, mount_operation, NULL,
@@ -488,7 +471,7 @@ thunar_browser_poke_file_internal (ThunarBrowser
*browser,
poke_data = thunar_browser_poke_file_data_new (browser, location, source,
file, func,
location_func, user_data);
- mount_operation = thunar_browser_mount_operation_new (widget);
+ mount_operation = thunar_gtk_mount_operation_new (widget);
g_file_mount_enclosing_volume (thunar_file_get_file (file),
G_MOUNT_MOUNT_NONE, mount_operation, NULL,
@@ -659,7 +642,7 @@ thunar_browser_poke_device (ThunarBrowser
*browser,
{
poke_data = thunar_browser_poke_device_data_new (browser, device, func,
user_data);
- mount_operation = thunar_browser_mount_operation_new (widget);
+ mount_operation = thunar_gtk_mount_operation_new (widget);
thunar_device_mount (device,
mount_operation,
diff --git a/thunar/thunar-gtk-extensions.c b/thunar/thunar-gtk-extensions.c
index 0b4232c..1938a95 100644
--- a/thunar/thunar-gtk-extensions.c
+++ b/thunar/thunar-gtk-extensions.c
@@ -29,6 +29,7 @@
#include thunar/thunar-gtk-extensions.h
#include thunar/thunar-private.h
+#include thunar/thunar-util.h
@@ -248,3 +249,25 @@ thunar_gtk_widget_set_tooltip (GtkWidget *widget,
+/**
+ * thunar_gtk_mount_operation_new:
+ * @parent : a #GtkWindow or non-toplevel widget.
+ *
+ * Create a mount operation with some defaults.
+ **/
+GMountOperation *
+thunar_gtk_mount_operation_new (gpointer parent)
+{
+ GMountOperation *operation;
+ GdkScreen *screen;
+ GtkWindow *window = NULL;
+
+ screen = thunar_util_parse_parent (parent, window);
+
+ operation = gtk_mount_operation_new (window);
+ g_mount_operation_set_password_save (G_MOUNT_OPERATION (operation),
G_PASSWORD_SAVE_FOR_SESSION);
+ if (window == NULL screen != NULL)
+gtk_mount_operation_set_screen (GTK_MOUNT_OPERATION (operation), screen);
+
+ return operation;
+}
diff --git a/thunar/thunar-gtk-extensions.h b/thunar/thunar-gtk-extensions.h
index 276394d..881fe0c 100644
--- a/thunar/thunar-gtk-extensions.h
+++ b/thunar/thunar-gtk-extensions.h
@@ -24,30 +24,32 @@
G_BEGIN_DECLS;
-void thunar_gtk_action_set_tooltip(GtkAction
*action,
- const gchar
*format,
- ...) G_GNUC_PRINTF
(2, 3);
-
-void thunar_gtk_action_group_set_action_sensitive (GtkActionGroup
*action_group,
-
[Xfce4-commits] thunar:master Check trash status 2s after startup.
Updating branch refs/heads/master
to b0d722672269b3a9315b9a79badad5158aae9164 (commit)
from 65dd2ddba44e7bf809fc0bbacb63bd6eb4d24d99 (commit)
commit b0d722672269b3a9315b9a79badad5158aae9164
Author: Nick Schermer n...@xfce.org
Date: Fri Dec 7 20:58:47 2012 +0100
Check trash status 2s after startup.
thunar/thunar-session-client.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/thunar/thunar-session-client.c b/thunar/thunar-session-client.c
index 30e5864..1c529f4 100644
--- a/thunar/thunar-session-client.c
+++ b/thunar/thunar-session-client.c
@@ -342,7 +342,7 @@ thunar_session_client_restore (ThunarSessionClient
*session_client)
if (thunar_window_set_directories (THUNAR_WINDOW (window), uris,
active_tab))
{
/* add idle to make sure the trash status is up2date (bug #9513) */
- session_client-trash_load_idle = g_idle_add
(thunar_session_client_restore_trash, session_client);
+ session_client-trash_load_idle = g_timeout_add_seconds (2,
thunar_session_client_restore_trash, session_client);
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Rotate pixbuf loader images (bug #6730).
Updating branch refs/heads/master
to 59ec6358a566fe07a9d1ce9e3b2898b524c9d7b0 (commit)
from f2846eb766d569c40427df43b1ca8c76ce109f99 (commit)
commit 59ec6358a566fe07a9d1ce9e3b2898b524c9d7b0
Author: Nick Schermer n...@xfce.org
Date: Fri Dec 7 22:33:44 2012 +0100
Rotate pixbuf loader images (bug #6730).
plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
index 3387878..9c64659 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
@@ -144,6 +144,7 @@ pixbuf_thumbnailer_new_from_stream (GInputStream
*stream,
GdkPixbufLoader *loader;
gssize n_read;
gboolean result;
+ GdkPixbuf *src;
GdkPixbuf *pixbuf = NULL;
guchar buffer[65536];
@@ -186,9 +187,9 @@ pixbuf_thumbnailer_new_from_stream (GInputStream
*stream,
if (result)
{
- pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
- if (G_LIKELY (pixbuf != NULL))
-g_object_ref (pixbuf);
+ src = gdk_pixbuf_loader_get_pixbuf (loader);
+ if (G_LIKELY (src != NULL))
+pixbuf = gdk_pixbuf_apply_embedded_orientation (src);
}
g_object_unref (loader);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Don't use deprecated glib 2.32 API.
Updating branch refs/heads/master
to cdea35f8845595383d55ccbe89e2a9cb3b755d21 (commit)
from 59ec6358a566fe07a9d1ce9e3b2898b524c9d7b0 (commit)
commit cdea35f8845595383d55ccbe89e2a9cb3b755d21
Author: Nick Schermer n...@xfce.org
Date: Fri Dec 7 23:10:31 2012 +0100
Don't use deprecated glib 2.32 API.
tumblerd/main.c|2 +
tumblerd/tumbler-cache-service.c | 28 ++--
tumblerd/tumbler-group-scheduler.c | 39
tumblerd/tumbler-lifecycle-manager.c | 35 ---
tumblerd/tumbler-lifo-scheduler.c | 39
tumblerd/tumbler-manager.c | 68 ++--
tumblerd/tumbler-registry.c| 43 +-
tumblerd/tumbler-service.c | 32 +++---
tumblerd/tumbler-specialized-thumbnailer.c | 46 +++---
tumblerd/tumbler-utils.h | 14 ++
10 files changed, 199 insertions(+), 147 deletions(-)
diff --git a/tumblerd/main.c b/tumblerd/main.c
index e34b135..c42989d 100644
--- a/tumblerd/main.c
+++ b/tumblerd/main.c
@@ -85,9 +85,11 @@ main (intargc,
/* initialize the GLib type system */
g_type_init ();
+#if !GLIB_CHECK_VERSION (2, 32, 0)
/* initialize threading system */
if (!g_thread_supported ())
g_thread_init (NULL);
+#endif
/* initial the D-Bus threading system */
dbus_g_thread_init ();
diff --git a/tumblerd/tumbler-cache-service.c b/tumblerd/tumbler-cache-service.c
index d9ecfe6..47d0b8e 100644
--- a/tumblerd/tumbler-cache-service.c
+++ b/tumblerd/tumbler-cache-service.c
@@ -94,7 +94,7 @@ struct _TumblerCacheService
GThreadPool *delete_pool;
GThreadPool *cleanup_pool;
- GMutex *mutex;
+ TUMBLER_MUTEX(mutex);
};
struct _MoveRequest
@@ -150,7 +150,7 @@ tumbler_cache_service_class_init (TumblerCacheServiceClass
*klass)
static void
tumbler_cache_service_init (TumblerCacheService *service)
{
- service-mutex = g_mutex_new ();
+ tumbler_mutex_create (service-mutex);
}
@@ -202,7 +202,7 @@ tumbler_cache_service_finalize (GObject *object)
dbus_g_connection_unref (service-connection);
- g_mutex_free (service-mutex);
+ tumbler_mutex_free (service-mutex);
(*G_OBJECT_CLASS (tumbler_cache_service_parent_class)-finalize) (object);
}
@@ -261,7 +261,7 @@ tumbler_cache_service_move_thread (gpointer data,
g_return_if_fail (TUMBLER_IS_CACHE_SERVICE (service));
g_return_if_fail (request != NULL);
- g_mutex_lock (service-mutex);
+ tumbler_mutex_lock (service-mutex);
if (service-cache != NULL)
{
@@ -278,7 +278,7 @@ tumbler_cache_service_move_thread (gpointer data,
* other requests are still to be processed) */
tumbler_component_decrement_use_count (TUMBLER_COMPONENT (service));
- g_mutex_unlock (service-mutex);
+ tumbler_mutex_unlock (service-mutex);
}
@@ -293,7 +293,7 @@ tumbler_cache_service_copy_thread (gpointer data,
g_return_if_fail (TUMBLER_IS_CACHE_SERVICE (service));
g_return_if_fail (request != NULL);
- g_mutex_lock (service-mutex);
+ tumbler_mutex_lock (service-mutex);
if (service-cache != NULL)
{
@@ -310,7 +310,7 @@ tumbler_cache_service_copy_thread (gpointer data,
* other requests are still to be processed) */
tumbler_component_decrement_use_count (TUMBLER_COMPONENT (service));
- g_mutex_unlock (service-mutex);
+ tumbler_mutex_unlock (service-mutex);
}
@@ -325,7 +325,7 @@ tumbler_cache_service_delete_thread (gpointer data,
g_return_if_fail (TUMBLER_IS_CACHE_SERVICE (service));
g_return_if_fail (request != NULL);
- g_mutex_lock (service-mutex);
+ tumbler_mutex_lock (service-mutex);
if (service-cache != NULL)
tumbler_cache_delete (service-cache, (const gchar *const *)request-uris);
@@ -337,7 +337,7 @@ tumbler_cache_service_delete_thread (gpointer data,
* other requests are still to be processed) */
tumbler_component_decrement_use_count (TUMBLER_COMPONENT (service));
- g_mutex_unlock (service-mutex);
+ tumbler_mutex_unlock (service-mutex);
}
@@ -352,7 +352,7 @@ tumbler_cache_service_cleanup_thread (gpointer data,
g_return_if_fail (TUMBLER_IS_CACHE_SERVICE (service));
g_return_if_fail (request != NULL);
- g_mutex_lock (service-mutex);
+ tumbler_mutex_lock (service-mutex);
if (service-cache != NULL)
{
@@ -368,7 +368,7 @@ tumbler_cache_service_cleanup_thread (gpointer data,
* other requests are still to be processed) */
tumbler_component_decrement_use_count (TUMBLER_COMPONENT (service));
- g_mutex_unlock (service-mutex);
+ tumbler_mutex_unlock (service-mutex);
}
@@ -395,7 +395,7 @@ tumbler_cache_service_start (TumblerCacheService *service,
g_return_val_if_fail (TUMBLER_IS_CACHE_SERVICE (service), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- g_mutex_lock (service-mutex);
+ tumbler_mutex_lock (service-mutex);
/* get
[Xfce4-commits] tumbler:master Make registry dump a bit smaller.
Updating branch refs/heads/master
to 89b2e5ddd1467cf5ed62c7d1e376ef07109c9f92 (commit)
from cdea35f8845595383d55ccbe89e2a9cb3b755d21 (commit)
commit 89b2e5ddd1467cf5ed62c7d1e376ef07109c9f92
Author: Nick Schermer n...@xfce.org
Date: Fri Dec 7 23:31:46 2012 +0100
Make registry dump a bit smaller.
tumblerd/tumbler-registry.c | 54 +++---
1 files changed, 14 insertions(+), 40 deletions(-)
diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c
index 37c0e67..fc4a513 100644
--- a/tumblerd/tumbler-registry.c
+++ b/tumblerd/tumbler-registry.c
@@ -33,16 +33,16 @@
-static void tumbler_registry_finalize (GObject
*object);
-static void tumbler_registry_remove_thumbnailer(const gchar
*key,
-GList
**list,
-
TumblerThumbnailer *thumbnailer);
-static void tumbler_registry_list_free (gpointer
data);
-static GList *tumbler_registry_get_thumbnailers_internal
(TumblerRegistry*registry);
-static gint tumbler_registry_compare
(TumblerThumbnailer *a,
-
TumblerThumbnailer *b);
-TumblerThumbnailer *tumbler_registry_lookup
(TumblerRegistry*registry,
-const gchar
*hash_key);
+static voidtumbler_registry_finalize (GObject
*object);
+static voidtumbler_registry_remove_thumbnailer(const
gchar*key,
+ GList
**list,
+
TumblerThumbnailer *thumbnailer);
+static voidtumbler_registry_list_free
(gpointerdata);
+static GList *tumbler_registry_get_thumbnailers_internal
(TumblerRegistry*registry);
+static ginttumbler_registry_compare
(TumblerThumbnailer *a,
+
TumblerThumbnailer *b);
+static TumblerThumbnailer *tumbler_registry_lookup
(TumblerRegistry*registry,
+ const
gchar*hash_key);
@@ -125,36 +125,10 @@ tumbler_registry_finalize (GObject *object)
static void
dump_registry (TumblerRegistry *registry)
{
- TumblerThumbnailer *thumbnailer;
- GHashTableIter iter;
- const gchar*hash_key;
- GList **thumbnailers;
- GList *lp;
-
g_print (Registry:\n);
-
- g_print ( Preferred Thumbnailers:\n);
- g_hash_table_iter_init (iter, registry-preferred_thumbnailers);
- while (g_hash_table_iter_next (iter, (gpointer) hash_key, (gpointer)
thumbnailer))
-{
- g_print (%s: %s\n, hash_key,
- tumbler_specialized_thumbnailer_get_name
(TUMBLER_SPECIALIZED_THUMBNAILER (thumbnailer)));
-}
-
- g_print ( Registry Thumbnailers:\n);
- g_hash_table_iter_init (iter, registry-thumbnailers);
- while (g_hash_table_iter_next (iter, (gpointer) hash_key, (gpointer)
thumbnailers))
-{
- for (lp = *thumbnailers; lp != NULL; lp = lp-next)
-{
- if (TUMBLER_IS_SPECIALIZED_THUMBNAILER (lp-data))
-{
- g_print (%s: %s\n,
- hash_key, tumbler_specialized_thumbnailer_get_name
(lp-data));
-}
-}
-}
-
+ g_print ( Preferred Thumbnailers: %d\n,
+ g_hash_table_size (registry-preferred_thumbnailers));
+ g_print ( Registry Thumbnailers: %d\n,g_hash_table_size
(registry-thumbnailers));
g_print (\n);
}
#endif
@@ -286,7 +260,7 @@ tumbler_registry_get_thumbnailers_internal (TumblerRegistry
*registry)
-TumblerThumbnailer *
+static TumblerThumbnailer *
tumbler_registry_lookup (TumblerRegistry *registry,
const gchar *hash_key)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Work with an array to store the strings.
Updating branch refs/heads/master
to 2165c4239697a905fdd3e46037baa977c05e4fb1 (commit)
from 0093f278c4dfe45e404ae502aa0e3c817f7a38fc (commit)
commit 2165c4239697a905fdd3e46037baa977c05e4fb1
Author: Nick Schermer n...@xfce.org
Date: Fri Dec 7 23:54:43 2012 +0100
Work with an array to store the strings.
Called a lot, so array is a bit more efficient than.
tumblerd/tumbler-registry.c | 13 -
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c
index 5f8c8ab..c75ca61 100644
--- a/tumblerd/tumbler-registry.c
+++ b/tumblerd/tumbler-registry.c
@@ -469,7 +469,7 @@ tumbler_registry_update_supported (TumblerRegistry
*registry)
{
GHashTableIter iter;
GHashTable*unique_pairs;
- GSList*used_strings = NULL;
+ GPtrArray *used_strings;
GList *thumbnailers;
GList *lp;
const gchar **pair;
@@ -507,6 +507,9 @@ tumbler_registry_update_supported (TumblerRegistry
*registry)
(GDestroyNotify) g_free,
(GDestroyNotify) free_pair);
+ /* prepare array */
+ used_strings = g_ptr_array_sized_new (150);
+
/* iterate over all of them */
for (lp = thumbnailers; lp != NULL; lp = lp-next)
{
@@ -523,7 +526,7 @@ tumbler_registry_update_supported (TumblerRegistry
*registry)
++n)
{
/* remember the MIME type so that we can later reuse it without
copying */
- used_strings = g_slist_prepend (used_strings, mime_types[n]);
+ g_ptr_array_add (used_strings, mime_types[n]);
for (u = 0; uri_schemes[u] != NULL; ++u)
{
@@ -531,7 +534,7 @@ tumbler_registry_update_supported (TumblerRegistry
*registry)
* without copying. Only remember it once (n==0) to avoid
segmentation
* faults when freeing the list */
if (n == 0)
-used_strings = g_slist_prepend (used_strings, uri_schemes[u]);
+g_ptr_array_add (used_strings, uri_schemes[u]);
/* allocate a pair with the current URI scheme and MIME type */
pair = g_slice_alloc (2 * sizeof (const gchar *));
@@ -593,8 +596,8 @@ tumbler_registry_update_supported (TumblerRegistry
*registry)
g_hash_table_unref (unique_pairs);
/* free all strings we used but haven't freed yet */
- g_slist_foreach (used_strings, (GFunc) g_free, NULL);
- g_slist_free (used_strings);
+ g_ptr_array_foreach (used_strings, (GFunc) g_free, NULL);
+ g_ptr_array_free (used_strings, TRUE);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Don't use GString for a simple concat.
Updating branch refs/heads/master to 0093f278c4dfe45e404ae502aa0e3c817f7a38fc (commit) from 89b2e5ddd1467cf5ed62c7d1e376ef07109c9f92 (commit) commit 0093f278c4dfe45e404ae502aa0e3c817f7a38fc Author: Nick Schermer n...@xfce.org Date: Fri Dec 7 23:38:41 2012 +0100 Don't use GString for a simple concat. tumblerd/tumbler-registry.c | 11 +++ 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c index fc4a513..5f8c8ab 100644 --- a/tumblerd/tumbler-registry.c +++ b/tumblerd/tumbler-registry.c @@ -473,7 +473,7 @@ tumbler_registry_update_supported (TumblerRegistry *registry) GList *thumbnailers; GList *lp; const gchar **pair; - GString *pair_string; + gchar *pair_string; gchar**mime_types; gchar**uri_schemes; gint n; @@ -541,15 +541,10 @@ tumbler_registry_update_supported (TumblerRegistry *registry) pair[1] = mime_types[n]; /* combine the two to a unique pair identifier */ - pair_string = g_string_new (pair[0]); - g_string_append_c (pair_string, '-'); - g_string_append (pair_string, pair[1]); + pair_string = g_strdup_printf (%s-%s, pair[0], pair[1]); /* remember the pair in the hash table */ - g_hash_table_insert (unique_pairs, pair_string-str, pair); - - /* free the pair string */ - g_string_free (pair_string, FALSE); + g_hash_table_insert (unique_pairs, pair_string, pair); } } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Drop unneeded vfs schemes.
Updating branch refs/heads/master
to 4255750cb05bea0e01115fd2a5f91cdff3b1d829 (commit)
from 2165c4239697a905fdd3e46037baa977c05e4fb1 (commit)
commit 4255750cb05bea0e01115fd2a5f91cdff3b1d829
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 8 00:17:15 2012 +0100
Drop unneeded vfs schemes.
Skip schemes that cannot be used to generate thumbs. This
removes a load of combinations in the various tables.
tumbler/tumbler-util.c | 46 ++
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/tumbler/tumbler-util.c b/tumbler/tumbler-util.c
index cba4e7a..b601364 100644
--- a/tumbler/tumbler-util.c
+++ b/tumbler/tumbler-util.c
@@ -22,6 +22,10 @@
#include config.h
#endif
+#ifdef HAVE_STRING_H
+#include string.h
+#endif
+
#include glib.h
#include gio/gio.h
@@ -34,36 +38,38 @@ tumbler_util_get_supported_uri_schemes (void)
{
const gchar *const *vfs_schemes;
gchar **uri_schemes;
- gbooleanfile_scheme_found = FALSE;
guint length;
- guint n;
+ guint n = 0;
+ guint i;
GVfs *vfs;
/* determine the URI schemes supported by GIO */
vfs = g_vfs_get_default ();
vfs_schemes = g_vfs_get_supported_uri_schemes (vfs);
- /* search for the file scheme */
- for (n = 0; !file_scheme_found vfs_schemes[n] != NULL; ++n)
-if (g_strcmp0 (vfs_schemes[n], file) == 0)
- file_scheme_found = TRUE;
-
- /* check if the file scheme is included */
- if (file_scheme_found)
-{
- /* it is, so simply copy the array */
- uri_schemes = g_strdupv ((gchar **)vfs_schemes);
-}
+ if (G_LIKELY (vfs_schemes != NULL))
+length = g_strv_length ((gchar **) vfs_schemes);
else
+length = 0;
+
+ /* always start with file */
+ uri_schemes = g_new0 (gchar *, length + 2);
+ uri_schemes[n++] = g_strdup (file);
+
+ if (G_LIKELY (vfs_schemes != NULL))
{
- /* it is not, so we need to copy the array and add file */
- length = g_strv_length ((gchar **)vfs_schemes);
- uri_schemes = g_new0 (gchar *, length + 2);
- uri_schemes[0] = g_strdup (file);
- for (n = 1; n = length; ++n)
-uri_schemes[n] = g_strdup (vfs_schemes[n-1]);
- uri_schemes[n] = NULL;
+ for (i = 0; vfs_schemes[i] != NULL; ++i)
+{
+ /* skip unneeded schemes */
+ if (strcmp (file, vfs_schemes[i]) != 0
+ strcmp (computer, vfs_schemes[i]) != 0
+ strcmp (localtest, vfs_schemes[i]) != 0
+ strcmp (network, vfs_schemes[i]) != 0)
+uri_schemes[n++] = g_strdup (vfs_schemes[i]);
+}
}
+ uri_schemes[n++] = NULL;
+
return uri_schemes;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
Updating branch refs/heads/master to cc033fec09b0aa8de0335ed64b85023d4fccf4be (commit) from 64b3d9073e287e26a78eefaba5a538dfb59a1d56 (commit) commit cc033fec09b0aa8de0335ed64b85023d4fccf4be Author: Rafael Ferreira rafael.f...@gmail.com Date: Sat Dec 8 02:02:52 2012 +0100 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% New status: 212 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt_BR.po | 198 -- 1 files changed, 123 insertions(+), 75 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 9420084..a377364 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,14 +8,15 @@ msgid msgstr Project-Id-Version: parole 0.2.0.6\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-04 06:57+\n +POT-Creation-Date: 2012-12-07 20:33+\n PO-Revision-Date: \n Last-Translator: Rafael Ferreira rafael.f...@gmail.com\n -Language-Team: Brazilian Portuguese\n +Language-Team: Brazilian Portuguese xfce-i18n...@xfce.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=2; plural=(n != 1);\n +Plural-Forms: nplurals=2; plural=(n 1);\n +Language: pt_BR\n #: ../data/interfaces/parole.ui.h:1 msgid 16:9 (Widescreen) @@ -30,16 +31,24 @@ msgid 4:3 (TV) msgstr 4:3 (TV) #: ../data/interfaces/parole.ui.h:4 -msgid bbigSong Title/big/b -msgstr bbigTítulo da música/big/b +msgid +bigspan color='#BB'iby/i/span span color='#F4F4F4'Unknown +Artist/span/big +msgstr +bigspan color='#BB'iby/i/span span color='#F4F4F4'Artista +desconhecido/span/big #: ../data/interfaces/parole.ui.h:5 -msgid bigby Song Artist/big -msgstr bigMúsica por Artista/big +msgid +bigspan color='#BB'ion/i/span span color='#F4F4F4'Unknown +Album/span/big +msgstr +bigspan color='#BB'ion/i/span span color='#F4F4F4'Álbum +desconhecido/span/big #: ../data/interfaces/parole.ui.h:6 -msgid bigon Song Album (2012)/big -msgstr bigno Álbum (2012)/big +msgid span color='#F4F4F4'bbigUnknown Song/big/b/span +msgstr span color='#F4F4F4'bbigMúsica desconhecida/big/b/span #: ../data/interfaces/parole.ui.h:7 ../src/misc/parole-filters.c:64 msgid Audio @@ -58,12 +67,12 @@ msgstr Auto msgid Buffering (0%) msgstr Carregando em buffer (0%) -#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:690 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:707 msgid Empty msgstr Vazio -#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:147 -#: ../src/parole-disc.c:465 +#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:111 +#: ../src/parole-disc.c:157 msgid Insert Disc msgstr Insira disco @@ -164,30 +173,54 @@ msgid _Open msgstr _Abrir #: ../data/interfaces/playlist.ui.h:1 +msgid Angle Menu +msgstr Menu de ângulo + +#: ../data/interfaces/playlist.ui.h:2 +msgid Audio Menu +msgstr Menu de Áudio + +#: ../data/interfaces/playlist.ui.h:3 +msgid Chapter Menu +msgstr Menu de capítulos + +#: ../data/interfaces/playlist.ui.h:4 msgid Clear msgstr Apagar -#: ../data/interfaces/playlist.ui.h:2 +#: ../data/interfaces/playlist.ui.h:5 +msgid DVD Menu +msgstr Menu de DVD + +#: ../data/interfaces/playlist.ui.h:6 +msgid DVD Name +msgstr Nome do DVD + +#: ../data/interfaces/playlist.ui.h:7 msgid Play opened files msgstr Reproduzir os arquivos abertos -#: ../data/interfaces/playlist.ui.h:3 +#: ../data/interfaces/playlist.ui.h:8 #: ../data/interfaces/parole-settings.ui.h:17 msgid Remember playlist msgstr Lembrar lista de reprodução -#: ../data/interfaces/playlist.ui.h:4 +#: ../data/interfaces/playlist.ui.h:9 msgid Repeat msgstr Repetir -#: ../data/interfaces/playlist.ui.h:5 +#: ../data/interfaces/playlist.ui.h:10 msgid Replace playlist when opening files msgstr Substituir a lista de reprodução quando abrir arquivos -#: ../data/interfaces/playlist.ui.h:6 +#: ../data/interfaces/playlist.ui.h:11 msgid Shuffle msgstr Embaralhar +#: ../data/interfaces/playlist.ui.h:12 +msgid Title Menu +msgstr Título do menu + #: ../data/interfaces/plugins.ui.h:1 msgid bAuthor/b msgstr bAutor/b @@ -321,12 +354,16 @@ msgid Select File Types (By Extension) msgstr Selecione os tipos de arquivo (por extensão) #: ../data/interfaces/open-location.ui.h:1 -msgid Open Location -msgstr Abrir localização +msgid bigbOpen Network Location/b/big +msgstr bigbAbrir localização da rede/b/big -#: ../data/interfaces/open-location.ui.h:2 -msgid Please enter a network URL: -msgstr Por favor entre com uma URL: +#: ../data/interfaces/open-location.ui.h:2 ../src/parole-open-location.c:192 +msgid Clear History +msgstr Limpar histórico + +#: ../data/interfaces/open-location.ui.h:3 +msgid Open Network Location +msgstr Abrir localização da rede #: ../data/desktop/parole.desktop.in.in.h:1 msgid Parole @@ -340,46 +377,55 @@ msgstr Mensagem msgid Error msgstr Erro -#:
[Xfce4-commits] thunar:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 834ed0c407016c2760d9f7cad12f6f8343f0964f (commit) from b0d722672269b3a9315b9a79badad5158aae9164 (commit) commit 834ed0c407016c2760d9f7cad12f6f8343f0964f Author: Sergio Marques smarque...@gmail.com Date: Sat Dec 8 02:13:17 2012 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 736 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 362 +++--- 1 files changed, 179 insertions(+), 183 deletions(-) diff --git a/po/pt.po b/po/pt.po index ee8d160..2f1112e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,19 +2,19 @@ # Copyright (C) 2004-2007 Benedikt Meurer. # This file is distributed under the same license as the thunar package. # Nuno Miguel nunom...@gmail.com, 2007-2012. -# +# msgid msgstr Project-Id-Version: Thunar\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-05 19:56+0100\n +POT-Creation-Date: 2012-12-07 21:03+\n PO-Revision-Date: 2012-11-02 02:14+0100\n Last-Translator: Sérgio Marques smarque...@gmail.com\n Language-Team: \n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Poedit-Language: Portuguese\n X-Poedit-Country: PORTUGAL\n @@ -138,8 +138,8 @@ msgstr Ocorreu um erro ao iniciar a operação #: ../thunar/thunar-application.c:1113 ../thunar/thunar-application.c:1239 #: ../thunar/thunar-launcher.c:1208 ../thunar/thunar-location-entry.c:402 #: ../thunar/thunar-location-entry.c:430 -#: ../thunar/thunar-shortcuts-view.c:1614 -#: ../thunar/thunar-shortcuts-view.c:1642 ../thunar/thunar-window.c:2171 +#: ../thunar/thunar-shortcuts-view.c:1621 +#: ../thunar/thunar-shortcuts-view.c:1649 ../thunar/thunar-window.c:2219 #, c-format msgid Failed to open \%s\ msgstr Ocorreu um erro ao abrir \%s\ @@ -152,20 +152,20 @@ msgstr Ocorreu um erro ao abrir \%s\: %s #. display an error message #: ../thunar/thunar-application.c:1307 #: ../thunar/thunar-properties-dialog.c:671 -#: ../thunar/thunar-standard-view.c:2712 ../thunar/thunar-tree-view.c:1753 +#: ../thunar/thunar-standard-view.c:2712 ../thunar/thunar-tree-view.c:1751 #, c-format msgid Failed to rename \%s\ msgstr Ocorreu um erro ao renomear \%s\ #: ../thunar/thunar-application.c:1409 #: ../thunar/thunar-location-buttons.c:1285 -#: ../thunar/thunar-standard-view.c:2277 ../thunar/thunar-tree-view.c:1615 +#: ../thunar/thunar-standard-view.c:2277 ../thunar/thunar-tree-view.c:1613 msgid New Folder msgstr Nova pasta #: ../thunar/thunar-application.c:1410 #: ../thunar/thunar-location-buttons.c:1286 -#: ../thunar/thunar-standard-view.c:2278 ../thunar/thunar-tree-view.c:1616 +#: ../thunar/thunar-standard-view.c:2278 ../thunar/thunar-tree-view.c:1614 msgid Create New Folder msgstr Criar nova pasta @@ -253,8 +253,8 @@ msgstr Remover todos os ficheiros e pastas no lixo? #. append the Empty Trash menu action #. prepare the menu item #: ../thunar/thunar-application.c:1953 ../thunar/thunar-location-buttons.c:171 -#: ../thunar/thunar-shortcuts-view.c:1174 ../thunar/thunar-tree-view.c:1176 -#: ../thunar/thunar-window.c:339 ../plugins/thunar-tpa/thunar-tpa.c:189 +#: ../thunar/thunar-shortcuts-view.c:1181 ../thunar/thunar-tree-view.c:1174 +#: ../thunar/thunar-window.c:344 ../plugins/thunar-tpa/thunar-tpa.c:189 msgid _Empty Trash msgstr _Esvaziar lixo @@ -699,9 +699,8 @@ msgstr Deseja substituir a pasta existente msgid ReplaceDialogPart1|Do you want to replace the existing file msgstr Deseja substituir o ficheiro existente -#. #. Fourth box (size, volume, free space) -#. +#. #: ../thunar/thunar-dialogs.c:618 ../thunar/thunar-dialogs.c:649 #: ../thunar/thunar-properties-dialog.c:456 msgid Size: @@ -799,9 +798,8 @@ msgstr Nome msgid Owner msgstr Dono -#. #. Permissions chooser -#. +#. #: ../thunar/thunar-enum-types.c:98 ../thunar/thunar-properties-dialog.c:528 msgid Permissions msgstr Permissões @@ -823,7 +821,7 @@ msgid File Name msgstr Nome do ficheiro #: ../thunar/thunar-file.c:916 ../thunar/thunar-gio-extensions.c:236 -#: ../thunar/thunar-shortcuts-model.c:839 ../thunar/thunar-window.c:357 +#: ../thunar/thunar-shortcuts-model.c:900 ../thunar/thunar-window.c:362 msgid File System msgstr Sistema de ficheiros @@ -1043,19 +1041,19 @@ msgstr #. append the Open menu action #: ../thunar/thunar-launcher.c:176 ../thunar/thunar-launcher.c:818 #: ../thunar/thunar-location-buttons.c:168 -#: ../thunar/thunar-shortcuts-view.c:1077 ../thunar/thunar-tree-view.c:1106 +#: ../thunar/thunar-shortcuts-view.c:1084 ../thunar/thunar-tree-view.c:1104 msgid _Open msgstr A_brir #. append the Open in New Tab menu action #: ../thunar/thunar-launcher.c:177 ../thunar/thunar-launcher.c:858 -#: ../thunar/thunar-tree-view.c:1117 +#: ../thunar/thunar-tree-view.c:1115 msgid Open in New _Tab
[Xfce4-commits] parole:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 77caf1d8e9b221db2d67eaf425e1c7434cc73cea (commit) from cc033fec09b0aa8de0335ed64b85023d4fccf4be (commit) commit 77caf1d8e9b221db2d67eaf425e1c7434cc73cea Author: Sergio Marques smarque...@gmail.com Date: Sat Dec 8 02:18:28 2012 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 212 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 192 +++--- 1 files changed, 121 insertions(+), 71 deletions(-) diff --git a/po/pt.po b/po/pt.po index 8ecfdf3..4b6f3d5 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid msgstr Project-Id-Version: parole 2.0.1\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-02 17:30+\n +POT-Creation-Date: 2012-12-07 20:33+\n PO-Revision-Date: \n Last-Translator: Nuno Miguel nunom...@gmail.com\n Language-Team: Portuguese\n @@ -31,16 +31,20 @@ msgid 4:3 (TV) msgstr 4:3 (TV) #: ../data/interfaces/parole.ui.h:4 -msgid bbigSong Title/big/b -msgstr bbigTítulo da faixa/big/b +msgid +bigspan color='#BB'iby/i/span span color='#F4F4F4'Unknown +Artist/span/big +msgstr bigspan color='#BB'ide/i/span span color='#F4F4F4'artista desconhecido/span/big #: ../data/interfaces/parole.ui.h:5 -msgid bigby Song Artist/big -msgstr bigpor artista da faixa/big +msgid +bigspan color='#BB'ion/i/span span color='#F4F4F4'Unknown +Album/span/big +msgstr bigspan color='#BB'iem/i/span span color='#F4F4F4'álbum desconhecido/span/big #: ../data/interfaces/parole.ui.h:6 -msgid bigon Song Album (2012)/big -msgstr bigno álbum (2012)/big +msgid span color='#F4F4F4'bbigUnknown Song/big/b/span +msgstr span color='#F4F4F4'bbigFaixa desconhecida/big/b/span #: ../data/interfaces/parole.ui.h:7 ../src/misc/parole-filters.c:64 msgid Audio @@ -59,12 +63,12 @@ msgstr Automático msgid Buffering (0%) msgstr A processar (0%)) -#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:688 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:707 msgid Empty msgstr Vazio -#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:147 -#: ../src/parole-disc.c:465 +#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:111 +#: ../src/parole-disc.c:157 msgid Insert Disc msgstr Insira o disco @@ -165,30 +169,54 @@ msgid _Open msgstr _Abrir #: ../data/interfaces/playlist.ui.h:1 +msgid Angle Menu +msgstr Menu ângulo + +#: ../data/interfaces/playlist.ui.h:2 +msgid Audio Menu +msgstr Menu áudio + +#: ../data/interfaces/playlist.ui.h:3 +msgid Chapter Menu +msgstr Menu de capítulos + +#: ../data/interfaces/playlist.ui.h:4 msgid Clear msgstr Limpar -#: ../data/interfaces/playlist.ui.h:2 +#: ../data/interfaces/playlist.ui.h:5 +msgid DVD Menu +msgstr Menu de DVD + +#: ../data/interfaces/playlist.ui.h:6 +msgid DVD Name +msgstr Nome do DVD + +#: ../data/interfaces/playlist.ui.h:7 msgid Play opened files msgstr Reproduzir ficheiros abertos -#: ../data/interfaces/playlist.ui.h:3 +#: ../data/interfaces/playlist.ui.h:8 #: ../data/interfaces/parole-settings.ui.h:17 msgid Remember playlist msgstr Lembrar lista de reprodução -#: ../data/interfaces/playlist.ui.h:4 +#: ../data/interfaces/playlist.ui.h:9 msgid Repeat msgstr _Repetir -#: ../data/interfaces/playlist.ui.h:5 +#: ../data/interfaces/playlist.ui.h:10 msgid Replace playlist when opening files msgstr Substituir lista de reprodução ao abrir ficheiros -#: ../data/interfaces/playlist.ui.h:6 +#: ../data/interfaces/playlist.ui.h:11 msgid Shuffle msgstr _Baralhar +#: ../data/interfaces/playlist.ui.h:12 +msgid Title Menu +msgstr Menu de título + #: ../data/interfaces/plugins.ui.h:1 msgid bAuthor/b msgstr bAutor/b @@ -322,12 +350,16 @@ msgid Select File Types (By Extension) msgstr Selecione os tipos de ficheiro (por extensão) #: ../data/interfaces/open-location.ui.h:1 -msgid Open Location -msgstr Abrir localização +msgid bigbOpen Network Location/b/big +msgstr bigbAbrir localização/b/big -#: ../data/interfaces/open-location.ui.h:2 -msgid Please enter a network URL: -msgstr Por favor indique o URL: +#: ../data/interfaces/open-location.ui.h:2 ../src/parole-open-location.c:192 +msgid Clear History +msgstr Limpar histórico + +#: ../data/interfaces/open-location.ui.h:3 +msgid Open Network Location +msgstr Abrir localização #: ../data/desktop/parole.desktop.in.in.h:1 msgid Parole @@ -341,46 +373,55 @@ msgstr Mensagem msgid Error msgstr Erro -#: ../src/gst/parole-gst.c:1339 +#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:344 +#, c-format +msgid Track %i +msgstr Faixa %i + +#: ../src/gst/parole-gst.c:1242 +msgid Audio CD +msgstr CD áudio + +#: ../src/gst/parole-gst.c:1442 msgid Additional software is required. msgstr Requer programas adicionais -#: ../src/gst/parole-gst.c:1343 +#: ../src/gst/parole-gst.c:1446 msgid Don't Install msgstr Não instalar -#:
[Xfce4-commits] midori:master Support Midori.Test.idle_timeouts for non-second timeouts
Updating branch refs/heads/master
to 77b28d2af643daa48d4ed430cd0daca5b21fa267 (commit)
from 069f40165631be20f26a0abdbf1371e68e01a491 (commit)
commit 77b28d2af643daa48d4ed430cd0daca5b21fa267
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Dec 8 02:11:15 2012 +0100
Support Midori.Test.idle_timeouts for non-second timeouts
extensions/delayed-load.vala |4 ++--
extensions/formhistory/formhistory-gdom-frontend.c |4 ++--
katze/katze-scrolled.c |4 +++-
katze/katze-throbber.c |8 +++-
midori/midori-browser.c|7 ---
midori/midori-dialog.vala |5 +
panels/midori-bookmarks.c |4 ++--
panels/midori-history.c|4 ++--
8 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/extensions/delayed-load.vala b/extensions/delayed-load.vala
index 2cc2b31..1ff2803 100644
--- a/extensions/delayed-load.vala
+++ b/extensions/delayed-load.vala
@@ -126,7 +126,7 @@ namespace DelayedLoad {
unowned TabShaker shaker = tasks.get (browser);
if (shaker != null) {
shaker.tasks.add (view);
-Timeout.add (this.timeout, shaker.reload_tab);
+Midori.Timeout.add (this.timeout, shaker.reload_tab);
}
}
}
@@ -189,7 +189,7 @@ namespace DelayedLoad {
Midori.Browser? focused_browser = app.browser;
if (focused_browser == null)
-Timeout.add (50, this.reload_first_tab);
+Midori.Timeout.add (50, this.reload_first_tab);
foreach (Midori.Browser browser in app.get_browsers ()) {
browser_added (browser);
diff --git a/extensions/formhistory/formhistory-gdom-frontend.c
b/extensions/formhistory/formhistory-gdom-frontend.c
index b601f35..3d1d05e 100644
--- a/extensions/formhistory/formhistory-gdom-frontend.c
+++ b/extensions/formhistory/formhistory-gdom-frontend.c
@@ -365,8 +365,8 @@ formhistory_editbox_key_pressed_cb (WebKitDOMElement*
element,
if (gtk_widget_get_visible (priv-popup)
!g_strcmp0 (keyword, priv-oldkeyword))
goto free_data;
-priv-completion_timeout = g_timeout_add (COMPLETION_DELAY,
- (GSourceFunc)formhistory_suggestions_show,
priv);
+priv-completion_timeout = midori_timeout_add (COMPLETION_DELAY,
+(GSourceFunc)formhistory_suggestions_show, priv, NULL);
free_data:
g_free (keyword);
}
diff --git a/katze/katze-scrolled.c b/katze/katze-scrolled.c
index 582142a..0b2d7da 100644
--- a/katze/katze-scrolled.c
+++ b/katze/katze-scrolled.c
@@ -17,6 +17,7 @@
#include katze-scrolled.h
#include katze-utils.h
+#include midori/midori-core.h
#define DEFAULT_INTERVAL 50
#define DEFAULT_DECELERATION 0.7
@@ -531,7 +532,8 @@ button_release_event (GtkWidget* widget,
priv-horizontal_deceleration = priv-deceleration;
priv-vertical_deceleration = priv-deceleration * ABS
(priv-vertical_speed / priv-horizontal_speed);
}
-priv-scrolling_timeout_id = g_timeout_add (priv-interval,
timeout_scroll, scrolled);
+priv-scrolling_timeout_id = midori_timeout_add (priv-interval,
+timeout_scroll, scrolled, NULL);
do_timeout_scroll (scrolled);
}
diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c
index 85c206f..0f9f616 100644
--- a/katze/katze-throbber.c
+++ b/katze/katze-throbber.c
@@ -490,11 +490,9 @@ katze_throbber_set_animated (KatzeThrobber* throbber,
g_object_set (throbber, active, animated, NULL);
#else
if (animated (throbber-timer_id 0))
-throbber-timer_id = g_timeout_add_full (
- G_PRIORITY_LOW, 50,
- (GSourceFunc)katze_throbber_timeout,
- throbber,
- (GDestroyNotify)katze_throbber_timeout_destroy);
+throbber-timer_id = midori_timeout_add (50,
+(GSourceFunc)katze_throbber_timeout, throbber,
+(GDestroyNotify)katze_throbber_timeout_destroy);
#endif
gtk_widget_queue_draw (GTK_WIDGET (throbber));
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index df60c75..0d5ff7a 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1195,7 +1195,8 @@ midori_browser_notify_new_tab (MidoriBrowser* browser)
#ifndef G_OS_WIN32
gtk_window_set_opacity (GTK_WINDOW (browser), 0.8);
#endif
-g_timeout_add (100, (GSourceFunc)
midori_browser_notify_new_tab_timeout_cb, browser);
+midori_timeout_add (100,
+(GSourceFunc) midori_browser_notify_new_tab_timeout_cb, browser,
NULL);
}
}
@@ -4768,7 +4769,7 @@ midori_panel_notify_position_cb (GObject* hpaned,
[Xfce4-commits] midori:master Add beginnings of download properties test case
Updating branch refs/heads/master
to be110e367809ba546d633b468933d105fb693a66 (commit)
from 77b28d2af643daa48d4ed430cd0daca5b21fa267 (commit)
commit be110e367809ba546d633b468933d105fb693a66
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Dec 8 02:12:50 2012 +0100
Add beginnings of download properties test case
tests/download.vala | 55 --
1 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/tests/download.vala b/tests/download.vala
index 6262772..81e23a4 100644
--- a/tests/download.vala
+++ b/tests/download.vala
@@ -44,18 +44,23 @@ static void download_unique () {
string org_filename = Path.build_path (Path.DIR_SEPARATOR_S, folder,
foo.png);
string unique = Midori.Download.get_unique_filename (org_filename);
Katze.assert_str_equal (folder, unique, filename);
-FileUtils.set_contents (filename, 12345);
-unique = Midori.Download.get_unique_filename (org_filename);
-filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, foo-0.png);
-Katze.assert_str_equal (folder, unique, filename);
-FileUtils.set_contents (filename, 12345);
-unique = Midori.Download.get_unique_filename (org_filename);
-filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, foo-1.png);
-Katze.assert_str_equal (folder, unique, filename);
-
-for (var i = 0; i 10; i++) {
-filename = Path.build_path (Path.DIR_SEPARATOR_S, folder,
foo-%d.png.printf (i));
+try {
+FileUtils.set_contents (filename, 12345);
+unique = Midori.Download.get_unique_filename (org_filename);
+filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, foo-0.png);
+Katze.assert_str_equal (folder, unique, filename);
FileUtils.set_contents (filename, 12345);
+unique = Midori.Download.get_unique_filename (org_filename);
+filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, foo-1.png);
+Katze.assert_str_equal (folder, unique, filename);
+
+for (var i = 0; i 10; i++) {
+filename = Path.build_path (Path.DIR_SEPARATOR_S, folder,
foo-%d.png.printf (i));
+FileUtils.set_contents (filename, 12345);
+}
+}
+catch (Error error) {
+GLib.error (error.message);
}
unique = Midori.Download.get_unique_filename (org_filename);
filename = Path.build_path (Path.DIR_SEPARATOR_S, folder, foo-10.png);
@@ -63,6 +68,33 @@ static void download_unique () {
DirUtils.remove (folder);
}
+void download_properties () {
+var download = new WebKit.Download (new WebKit.NetworkRequest
(file:///klaatu/barada/nikto.ogg));
+assert (Midori.Download.get_type (download) == 0);
+Midori.Download.set_type (download, Midori.DownloadType.OPEN);
+assert (Midori.Download.get_type (download) == Midori.DownloadType.OPEN);
+assert (Midori.Download.get_progress (download) == 0.0);
+/* FIXME: Hangs in GTK+2, runs in GTK+3
+try {
+string filename;
+FileUtils.close (FileUtils.open_tmp (XX, out filename));
+download.destination_uri = Filename.to_uri (filename, null);
+string tee = Midori.Download.get_tooltip (download);
+download.start ();
+assert (Midori.Download.get_progress (download) == 0.0);
+var loop = MainContext.default ();
+do { loop.iteration (true); } while (loop.pending ());
+string tee2 = Midori.Download.get_tooltip (download);
+assert (tee2.contains (tee));
+do { loop.iteration (true); } while (!Midori.Download.is_finished
(download));
+assert (download.status == WebKit.DownloadStatus.ERROR);
+}
+catch (Error error) {
+GLib.error (error.message);
+}
+*/
+}
+
void main (string[] args) {
Test.init (ref args);
Midori.App.setup (ref args, null);
@@ -70,6 +102,7 @@ void main (string[] args) {
Test.add_func (/download/suggestion, download_suggestion);
Test.add_func (/download/extension, download_extension);
Test.add_func (/download/unique, download_unique);
+Test.add_func (/download/properties, download_properties);
Test.run ();
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Show found package versions in build configuration
Updating branch refs/heads/master
to 522dbd2ad327b54f1008f26f0d1b3afad71a2207 (commit)
from be110e367809ba546d633b468933d105fb693a66 (commit)
commit 522dbd2ad327b54f1008f26f0d1b3afad71a2207
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Dec 8 02:13:17 2012 +0100
Show found package versions in build configuration
wscript |9 +++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/wscript b/wscript
index 15d60df..1fd254b 100644
--- a/wscript
+++ b/wscript
@@ -186,10 +186,15 @@ def configure (conf):
def check_pkg (name, version='', mandatory=True, var=None, args=''):
if not var:
var = name.split ('-')[0].upper ()
-conf.check_cfg (package=name, uselib_store=var, args='--cflags --libs
' + args,
+ver_str = ['',' = ' + version][version != '']
+def okmsg_ver (kw):
+return conf.check_cfg (modversion=name, uselibstore=var)
+conf.check_cfg (msg='Checking for ' + name + ver_str, okmsg=okmsg_ver,
+package=name, uselib_store=var, args='--cflags --libs ' + args,
atleast_version=version, mandatory=mandatory)
have = conf.env['HAVE_' + var] == 1
-conf.define (var + '_VERSION', ['No', conf.check_cfg (modversion=name,
uselib_store=var)][have])
+conf.define (var + '_VERSION', ['No', conf.check_cfg (modversion=name,
+uselib_store=var, errmsg=name + ver_str + ' not found')][have])
return have
if option_enabled ('gtk3'):
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Unset locale during tests to avoid i18n-related false failures
Updating branch refs/heads/master to 9028f5c1a399fc4adf9ace0ee0f8209e343f4352 (commit) from 522dbd2ad327b54f1008f26f0d1b3afad71a2207 (commit) commit 9028f5c1a399fc4adf9ace0ee0f8209e343f4352 Author: Christian Dywan christ...@twotoasts.de Date: Sat Dec 8 02:13:46 2012 +0100 Unset locale during tests to avoid i18n-related false failures wscript |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/wscript b/wscript index 1fd254b..dee3705 100644 --- a/wscript +++ b/wscript @@ -576,6 +576,8 @@ def shutdown (): for x in ['XDG_CONFIG_HOME', 'XDG_CACHE_HOME', 'XDG_DATA_HOME', 'TMPDIR']: os.environ[x] = (base % x).lower () Utils.check_dir (os.environ[x]) +# Avoid i18n-related false failures +os.environ['LC_ALL'] = 'C' test = UnitTest.unit_test () if True: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Prepare for testing extensions in normal app session
Updating branch refs/heads/master
to c68a42bb658199a48710b5f276a409bfd5e756e5 (commit)
from 9028f5c1a399fc4adf9ace0ee0f8209e343f4352 (commit)
commit c68a42bb658199a48710b5f276a409bfd5e756e5
Author: Christian Dywan christ...@twotoasts.de
Date: Sat Dec 8 03:30:01 2012 +0100
Prepare for testing extensions in normal app session
midori/midori-extension.c | 32
midori/midori-extension.h |5 +
midori/midori-frontend.c|2 +-
midori/midori-preferences.c | 16 +---
midori/midori-session.c | 14 +-
midori/midori.vapi |2 ++
tests/app.vala | 18 ++
7 files changed, 60 insertions(+), 29 deletions(-)
diff --git a/midori/midori-extension.c b/midori/midori-extension.c
index 6f1d156..0e530b6 100644
--- a/midori/midori-extension.c
+++ b/midori/midori-extension.c
@@ -537,6 +537,38 @@ midori_extension_get_property (GObject*object,
}
}
+void
+midori_extension_load_from_folder (MidoriApp* app,
+ gchar**keys,
+ gboolean activate)
+{
+if (!g_module_supported ())
+return;
+
+gchar* extension_path = midori_paths_get_lib_path (PACKAGE_NAME);
+if (!extension_path)
+return;
+
+if (keys)
+{
+gint i = 0;
+const gchar* filename;
+while ((filename = keys[i++]))
+midori_extension_activate_gracefully (app, extension_path,
filename, activate);
+}
+else
+{
+GDir* extension_dir = g_dir_open (extension_path, 0, NULL);
+g_return_if_fail (extension_dir != NULL);
+const gchar* filename;
+while ((filename = g_dir_read_name (extension_dir)))
+midori_extension_activate_gracefully (app, extension_path,
filename, activate);
+g_dir_close (extension_dir);
+}
+
+g_free (extension_path);
+}
+
GObject*
midori_extension_load_from_file (const gchar* extension_path,
const gchar* filename,
diff --git a/midori/midori-extension.h b/midori/midori-extension.h
index 02d0a4f..5a98202 100644
--- a/midori/midori-extension.h
+++ b/midori/midori-extension.h
@@ -146,6 +146,11 @@ midori_extension_set_string_list (MidoriExtension*
extension,
gchar** value,
gsizelength);
+void
+midori_extension_load_from_folder(MidoriApp* app,
+ gchar** keys,
+ gboolean activate);
+
G_END_DECLS
#endif /* __MIDORI_EXTENSION_H__ */
diff --git a/midori/midori-frontend.c b/midori/midori-frontend.c
index 142619d..0ad7ea3 100644
--- a/midori/midori-frontend.c
+++ b/midori/midori-frontend.c
@@ -83,7 +83,7 @@ midori_web_app_new (const gchar* config,
g_free (tmp_uri);
}
else if (open_uris == NULL)
-midori_browser_add_uri (browser, about:private);
+midori_browser_add_uri (browser, about:blank);
g_signal_connect (browser, quit, G_CALLBACK (gtk_main_quit), NULL);
g_signal_connect (browser, destroy, G_CALLBACK (gtk_main_quit), NULL);
diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 3975c86..9c1db8d 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -583,23 +583,9 @@ midori_preferences_add_extension_category
(KatzePreferences* preferences,
GList* children;
GtkWidget* page;
-if (!g_module_supported ())
-return;
-
array = katze_object_get_object (app, extensions);
-if ((extension_path = midori_paths_get_lib_path (PACKAGE_NAME)))
-{
-GDir* extension_dir = NULL;
-if ((extension_dir = g_dir_open (extension_path, 0, NULL)))
-{
-const gchar* filename;
-while ((filename = g_dir_read_name (extension_dir)))
-midori_extension_activate_gracefully (app, extension_path,
filename, FALSE);
-g_dir_close (extension_dir);
-}
-g_free (extension_path);
-}
+midori_extension_load_from_folder (app, NULL, FALSE);
/* Reset frozen list: allow active extensions to be saved */
g_object_set_data (G_OBJECT (app), extensions, NULL);
diff --git a/midori/midori-session.c b/midori/midori-session.c
index 17b5166..4042106 100644
--- a/midori/midori-session.c
+++ b/midori/midori-session.c
@@ -327,19 +327,7 @@ midori_load_extensions (gpointer data)
extensions = katze_array_new (MIDORI_TYPE_EXTENSION);
g_signal_connect (extensions, update, G_CALLBACK (extensions_update_cb),
app);
g_object_set (app, extensions, extensions, NULL);
-
-if (g_module_supported ())
-{
-gchar* extension_path;
-if (keys (extension_path = midori_paths_get_lib_path
(PACKAGE_NAME)))
-{
-gint i = 0;
-const gchar* filename;
-
