date:20100117

[Xfce4-commits] www:master Fix the link to the Fedora Xfce Spin.

2010-01-17 Thread Jérôme Guelfucci

Updating branch refs/heads/master
 to dd4935f0dcd6bdc150fbe21538e21be74945343a (commit)
   from 3ea89c6782a51b1f714daf0ef33d0eedcee4c2e2 (commit)

commit dd4935f0dcd6bdc150fbe21538e21be74945343a
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Sun Jan 17 10:48:30 2010 +0100

Fix the link to the Fedora Xfce Spin.

 i18n/download/distros.en.php |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/i18n/download/distros.en.php b/i18n/download/distros.en.php
index 60ca486..dcb1640 100644
--- a/i18n/download/distros.en.php
+++ b/i18n/download/distros.en.php
@@ -1,7 +1,7 @@
 h2Distributions based on Xfce/h2
 
 h3 class=dev style=background-image: 
url(/images/download/distros/fedora.png);
-a href=http://spins.fedoraproject.org/xfce/;Fedora Xfce Spin/a
+a href=http://spins.fedoraproject.org/xfce/;Fedora Xfce Spin/a
 /h3
 
 p
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] www:master Fix the size of the Slackware icon.

2010-01-17 Thread Jérôme Guelfucci

Updating branch refs/heads/master
 to 03504acbe259de56e16c54df68b87094cccac7e5 (commit)
   from dd4935f0dcd6bdc150fbe21538e21be74945343a (commit)

commit 03504acbe259de56e16c54df68b87094cccac7e5
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Sun Jan 17 11:02:32 2010 +0100

Fix the size of the Slackware icon.

 images/download/distros/slackware.png |  Bin 12548 - 5861 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/download/distros/slackware.png 
b/images/download/distros/slackware.png
index f77cad9..c12d941 100644
Binary files a/images/download/distros/slackware.png and 
b/images/download/distros/slackware.png differ
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] www:master Add a link to the build order in the development page.

2010-01-17 Thread Jérôme Guelfucci

Updating branch refs/heads/master
 to 37b822d5180d6241127cae37c9aa194a3693d0ed (commit)
   from 03504acbe259de56e16c54df68b87094cccac7e5 (commit)

commit 37b822d5180d6241127cae37c9aa194a3693d0ed
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Sun Jan 17 11:07:48 2010 +0100

Add a link to the build order in the development page.

 i18n/download/development.en.php |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/i18n/download/development.en.php b/i18n/download/development.en.php
index 64b992a..4ace08d 100644
--- a/i18n/download/development.en.php
+++ b/i18n/download/development.en.php
@@ -88,3 +88,6 @@ Xfce libraries, which is ${prefix}/lib/pkgconfig.  For 
example:
 pTo build the Xfce modules from GIT (you need the xfce4-dev-tools package) 
run this command: /p
 
 pcode class=code./autogen.sh --prefix=/usr/local amp;amp; make 
amp;amp; make install/code/p
+
+pThe a href=/documentation/requirementsrequirements/a page lists all 
the required dependencies and
+the build order of the modules./p
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] gigolo:master l10n: Updated Czech (cs) translation to 100%

2010-01-17 Thread Transifex

Updating branch refs/heads/master
 to c297ecf31ead7ce3b12c17767a2463af88744396 (commit)
   from fdd8852c8f15fb52914e5fb791a0b00cc8e4a364 (commit)

commit c297ecf31ead7ce3b12c17767a2463af88744396
Author: Michal Várady miko.v...@gmail.com
Date:   Sun Jan 17 15:50:37 2010 +0100

l10n: Updated Czech (cs) translation to 100%

New status: 133 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/cs.po |5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 74d8af6..42793d5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid 
 msgstr 
 Project-Id-Version: gigolo 0.3.1\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2010-01-15 06:00+0100\n
+POT-Creation-Date: 2010-01-17 12:05+0100\n
 PO-Revision-Date: 2009-06-07 17:25+0100\n
 Last-Translator: Michal Várady miko.v...@gmail.com\n
 Language-Team: Czech c...@li.org\n
@@ -94,9 +94,8 @@ msgid A simple frontend to easily connect to remote 
filesystems
 msgstr Jednoduché rozhraní pro snadné připojení ke vzdáleným systémům souborů
 
 #: ../src/window.c:422
-#, fuzzy
 msgid Copyright 2008-2010 Enrico Tröger
-msgstr Copyright 2008-2009 Enrico Tröger
+msgstr Copyright 2008-2010 Enrico Tröger
 
 #: ../src/window.c:425
 msgid translator-credits
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] ristretto:master l10n: Updated Czech (cs) translation to 100%

2010-01-17 Thread Transifex

Updating branch refs/heads/master
 to 1987552645a6b9c161c2ce8ff81e293035942fbd (commit)
   from 6c5800892d6e269bb0de61e0f2aae64f03803ebe (commit)

commit 1987552645a6b9c161c2ce8ff81e293035942fbd
Author: Michal Várady miko.v...@gmail.com
Date:   Sun Jan 17 15:55:05 2010 +0100

l10n: Updated Czech (cs) translation to 100%

New status: 124 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/cs.po |   21 +++--
 1 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 2415d68..c905f2f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Miro Hrončok churchy...@gmail.com, 2007.
 # Michal Várady miko.v...@gmail.com, 2008.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: ristretto\n
@@ -415,8 +415,7 @@ msgstr Probíhá změna velikosti
 
 #: ../src/preferences_dialog.c:422
 msgid Don't scale over 100% when maximizing the window.
-msgstr 
-Nezvětšovat obrázek nad jeho skutečnou velikost při maximalizování okna.
+msgstr Nezvětšovat obrázek nad jeho skutečnou velikost při maximalizování 
okna.
 
 #: ../src/preferences_dialog.c:426
 msgid Startup
@@ -472,16 +471,15 @@ msgstr Styl:
 
 #: ../src/xfce_wallpaper_manager.c:88
 msgid Monitor:
-msgstr 
+msgstr Monitor:
 
 #: ../src/xfce_wallpaper_manager.c:90
 msgid Brightness:
-msgstr 
+msgstr Jas:
 
 #: ../src/xfce_wallpaper_manager.c:91
-#, fuzzy
 msgid Saturation:
-msgstr _Rotace
+msgstr Sytost:
 
 #: ../src/xfce_wallpaper_manager.c:123
 msgid Auto
@@ -543,11 +541,9 @@ msgstr Prohlížejte si své fotografie jednoduše
 msgid Ristretto Photo Viewer
 msgstr Prohlížeč fotografií Ristretto
 
-#, fuzzy
 #~ msgid Ristretto
 #~ msgstr Ristretto
 
-#, fuzzy
 #~ msgid _Thumbnail Bar
 #~ msgstr Náhledy
 
@@ -572,14 +568,11 @@ msgstr Prohlížeč fotografií Ristretto
 #~ msgid H_ide
 #~ msgstr _Skrýt
 
-#~ msgid 
-#~ One or more images have been modified, do you want to save the changes?
+#~ msgid One or more images have been modified, do you want to save the 
changes?
 #~ msgstr Některé obrázky byly upraveny, přejete si uložit změny?
 
 #~ msgid _Preload images (GUI more responsive but more CPU-intensive)
-#~ msgstr 
-#~ _Přednačítat obrázky (Grafické uživatelské rozhraní bude odpovídat 
-#~ rychleji, ale vytížení procesoru se zvýší)
+#~ msgstr _Přednačítat obrázky (Grafické uživatelské rozhraní bude odpovídat 
rychleji, ale vytížení procesoru se zvýší)
 
 #~ msgid Hide the thumbnails bar during slideshow
 #~ msgstr Nezobrazovat lištu s náhledy při promítání
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfswitch-plugin:master l10n: Updated Dutch (Flemish) (nl) translation to 66%

2010-01-17 Thread Transifex

Updating branch refs/heads/master
 to e39bf420571359404083521e2f4fe11ce17dd11f (commit)
   from 49b326214006662c14be5b5ba213f2ba5e06ab80 (commit)

commit e39bf420571359404083521e2f4fe11ce17dd11f
Author: Nick Schermer n...@xfce.org
Date:   Sun Jan 17 16:03:53 2010 +0100

l10n: Updated Dutch (Flemish) (nl) translation to 66%

New status: 2 messages complete with 1 fuzzy and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/nl.po |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 2dc9699..469bce4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,3 +1,4 @@
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfswitch-plugin\n
@@ -20,5 +21,6 @@ msgid Switch to another user without closing the current 
session
 msgstr Wissel van gebruiker zonder de huidige sessie te beëindigen
 
 #: ../panel-plugin/xfswitch-plugin.desktop.in.in.h:2
+#, fuzzy
 msgid User switching
 msgstr Gebruikers wisselen
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-appfinder:master l10n: Updated Dutch (Flemish) (nl) translation to 85%

2010-01-17 Thread Transifex

Updating branch refs/heads/master
 to a13805f3d39d7ae359048259c033915c308f54d4 (commit)
   from 895f29e9c9125fd112017428e48bc4bdf36ff58f (commit)

commit a13805f3d39d7ae359048259c033915c308f54d4
Author: Timo Verbeek timoverbee...@hotmail.com
Date:   Sun Jan 17 16:58:07 2010 +0100

l10n: Updated Dutch (Flemish) (nl) translation to 85%

New status: 17 messages complete with 3 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/nl.po |   48 +++-
 1 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index ee0d5bb..3e55498 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2008 Jasper Huijsmans jas...@xfce.org
 # This file is distributed under the same license as the xfce4-appfinder 
package.
 # Jasper Huijsmans jas...@xfce.org, 2008.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfce4-appfinder 4.5.1\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2009-10-18 14:57+0200\n
+POT-Creation-Date: 2010-01-17 12:03+0100\n
 PO-Revision-Date: 2008-07-27 09:26+0200\n
 Last-Translator: Jasper Huijsmans jas...@xfce.org\n
 Language-Team: Dutch vertal...@vrijschrift.org\n
@@ -15,7 +15,6 @@ msgstr 
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
 
-#
 #: ../src/main.c:42
 #, fuzzy
 msgid Version information
@@ -28,11 +27,12 @@ msgstr [MENUBESTAND]
 #: ../src/main.c:64
 #, c-format
 msgid Type '%s --help' for usage information.
-msgstr 
+msgstr Typ '%s -- help' voor het gebruiks informatie.
 
 #: ../src/main.c:70
+#, fuzzy
 msgid Unable to initialize GTK+.
-msgstr 
+msgstr Mislukt om GTK + te intaliseren
 
 #: ../src/main.c:80
 msgid The Xfce development team. All rights reserved.
@@ -46,24 +46,23 @@ msgstr Rapporteer problemen op %s
 #: ../src/main.c:92
 #, c-format
 msgid Failed to connect to xfconf daemon. Reason: %s
-msgstr 
+msgstr Kon geen verbinding maken xfconf daemon. De Reden:%s
 
 #: ../src/main.c:96
 msgid Failed to connect to xfconf daemon.
-msgstr 
+msgstr Kon geen verbinding maken xfconf daemon.
 
 #: ../src/xfce-appfinder-window.c:225 ../data/xfce4-appfinder.desktop.in.h:1
 msgid Application Finder
 msgstr Toepassingen Zoeken
 
 #: ../src/xfce-appfinder-window.c:227 ../data/xfce4-appfinder.desktop.in.h:2
-#, fuzzy
 msgid Find and launch applications installed on your system
-msgstr Toepassingen zoeken die geïnstalleerd zijn op het systeem.
+msgstr Toepassingen zoeken en uitvoeren die geïnstalleerd zijn op het 
systeem.
 
 #: ../src/xfce-appfinder-window.c:250
 msgid Search
-msgstr 
+msgstr Zoeken
 
 #: ../src/xfce-appfinder-window.c:278
 msgid Categories
@@ -76,41 +75,40 @@ msgstr A_fsluiten na uitvoeren
 
 #: ../src/xfce-appfinder-window.c:336
 msgid Launch
-msgstr 
+msgstr Uitvoeren
 
-#: ../src/xfce-appfinder-window.c:720
+#: ../src/xfce-appfinder-window.c:722
 #, c-format
 msgid Could not execute application %s.
-msgstr 
+msgstr Kon de toepassing %s niet uitvoeren.
 
-#: ../src/xfce-appfinder-window.c:843
+#: ../src/xfce-appfinder-window.c:845
 #, c-format
 msgid Could not load menu from %s
-msgstr 
+msgstr Kan geen menu  van %s laden
 
-#: ../src/xfce-appfinder-window.c:846
+#: ../src/xfce-appfinder-window.c:848
 msgid Could not load system menu
-msgstr 
+msgstr Kan het systeem menu niet laden
 
-#: ../src/xfce-appfinder-window.c:868 ../src/xfce-appfinder-window.c:875
-#: ../src/xfce-appfinder-window.c:1104
+#: ../src/xfce-appfinder-window.c:870 ../src/xfce-appfinder-window.c:877
+#: ../src/xfce-appfinder-window.c:1106
 msgid All
 msgstr Alles
 
-#: ../src/xfce-appfinder-window.c:942
-#, fuzzy, c-format
+#: ../src/xfce-appfinder-window.c:944
+#, c-format
 msgid bCategories:/b %s
-msgstr Categorieën
+msgstr bCategorieën:/b%s
 
-#: ../src/xfce-appfinder-window.c:953
+#: ../src/xfce-appfinder-window.c:955
 #, c-format
 msgid bCommand:/b %s
-msgstr 
+msgstr bCommando:%s/b
 
 #~ msgid Filter
 #~ msgstr Filter
 
-#, fuzzy
 #~ msgid Find and launch applications installed on the system
 #~ msgstr Toepassingen zoeken die geïnstalleerd zijn op het systeem.
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-appfinder:xfce-4.6 l10n: Updated Dutch (Flemish) (nl) translation to 94%

2010-01-17 Thread Transifex

Updating branch refs/heads/xfce-4.6
 to 9a2802e5a6cba931b7854b3f9b3e4c248f8d4771 (commit)
   from 5b6cc18cb36a04ef28c5c97df74ffdcf9cf4ed50 (commit)

commit 9a2802e5a6cba931b7854b3f9b3e4c248f8d4771
Author: Timo Verbeek timoverbee...@hotmail.com
Date:   Sun Jan 17 17:02:47 2010 +0100

l10n: Updated Dutch (Flemish) (nl) translation to 94%

New status: 18 messages complete with 1 fuzzy and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/nl.po |   53 +
 1 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index a4532e7..33398ed 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2008 Jasper Huijsmans jas...@xfce.org
 # This file is distributed under the same license as the xfce4-appfinder 
package.
 # Jasper Huijsmans jas...@xfce.org, 2008.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfce4-appfinder 4.5.1\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2009-01-02 13:31+0100\n
+POT-Creation-Date: 2010-01-17 12:09+0100\n
 PO-Revision-Date: 2008-07-27 09:26+0200\n
 Last-Translator: Jasper Huijsmans jas...@xfce.org\n
 Language-Team: Dutch vertal...@vrijschrift.org\n
@@ -15,7 +15,6 @@ msgstr 
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 
-#
 #: ../src/main.c:43
 #, fuzzy
 msgid Version information
@@ -28,11 +27,11 @@ msgstr [MENUBESTAND]
 #: ../src/main.c:65
 #, c-format
 msgid Type '%s --help' for usage information.
-msgstr 
+msgstr Typ '%s --help' voor het gebruik van informatie.
 
 #: ../src/main.c:71
 msgid Unable to initialize GTK+.
-msgstr 
+msgstr Mislukt om GTK+ te intalliseren.
 
 #: ../src/main.c:81
 msgid The Xfce development team. All rights reserved.
@@ -46,67 +45,65 @@ msgstr Rapporteer problemen op %s
 #: ../src/main.c:98
 #, c-format
 msgid Failed to connect to xfconf daemon. Reason: %s
-msgstr 
+msgstr Kon geen verbinding maken met  xfconf daemon. Reden:%s
 
 #: ../src/main.c:102
 msgid Failed to connect to xfconf daemon.
-msgstr 
+msgstr Kon geen verbinding maken xfconf daemon.
 
-#: ../src/xfce-appfinder-window.c:280 ../src/xfce-appfinder-window.c:294
+#: ../src/xfce-appfinder-window.c:281 ../src/xfce-appfinder-window.c:295
 #: ../data/xfce4-appfinder.desktop.in.h:1
 msgid Application Finder
 msgstr Toepassingen Zoeken
 
-#: ../src/xfce-appfinder-window.c:295 ../data/xfce4-appfinder.desktop.in.h:2
-#, fuzzy
+#: ../src/xfce-appfinder-window.c:296 ../data/xfce4-appfinder.desktop.in.h:2
 msgid Find and launch applications installed on your system
-msgstr Toepassingen zoeken die geïnstalleerd zijn op het systeem.
+msgstr Toepassingen zoeken en uitvoeren die geïnstalleerd zijn op het 
systeem.
 
-#: ../src/xfce-appfinder-window.c:318
+#: ../src/xfce-appfinder-window.c:319
 msgid Search
-msgstr 
+msgstr Zoeken
 
-#: ../src/xfce-appfinder-window.c:341
+#: ../src/xfce-appfinder-window.c:342
 msgid Categories
 msgstr Categorieën
 
-#: ../src/xfce-appfinder-window.c:389
+#: ../src/xfce-appfinder-window.c:390
 msgid C_lose after execute
 msgstr A_fsluiten na uitvoeren
 
-#: ../src/xfce-appfinder-window.c:790
+#: ../src/xfce-appfinder-window.c:793
 #, c-format
 msgid Could not execute application %s. Reason: %s
-msgstr 
+msgstr Kon de toepassing%s niet uitvoeren. De reden: %s
 
-#: ../src/xfce-appfinder-window.c:794
+#: ../src/xfce-appfinder-window.c:797
 #, c-format
 msgid Could not execute application %s
-msgstr 
+msgstr Kon  de toepassing %s niet uitvoeren
 
-#: ../src/xfce-appfinder-window.c:916
+#: ../src/xfce-appfinder-window.c:954
 #, c-format
 msgid Could not load menu from %s. Reason: %s
-msgstr 
+msgstr Kan niet het menu van %s laden. De reden:% s
 
-#: ../src/xfce-appfinder-window.c:918 ../src/xfce-appfinder-window.c:927
+#: ../src/xfce-appfinder-window.c:956 ../src/xfce-appfinder-window.c:965
 msgid Could not load system menu
-msgstr 
+msgstr Kan systeem menu niet laden
 
-#: ../src/xfce-appfinder-window.c:925
+#: ../src/xfce-appfinder-window.c:963
 #, c-format
 msgid Could not load menu from %s
-msgstr 
+msgstr Kan geen menu laden van %s
 
-#: ../src/xfce-appfinder-window.c:940 ../src/xfce-appfinder-window.c:947
-#: ../src/xfce-appfinder-window.c:1203
+#: ../src/xfce-appfinder-window.c:978 ../src/xfce-appfinder-window.c:985
+#: ../src/xfce-appfinder-window.c:1241
 msgid All
 msgstr Alles
 
 #~ msgid Filter
 #~ msgstr Filter
 
-#, fuzzy
 #~ msgid Find and launch applications installed on the system
 #~ msgstr Toepassingen zoeken die geïnstalleerd zijn op het systeem.
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-screenshooter:master l10n: Updated Dutch (Flemish) (nl) translation to 100%

2010-01-17 Thread Transifex

Updating branch refs/heads/master
 to 004a71ea008a13b3eeecad4f91d3432981f6344d (commit)
   from 57d93fb0faa79b067f51d623dc5235b500eca13f (commit)

commit 004a71ea008a13b3eeecad4f91d3432981f6344d
Author: Timo Verbeek timoverbee...@hotmail.com
Date:   Sun Jan 17 17:12:20 2010 +0100

l10n: Updated Dutch (Flemish) (nl) translation to 100%

New status: 75 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/nl.po |  214 -
 1 files changed, 70 insertions(+), 144 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 1b8de34..496613b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the 
xfce4-screenshooter-plugin package.
 # Stephan Arts step...@xfce.org, 2008.
 # Vincent Tunru proje...@vinnl.nl, 2008.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: 1.1.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2009-11-29 11:58+0100\n
+POT-Creation-Date: 2010-01-17 12:00+0100\n
 PO-Revision-Date: 2009-11-29 11:42+0100\n
 Last-Translator: Vincent Tunru proje...@vinnl.nl\n
 Language-Team: Dutch xfce-i...@xfce.org\n
@@ -17,154 +17,136 @@ msgstr 
 Content-Transfer-Encoding: 8bit\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
-#: ../lib/screenshooter-dialogs.c:478
+#: ../lib/screenshooter-dialogs.c:453
 #, c-format
 msgid %.2fKb of %.2fKb
 msgstr %.2fKb van %.2fKb
 
-#: ../lib/screenshooter-dialogs.c:560
+#: ../lib/screenshooter-dialogs.c:535
 msgid Transfer
 msgstr Overdracht
 
-#: ../lib/screenshooter-dialogs.c:581
-msgid 
-span weight=\bold\ stretch=\semiexpanded\The screenshot is being 
-transferred to:/span
-msgstr 
-span weight=\bold\ stretch=\semiexpanded\De schermafdruk wordt 
-overgedragen naar:/span
+#: ../lib/screenshooter-dialogs.c:556
+msgid span weight=\bold\ stretch=\semiexpanded\The screenshot is being 
transferred to:/span
+msgstr span weight=\bold\ stretch=\semiexpanded\De schermafdruk wordt 
overgedragen naar:/span
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:672 ../lib/screenshooter-dialogs.c:689
+#: ../lib/screenshooter-dialogs.c:880 ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
 msgid Screenshot
 msgstr Schermafdruk
 
-#: ../lib/screenshooter-dialogs.c:709
+#: ../lib/screenshooter-dialogs.c:684
 msgid Take a screenshot
 msgstr Schermafdruk maken
 
-#: ../lib/screenshooter-dialogs.c:724
+#: ../lib/screenshooter-dialogs.c:699
 msgid Preferences
 msgstr Voorkeuren
 
-#: ../lib/screenshooter-dialogs.c:754
+#: ../lib/screenshooter-dialogs.c:729
 msgid span weight=\bold\ stretch=\semiexpanded\Region to capture/span
-msgstr 
-span weight=\bold\ stretch=\semiexpanded\Gebied om een schermafdruk 
-van te maken/span
+msgstr span weight=\bold\ stretch=\semiexpanded\Gebied om een 
schermafdruk van te maken/span
 
-#: ../lib/screenshooter-dialogs.c:774
+#: ../lib/screenshooter-dialogs.c:749
 msgid Entire screen
 msgstr Volledig scherm
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:756 ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid Take a screenshot of the entire screen
 msgstr Schermafdruk van het hele scherm maken
 
-#: ../lib/screenshooter-dialogs.c:789
+#: ../lib/screenshooter-dialogs.c:764
 msgid Active window
 msgstr Actieve venster
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:771 ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid Take a screenshot of the active window
 msgstr Actieve venster
 
-#: ../lib/screenshooter-dialogs.c:804
+#: ../lib/screenshooter-dialogs.c:779
 msgid Select a region
 msgstr Selecteer een gebied
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:784 ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
-msgid 
-Select a region to be captured by clicking a point of the screen without 
-releasing the mouse button, dragging your mouse to the other corner of the 
-region, and releasing the mouse button.
-msgstr 
-Selecteer een gebied om een schermafdruk door te klikken op een hoek van het 
-gebied zonder de muisknop zo te laten. Sleep vervolgens de muis naar de 
-andere hoek en laat de muisknop los.
+msgid Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button.
+msgstr Selecteer een gebied om een schermafdruk door te klikken op een hoek 
van het gebied zonder de muisknop zo te laten. Sleep vervolgens de muis naar de 
andere hoek en laat de muisknop los.
 
-#: ../lib/screenshooter-dialogs.c:819
+#:

[Xfce4-commits] xfce4-power-manager:master l10n: Updated Dutch (Flemish) (nl) translation to 32%

2010-01-17 Thread Transifex

Updating branch refs/heads/master
 to b0e663fb25bab00bae6518e95551c719ce186b0b (commit)
   from 53bb553a0ae345c38ce67208b2f3496501e86fb4 (commit)

commit b0e663fb25bab00bae6518e95551c719ce186b0b
Author: Timo Verbeek timoverbee...@hotmail.com
Date:   Sun Jan 17 17:21:24 2010 +0100

l10n: Updated Dutch (Flemish) (nl) translation to 32%

New status: 50 messages complete with 61 fuzzies and 44 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/nl.po |  387 +-
 1 files changed, 153 insertions(+), 234 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 406d8be..e7e1191 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,8 +1,9 @@
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfce4-power-manager\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2009-08-27 09:02+\n
+POT-Creation-Date: 2010-01-17 12:00+0100\n
 PO-Revision-Date: 2008-11-07 14:21+0100\n
 Last-Translator: Vincent Tunru proje...@vinnl.nl\n
 Language-Team: Dutch vertal...@vrijschrift.org\n
@@ -13,89 +14,89 @@ msgstr 
 X-Poedit-Country: NETHERLANDS\n
 
 #: ../data/interfaces/xfpm-settings.ui.h:1
-#, fuzzy
 msgid bActions/b
-msgstr Geavanceerde instellingen
+msgstr bActies/b
 
 #: ../data/interfaces/xfpm-settings.ui.h:2
-#, fuzzy
 msgid bAdvanced Options/b
-msgstr Geavanceerde instellingen
+msgstr bGeavanceerde opties/b
 
 #: ../data/interfaces/xfpm-settings.ui.h:3
 msgid bBrightness/b
-msgstr 
+msgstr bHelderheid/b
 
 #: ../data/interfaces/xfpm-settings.ui.h:4
-#, fuzzy
 msgid bGeneral Options/b
-msgstr Algemene opties
+msgstr bAlgemene opties/b
 
 #: ../data/interfaces/xfpm-settings.ui.h:5
+#, fuzzy
 msgid bMonitor/b
-msgstr 
+msgstr bMonitor/b
 
 #: ../data/interfaces/xfpm-settings.ui.h:6
 msgid Actions
-msgstr 
+msgstr Acties
 
 #: ../data/interfaces/xfpm-settings.ui.h:7
 #, fuzzy
 msgid CPU frequency control
-msgstr LCD-helderheid-beheer inschakelen
+msgstr CPU-frequentie controle
 
 #: ../data/interfaces/xfpm-settings.ui.h:8
 msgid Consider the computer on low power at:
-msgstr 
+msgstr Beschouw de computer op laag vermogen op:
 
 #. Hibernate menu option
-#: ../data/interfaces/xfpm-settings.ui.h:9 ../settings/xfpm-settings.c:775
-#: ../settings/xfpm-settings.c:846 ../settings/xfpm-settings.c:970
-#: ../settings/xfpm-settings.c:1125 ../settings/xfpm-settings.c:1183
-#: ../settings/xfpm-settings.c:1238 ../src/xfpm-tray-icon.c:174
-#: ../src/xfpm-tray-icon.c:266
+#: ../data/interfaces/xfpm-settings.ui.h:9 ../settings/xfpm-settings.c:776
+#: ../settings/xfpm-settings.c:847 ../settings/xfpm-settings.c:971
+#: ../settings/xfpm-settings.c:1128 ../settings/xfpm-settings.c:1186
+#: ../settings/xfpm-settings.c:1241 ../src/xfpm-tray-icon.c:180
+#: ../src/xfpm-tray-icon.c:272
 msgid Hibernate
 msgstr Slaapstand
 
 #: ../data/interfaces/xfpm-settings.ui.h:10
+#, fuzzy
 msgid Lock screen when going for suspend/hibernate
-msgstr 
+msgstr Lock scherm wanneer in suspend / hibernate gaan
 
 #: ../data/interfaces/xfpm-settings.ui.h:11
 msgid Monitor
-msgstr 
+msgstr Monitor
 
 #: ../data/interfaces/xfpm-settings.ui.h:12
+#, fuzzy
 msgid Monitor power management control
-msgstr 
+msgstr Monitor power management control
 
-#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:764
-#: ../settings/xfpm-settings.c:835 ../settings/xfpm-settings.c:959
-#: ../settings/xfpm-settings.c:1114 ../settings/xfpm-settings.c:1172
-#: ../settings/xfpm-settings.c:1227
+#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:765
+#: ../settings/xfpm-settings.c:836 ../settings/xfpm-settings.c:960
+#: ../settings/xfpm-settings.c:1117 ../settings/xfpm-settings.c:1175
+#: ../settings/xfpm-settings.c:1230
 msgid Nothing
 msgstr Niets doen
 
 #: ../data/interfaces/xfpm-settings.ui.h:14
-#, fuzzy
 msgid Power manager settings
 msgstr Energiebeheer
 
 #: ../data/interfaces/xfpm-settings.ui.h:15
 msgid Prefer power savings over performance
-msgstr 
+msgstr Kies energiebesparing boven prestaties
 
 #: ../data/interfaces/xfpm-settings.ui.h:16
 msgid Put display to sleep when computer is inactive for:
-msgstr 
+msgstr Zet display uit als de computer inactief is voor:
 
 #: ../data/interfaces/xfpm-settings.ui.h:17
 msgid Put the computer to sleep when inactive for:
-msgstr 
+msgstr Zet de computer in slaapstand wanneer inactief voor:
 
 #: ../data/interfaces/xfpm-settings.ui.h:18
+#, fuzzy
 msgid Reduce screen brightness when computer is inactive for:
-msgstr 
+msgstr Verminder helderheid van het scherm als de computer inactief is voor:
 
 #: ../data/interfaces/xfpm-settings.ui.h:19
 msgid Set computer inactivity sleep mode:
@@ -106,8 +107,9 @@ msgid Set monitor sleep mode:
 msgstr 
 
 #: ../data/interfaces/xfpm-settings.ui.h:21
+#, fuzzy
 msgid Show notifications to notify about the battery state
-msgstr 
+msgstr Toon berichten met informatie over de batterij staat
 
 #: ../data/interfaces/xfpm-settings.ui.h:22
 #, fuzzy
@@ -115,40 +117,37 @@ msgid Standby

[Xfce4-commits] midori:master Add G_GNUC_CONST to all Katze type functions

2010-01-17 Thread Christian Dywan

Updating branch refs/heads/master
 to 07d4964e90da03173f302c1fda8379a30fc60e5c (commit)
   from e1bfefb0ee9bcdab27d38a641427a9a9e24f2144 (commit)

commit 07d4964e90da03173f302c1fda8379a30fc60e5c
Author: Christian Dywan christ...@twotoasts.de
Date:   Sat Jan 16 07:01:34 2010 +0100

Add G_GNUC_CONST to all Katze type functions

 katze/katze-array.h   |2 +-
 katze/katze-arrayaction.h |2 +-
 katze/katze-http-auth.h   |2 +-
 katze/katze-http-cookies.h|2 +-
 katze/katze-item.h|2 +-
 katze/katze-net.h |2 +-
 katze/katze-preferences.h |2 +-
 katze/katze-scrolled.h|2 +-
 katze/katze-separatoraction.h |2 +-
 katze/katze-throbber.h|2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/katze/katze-array.h b/katze/katze-array.h
index af3370d..0695360 100644
--- a/katze/katze-array.h
+++ b/katze/katze-array.h
@@ -33,7 +33,7 @@ typedef struct _KatzeArray   KatzeArray;
 typedef struct _KatzeArrayClass  KatzeArrayClass;
 
 GType
-katze_array_get_type   (void);
+katze_array_get_type   (void) G_GNUC_CONST;
 
 KatzeArray*
 katze_array_new(GType type);
diff --git a/katze/katze-arrayaction.h b/katze/katze-arrayaction.h
index 062ffbd..2e8c462 100644
--- a/katze/katze-arrayaction.h
+++ b/katze/katze-arrayaction.h
@@ -35,7 +35,7 @@ typedef struct _KatzeArrayAction KatzeArrayAction;
 typedef struct _KatzeArrayActionClassKatzeArrayActionClass;
 
 GType
-katze_array_action_get_type  (void);
+katze_array_action_get_type  (void) G_GNUC_CONST;
 
 KatzeArray*
 katze_array_action_get_array(KatzeArrayAction* array_action);
diff --git a/katze/katze-http-auth.h b/katze/katze-http-auth.h
index 908646f..bbf2e39 100644
--- a/katze/katze-http-auth.h
+++ b/katze/katze-http-auth.h
@@ -35,7 +35,7 @@ typedef struct _KatzeHttpAuthKatzeHttpAuth;
 typedef struct _KatzeHttpAuthClass   KatzeHttpAuthClass;
 
 GType
-katze_http_auth_get_type   (void);
+katze_http_auth_get_type   (void) G_GNUC_CONST;
 
 G_END_DECLS
 
diff --git a/katze/katze-http-cookies.h b/katze/katze-http-cookies.h
index 97caa27..b791a50 100644
--- a/katze/katze-http-cookies.h
+++ b/katze/katze-http-cookies.h
@@ -35,7 +35,7 @@ typedef struct _KatzeHttpCookies
KatzeHttpCookies;
 typedef struct _KatzeHttpCookiesClass   KatzeHttpCookiesClass;
 
 GType
-katze_http_cookies_get_type   (void);
+katze_http_cookies_get_type   (void) G_GNUC_CONST;
 
 G_END_DECLS
 
diff --git a/katze/katze-item.h b/katze/katze-item.h
index eaf7400..344f501 100644
--- a/katze/katze-item.h
+++ b/katze/katze-item.h
@@ -56,7 +56,7 @@ struct _KatzeItemClass
 };
 
 GType
-katze_item_get_type   (void);
+katze_item_get_type   (void) G_GNUC_CONST;
 
 KatzeItem*
 katze_item_new(void);
diff --git a/katze/katze-net.h b/katze/katze-net.h
index 13f5026..d57a74b 100644
--- a/katze/katze-net.h
+++ b/katze/katze-net.h
@@ -35,7 +35,7 @@ typedef struct _KatzeNetKatzeNet;
 typedef struct _KatzeNetClass   KatzeNetClass;
 
 GType
-katze_net_get_type   (void);
+katze_net_get_type   (void) G_GNUC_CONST;
 
 KatzeNet*
 katze_net_new(void);
diff --git a/katze/katze-preferences.h b/katze/katze-preferences.h
index 63bd484..e957ebc 100644
--- a/katze/katze-preferences.h
+++ b/katze/katze-preferences.h
@@ -46,7 +46,7 @@ struct _KatzePreferencesClass
 };
 
 GType
-katze_preferences_get_type   (void);
+katze_preferences_get_type   (void) G_GNUC_CONST;
 
 GtkWidget*
 katze_preferences_new(GtkWindow*  parent);
diff --git a/katze/katze-scrolled.h b/katze/katze-scrolled.h
index e8787f1..5535d44 100644
--- a/katze/katze-scrolled.h
+++ b/katze/katze-scrolled.h
@@ -48,7 +48,7 @@ struct _KatzeScrolledClass
 };
 
 GType
-katze_scrolled_get_type (void);
+katze_scrolled_get_type (void) G_GNUC_CONST;
 
 GtkWidget*
 katze_scrolled_new  (GtkAdjustment* hadjustment,
diff --git a/katze/katze-separatoraction.h b/katze/katze-separatoraction.h
index 396b83d..084eebf 100644
--- a/katze/katze-separatoraction.h
+++ b/katze/katze-separatoraction.h
@@ -36,7 +36,7 @@ typedef struct _KatzeSeparatorAction 
KatzeSeparatorAction;
 typedef struct _KatzeSeparatorActionClassKatzeSeparatorActionClass;
 
 GType
-katze_separator_action_get_type  (void);
+katze_separator_action_get_type  (void) G_GNUC_CONST;
 
 G_END_DECLS
 
diff --git a/katze/katze-throbber.h b/katze/katze-throbber.h
index 34d0004..dfa714a 100644
--- a/katze/katze-throbber.h
+++ b/katze/katze-throbber.h
@@ -45,7 +45,7 @@ struct _KatzeThrobberClass
 };
 
 GType

[Xfce4-commits] midori:master Add G_GNUC_CONST to all Midori type functions

2010-01-17 Thread Christian Dywan

Updating branch refs/heads/master
 to 2d8c8bebf57f9a8f6aaa0a52ca98a1620918bac8 (commit)
   from 07d4964e90da03173f302c1fda8379a30fc60e5c (commit)

commit 2d8c8bebf57f9a8f6aaa0a52ca98a1620918bac8
Author: Christian Dywan christ...@twotoasts.de
Date:   Sat Jan 16 07:05:16 2010 +0100

Add G_GNUC_CONST to all Midori type functions

 midori/midori-app.h|2 +-
 midori/midori-browser.h|2 +-
 midori/midori-extension.h  |2 +-
 midori/midori-locationaction.h |2 +-
 midori/midori-panel.h  |2 +-
 midori/midori-preferences.h|2 +-
 midori/midori-searchaction.h   |2 +-
 midori/midori-view.h   |2 +-
 midori/midori-viewable.h   |2 +-
 midori/midori-websettings.h|2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/midori/midori-app.h b/midori/midori-app.h
index 1bdc00e..7c28096 100644
--- a/midori/midori-app.h
+++ b/midori/midori-app.h
@@ -36,7 +36,7 @@ typedef struct _MidoriAppMidoriApp;
 typedef struct _MidoriAppClass   MidoriAppClass;
 
 GType
-midori_app_get_type   (void);
+midori_app_get_type   (void) G_GNUC_CONST;
 
 MidoriApp*
 midori_app_new(void);
diff --git a/midori/midori-browser.h b/midori/midori-browser.h
index 0834028..1b3d873 100644
--- a/midori/midori-browser.h
+++ b/midori/midori-browser.h
@@ -75,7 +75,7 @@ struct _MidoriBrowserClass
 };
 
 GType
-midori_browser_get_type   (void);
+midori_browser_get_type   (void) G_GNUC_CONST;
 
 MidoriBrowser*
 midori_browser_new(void);
diff --git a/midori/midori-extension.h b/midori/midori-extension.h
index 60b7d01..9fceb98 100644
--- a/midori/midori-extension.h
+++ b/midori/midori-extension.h
@@ -46,7 +46,7 @@ struct _MidoriExtensionClass
 };
 
 GType
-midori_extension_get_type(void);
+midori_extension_get_type(void) G_GNUC_CONST;
 
 gboolean
 midori_extension_is_prepared (MidoriExtension* extension);
diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h
index 33c3a39..2dc5631 100644
--- a/midori/midori-locationaction.h
+++ b/midori/midori-locationaction.h
@@ -33,7 +33,7 @@ typedef struct _MidoriLocationAction 
MidoriLocationAction;
 typedef struct _MidoriLocationActionClassMidoriLocationActionClass;
 
 GType
-midori_location_action_get_type (void);
+midori_location_action_get_type (void) G_GNUC_CONST;
 
 void
 midori_location_action_freeze  (MidoriLocationAction* 
location_action);
diff --git a/midori/midori-panel.h b/midori/midori-panel.h
index 704fd95..d9a1fe1 100644
--- a/midori/midori-panel.h
+++ b/midori/midori-panel.h
@@ -37,7 +37,7 @@ typedef struct _MidoriPanelMidoriPanel;
 typedef struct _MidoriPanelClass   MidoriPanelClass;
 
 GType
-midori_panel_get_type   (void);
+midori_panel_get_type   (void) G_GNUC_CONST;
 
 GtkWidget*
 midori_panel_new(void);
diff --git a/midori/midori-preferences.h b/midori/midori-preferences.h
index 3b4ca2e..89c6f9d 100644
--- a/midori/midori-preferences.h
+++ b/midori/midori-preferences.h
@@ -40,7 +40,7 @@ struct _MidoriPreferencesClass
 };
 
 GType
-midori_preferences_get_type   (void);
+midori_preferences_get_type   (void) G_GNUC_CONST;
 
 GtkWidget*
 midori_preferences_new  (GtkWindow* parent,
diff --git a/midori/midori-searchaction.h b/midori/midori-searchaction.h
index 760dd4e..9eb269f 100644
--- a/midori/midori-searchaction.h
+++ b/midori/midori-searchaction.h
@@ -33,7 +33,7 @@ typedef struct _MidoriSearchAction MidoriSearchAction;
 typedef struct _MidoriSearchActionClassMidoriSearchActionClass;
 
 GType
-midori_search_action_get_type  (void);
+midori_search_action_get_type  (void) G_GNUC_CONST;
 
 const gchar*
 midori_search_action_get_text  (MidoriSearchAction* action);
diff --git a/midori/midori-view.h b/midori/midori-view.h
index a8a7452..d3fa089 100644
--- a/midori/midori-view.h
+++ b/midori/midori-view.h
@@ -61,7 +61,7 @@ typedef struct _MidoriViewMidoriView;
 typedef struct _MidoriViewClass   MidoriViewClass;
 
 GType
-midori_view_get_type   (void);
+midori_view_get_type   (void) G_GNUC_CONST;
 
 GtkWidget*
 midori_view_new(KatzeNet*  net);
diff --git a/midori/midori-viewable.h b/midori/midori-viewable.h
index 80a6a10..fca3e60 100644
--- a/midori/midori-viewable.h
+++ b/midori/midori-viewable.h
@@ -50,7 +50,7 @@ struct _MidoriViewableIface
 };
 
 GType
-midori_viewable_get_type   (void);
+midori_viewable_get_type   (void) G_GNUC_CONST;
 
 GtkWidget*
 midori_viewable_new_from_uri   (const gchar*   uri);
diff --git a/midori/midori-websettings.h b/midori/midori-websettings.h
index 0826ad5..ca9f3c9 100644

[Xfce4-commits] midori:master Use prepared statement to read history array instead of exec

2010-01-17 Thread Christian Dywan

Updating branch refs/heads/master
 to 27634e4f1ecc9eac678251ad1cb3b7e2d27569b1 (commit)
   from 7f26cc73846da51f0f5925f703fc228d8da6973f (commit)

commit 27634e4f1ecc9eac678251ad1cb3b7e2d27569b1
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Jan 17 17:39:21 2010 +0100

Use prepared statement to read history array instead of exec

 midori/main.c |  109 +---
 1 files changed, 49 insertions(+), 60 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 2880f70..95b132b 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -489,60 +489,6 @@ midori_history_add_item_cb (KatzeArray* array,
 G_CALLBACK (midori_history_notify_item_cb), db);
 }
 
-static int
-midori_history_add_items (void*  data,
-  intargc,
-  char** argv,
-  char** colname)
-{
-KatzeItem* item;
-KatzeArray* parent;
-KatzeArray* array;
-gint64 date;
-gint64 day;
-gint i;
-gint j;
-gint n;
-gint ncols = 4;
-gchar token[50];
-
-array = KATZE_ARRAY (data);
-g_return_val_if_fail (KATZE_IS_ARRAY (array), 1);
-
-/* Test whether have the right number of columns */
-g_return_val_if_fail (argc % ncols == 0, 1);
-
-for (i = 0; i  (argc - ncols) + 1; i++)
-{
-item = katze_item_new ();
-katze_item_set_uri (item, argv[i]);
-katze_item_set_name (item, argv[i + 1]);
-date = g_ascii_strtoull (argv[i + 2], NULL, 10);
-day = g_ascii_strtoull (argv[i + 3], NULL, 10);
-katze_item_set_added (item, date);
-
-n = katze_array_get_length (array);
-for (j = n - 1; j = 0; j--)
-{
-parent = katze_array_get_nth_item (array, j);
-if (day == katze_item_get_added (KATZE_ITEM (parent)))
-break;
-}
-
-if (j  0)
-{
-parent = katze_array_new (KATZE_TYPE_ARRAY);
-katze_item_set_added (KATZE_ITEM (parent), day);
-strftime (token, sizeof (token), %x, localtime ((time_t 
*)date));
-katze_item_set_name (KATZE_ITEM (parent), token);
-katze_array_add_item (array, parent);
-}
-
-katze_array_add_item (parent, item);
-}
-return 0;
-}
-
 static sqlite3*
 midori_history_initialize (KatzeArray*  array,
const gchar* filename,
@@ -552,6 +498,8 @@ midori_history_initialize (KatzeArray*  array,
 KatzeItem* item;
 gint i;
 gboolean has_day;
+sqlite3_stmt* statement;
+gint result;
 
 has_day = FALSE;
 
@@ -589,14 +537,55 @@ midori_history_initialize (KatzeArray*  array,
   NULL, NULL, errmsg) != SQLITE_OK)
 return NULL;
 
-if (sqlite3_exec (db,
-   SELECT uri, title, date, day FROM history 
-   ORDER BY date ASC,
-   midori_history_add_items,
-   array,
-   errmsg) != SQLITE_OK)
+/* FIXME: Install LIKE function with unicode case insensitivity */
+/* FIXME: Limit by maximum-history-age */
+if (sqlite3_prepare_v2 (db,
+SELECT DISTINCT uri, title, date, day FROM history ORDER BY date ASC,
+-1, statement, NULL) != SQLITE_OK)
 return NULL;
 
+while ((result = sqlite3_step (statement)) == SQLITE_ROW)
+{
+const unsigned char* uri = sqlite3_column_text (statement, 0);
+const unsigned char* title = sqlite3_column_text (statement, 1);
+sqlite3_int64 date = sqlite3_column_int64 (statement, 2);
+sqlite3_int64 day = sqlite3_column_int64 (statement, 3);
+KatzeArray* parent;
+gint j;
+gint n;
+gchar token[50];
+
+item = katze_item_new ();
+katze_item_set_uri (item, (gchar*)uri);
+katze_item_set_name (item, (gchar*)title);
+katze_item_set_added (item, date);
+
+n = katze_array_get_length (array);
+for (j = n - 1; j = 0; j--)
+{
+parent = katze_array_get_nth_item (array, j);
+if (day == katze_item_get_added (KATZE_ITEM (parent)))
+break;
+}
+
+if (j  0)
+{
+parent = katze_array_new (KATZE_TYPE_ARRAY);
+katze_item_set_added (KATZE_ITEM (parent), day);
+strftime (token, sizeof (token), %x, localtime ((time_t 
*)date));
+katze_item_set_name (KATZE_ITEM (parent), token);
+katze_array_add_item (array, parent);
+}
+
+katze_array_add_item (parent, item);
+}
+
+if (result != SQLITE_DONE)
+g_print (_(Failed to execute database statement: %s\n),
+ sqlite3_errmsg (db));
+
+sqlite3_finalize (statement);
+
 i = 0;
 while ((item = katze_array_get_nth_item (array, i++)))
 {
___

[Xfce4-commits] midori:master Generate LINGUAS at buildtime and recognize LINGUAS variable

2010-01-17 Thread Christian Dywan

Updating branch refs/heads/master
 to c335bb19c7b76933ace665aad891429a3a0afb5a (commit)
   from 2d8c8bebf57f9a8f6aaa0a52ca98a1620918bac8 (commit)

commit c335bb19c7b76933ace665aad891429a3a0afb5a
Author: Christian Dywan christ...@twotoasts.de
Date:   Sat Jan 16 07:46:58 2010 +0100

Generate LINGUAS at buildtime and recognize LINGUAS variable

 .gitignore |1 +
 TRANSLATE  |3 ---
 po/LINGUAS |2 --
 wscript|   20 +++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d140ddc..60e4fc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ Makefile
 _build_
 
 po/.intltool-merge-cache
+po/LINGUAS
 po/POTFILES
 po/midori.pot
 po/stamp-it
diff --git a/TRANSLATE b/TRANSLATE
index e642ec1..3b7a4d7 100644
--- a/TRANSLATE
+++ b/TRANSLATE
@@ -21,9 +21,6 @@ cd po
 msginit -l aa_CC -o aa.po -i midori.pot
 sed -i 's/PACKAGE/midori/g' aa.po
 
-Make sure you add your language to the file po/LINGUAS.
-Just open the file with a text editor and add your code.
-
 To check your language 'aa' for errors, do this:
 
 msgfmt -c --check-accelerators=_ aa.po
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index 47ec147..000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ast ca cs da de el en_GB es et fi fr gl he hu id it ja ko nl no pl pt pt_BR ro 
ru sk sr s...@latin sv tr uk zh_CN zh_TW
diff --git a/wscript b/wscript
index 0ecb48d..048de9b 100644
--- a/wscript
+++ b/wscript
@@ -20,7 +20,7 @@ import pproc as subprocess
 import os
 import UnitTest
 import Task
-from TaskGen import extension
+from TaskGen import extension, feature, taskgen
 import misc
 
 major = 0
@@ -245,6 +245,7 @@ def configure (conf):
 if 'CC' in os.environ: conf.env['CC'] = os.environ['CC'].split()
 conf.env['addons'] = option_enabled ('addons')
 conf.env['docs'] = option_enabled ('docs')
+if 'LINGUAS' in os.environ: conf.env['LINGUAS'] = os.environ['LINGUAS']
 
 conf.check (header_name='unistd.h')
 if not conf.env['HAVE_UNIQUE']:
@@ -363,6 +364,21 @@ def set_options (opt):
 opt.add_option ('--build', help='Ignored')
 opt.add_option ('--disable-maintainer-mode', help='Ignored')
 
+# Taken from Geany's wscript, modified to support LINGUAS variable
+def write_linguas_file (self):
+linguas = ''
+if 'LINGUAS' in Build.bld.env:
+linguas = Build.bld.env['LINGUAS']
+else:
+files = os.listdir ('../po')
+for f in files:
+if f.endswith ('.po'):
+linguas += '%s ' % f[:-3]
+f = open ('../po/LINGUAS', 'w')
+f.write ('# This file is autogenerated. Do not edit.\n%s\n' % linguas)
+f.close ()
+write_linguas_file = feature ('intltool_po')(write_linguas_file)
+
 def build (bld):
 def image_to_win32ico (task):
 'Converts an image to a Win32 ico'
@@ -498,6 +514,8 @@ def build (bld):
 distclean ()
 
 def distclean ():
+if os.path.exists ('po/LINGUAS'):
+os.remove ('po/LINGUAS')
 if os.path.exists ('po/midori.pot'):
 os.remove ('po/midori.pot')
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Remove 'Search engines in completion' functionality

2010-01-17 Thread Christian Dywan

Updating branch refs/heads/master
 to 7f26cc73846da51f0f5925f703fc228d8da6973f (commit)
   from c335bb19c7b76933ace665aad891429a3a0afb5a (commit)

commit 7f26cc73846da51f0f5925f703fc228d8da6973f
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Jan 17 10:23:35 2010 +0100

Remove 'Search engines in completion' functionality

The feature doesn't work well with more than two engines.

 midori/midori-browser.c|   14 +--
 midori/midori-locationaction.c |   89 +--
 midori/midori-preferences.c|2 -
 midori/midori-websettings.c|2 +-
 4 files changed, 5 insertions(+), 102 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 0d26e06..be1dd63 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -6616,12 +6616,7 @@ midori_browser_settings_notify (MidoriWebSettings* 
web_settings,
 g_value_get_string (value)  *g_value_get_string (value));
 else if (name == g_intern_string (search-engines-in-completion))
 {
-if (g_value_get_boolean (value))
-midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION (
-_action_by_name (browser, Location)), 
browser-search_engines);
-else
-midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION (
-_action_by_name (browser, Location)), NULL);
+/* Do nothing */
 }
 else if (name == g_intern_string (location-entry-search))
 {
@@ -6835,13 +6830,6 @@ midori_browser_set_property (GObject*  object,
 
 /* FIXME: Disconnect handlers */
 katze_object_assign (browser-search_engines, g_value_dup_object 
(value));
-if (katze_object_get_boolean (browser-settings,
-  search-engines-in-completion))
-midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION (
-_action_by_name (browser, Location)), 
browser-search_engines);
-else
-midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION (
-_action_by_name (browser, Location)), NULL);
 midori_search_action_set_search_engines (MIDORI_SEARCH_ACTION (
 _action_by_name (browser, Search)), browser-search_engines);
 /* FIXME: Connect to updates */
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 910f8cd..c353b92 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -29,7 +29,6 @@ struct _MidoriLocationAction
 
 gchar* text;
 gchar* uri;
-KatzeArray* search_engines;
 gdouble progress;
 gchar* secondary_icon;
 
@@ -361,7 +360,6 @@ static void
 midori_location_action_init (MidoriLocationAction* location_action)
 {
 location_action-text = location_action-uri = NULL;
-location_action-search_engines = NULL;
 location_action-progress = 0.0;
 location_action-secondary_icon = NULL;
 location_action-default_icon = NULL;
@@ -384,7 +382,6 @@ midori_location_action_finalize (GObject* object)
 
 katze_assign (location_action-text, NULL);
 katze_assign (location_action-uri, NULL);
-katze_assign (location_action-search_engines, NULL);
 
 katze_object_assign (location_action-model, NULL);
 katze_object_assign (location_action-filter_model, NULL);
@@ -980,48 +977,6 @@ midori_location_entry_match_selected_cb 
(GtkEntryCompletion*   completion,
 }
 
 static void
-midori_location_entry_action_activated_cb (GtkEntryCompletion*   completion,
-   gint  action,
-   MidoriLocationAction* 
location_action)
-{
-if (location_action-search_engines)
-{
-KatzeItem* item = katze_array_get_nth_item (
-location_action-search_engines, action);
-GtkWidget* entry = gtk_entry_completion_get_entry (completion);
-const gchar* keywords = gtk_entry_get_text (GTK_ENTRY (entry));
-const gchar* uri = katze_item_get_uri (item);
-gchar* search;
-if (!item)
-return;
-search = sokoke_search_uri (uri, keywords);
-midori_location_action_set_text (location_action, search);
-g_signal_emit (location_action, signals[SUBMIT_URI], 0, search, FALSE);
-g_free (search);
-}
-}
-
-static void
-midori_location_action_add_actions (GtkEntryCompletion* completion,
-KatzeArray* search_engines)
-{
-guint i;
-KatzeItem* item;
-
-if (!search_engines)
-return;
-
-i = 0;
-while ((item = katze_array_get_nth_item (search_engines, i)))
-{
-gchar* text = g_strdup_printf (_(Search with %s),
-katze_item_get_name (item));
-gtk_entry_completion_insert_action_text (completion, i++, text);
-g_free (text);
-}
-}
-
-static void

[Xfce4-commits] midori:master Implement completion with live sqlite queries

2010-01-17 Thread Christian Dywan

Updating branch refs/heads/master
 to c99921022f769717ecda1319c7b555b04f3045d2 (commit)
   from 07261e284ca773da88c46d52c213a68d5fa5e152 (commit)

commit c99921022f769717ecda1319c7b555b04f3045d2
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Jan 17 18:12:28 2010 +0100

Implement completion with live sqlite queries

If sqlite is available, we can directly query results from the
database and populate our model on the fly.

 midori/main.c  |1 +
 midori/midori-locationaction.c |   69 +++-
 2 files changed, 69 insertions(+), 1 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 95b132b..94402ab 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1918,6 +1918,7 @@ main (intargc,
 _(The history couldn't be loaded: %s\n), errmsg);
 g_free (errmsg);
 }
+g_object_set_data (G_OBJECT (history), db, db);
 #endif
 
 /* In case of errors */
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index b2314e1..1d962e9 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -21,6 +21,10 @@
 #include glib/gi18n.h
 #include gdk/gdkkeysyms.h
 
+#if HAVE_SQLITE
+#include sqlite3.h
+#endif
+
 #define COMPLETION_DELAY 150
 #define MAX_ITEMS 25
 
@@ -116,10 +120,12 @@ static void
 midori_location_action_disconnect_proxy (GtkAction* action,
  GtkWidget* proxy);
 
+#if !HAVE_SQLITE
 static gboolean
 midori_location_entry_completion_match_cb (GtkTreeModel* model,
GtkTreeIter*  iter,
gpointer  data);
+#endif
 
 static void
 midori_location_entry_render_text_cb (GtkCellLayout*   layout,
@@ -302,6 +308,13 @@ midori_location_action_popup_timeout_cb (gpointer data)
 MidoriLocationAction* action = data;
 static GtkTreeModel* model = NULL;
 GtkTreeViewColumn* column;
+#if HAVE_SQLITE
+GtkListStore* store;
+sqlite3* db;
+gchar* query;
+gint result;
+sqlite3_stmt* statement;
+#endif
 gint matches, height, screen_height;
 
 if (G_UNLIKELY (!action-popup))
@@ -311,9 +324,13 @@ midori_location_action_popup_timeout_cb (gpointer data)
 GtkWidget* treeview;
 GtkCellRenderer* renderer;
 
+#if HAVE_SQLITE
+model = midori_location_action_create_model ();
+#else
 model = gtk_tree_model_filter_new (action-model, NULL);
 gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (model),
 midori_location_entry_completion_match_cb, action, NULL);
+#endif
 action-completion_model = model;
 
 popup = gtk_window_new (GTK_WINDOW_POPUP);
@@ -352,11 +369,53 @@ midori_location_action_popup_timeout_cb (gpointer data)
 if (!*action-key)
 {
 const gchar* uri = gtk_entry_get_text (GTK_ENTRY (action-entry));
+#if HAVE_SQLITE
+katze_assign (action-key, g_strdup (uri));
+#else
 katze_assign (action-key, katze_collfold (uri));
+#endif
 }
 
+#if HAVE_SQLITE
+store = GTK_LIST_STORE (model);
+gtk_list_store_clear (store);
+
+db = g_object_get_data (G_OBJECT (action-history), db);
+/* FIXME: Consider keeping the prepared statement with '...LIKE ?...'
+and prepending/ appending % to the key. */
+query = sqlite3_mprintf (SELECT DISTINCT uri, title FROM history WHERE 
+ uri LIKE '%%%q%%' OR title LIKE '%%%q%%'
+ ORDER BY day LIMIT %d,
+ action-key, action-key, MAX_ITEMS);
+result = sqlite3_prepare_v2 (db, query, -1, statement, NULL);
+sqlite3_free (query);
+matches = 0;
+if (result == SQLITE_OK)
+{
+while ((result = sqlite3_step (statement)) == SQLITE_ROW)
+{
+const unsigned char* uri = sqlite3_column_text (statement, 0);
+const unsigned char* title = sqlite3_column_text (statement, 1);
+GdkPixbuf* icon = katze_load_cached_icon ((gchar*)uri, NULL);
+if (!icon)
+icon = action-default_icon;
+gtk_list_store_insert_with_values (store, NULL, 0,
+URI_COL, uri, TITLE_COL, title, YALIGN_COL, 0.25,
+FAVICON_COL, icon, -1);
+matches++;
+}
+if (result != SQLITE_DONE)
+g_print (_(Failed to execute database statement: %s\n),
+ sqlite3_errmsg (db));
+sqlite3_finalize (statement);
+}
+else
+g_print (_(Failed to execute database statement: %s\n),
+ sqlite3_errmsg (db));
+#else
 gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
 matches = gtk_tree_model_iter_n_children (model, NULL);
+#endif
 /* TODO: Suggest _(Search with %s) or opening hostname as actions */
 
 if

[Xfce4-commits] midori:master Re-implement location action with our own completion popup

2010-01-17 Thread Christian Dywan

Updating branch refs/heads/master
 to 07261e284ca773da88c46d52c213a68d5fa5e152 (commit)
   from 27634e4f1ecc9eac678251ad1cb3b7e2d27569b1 (commit)

commit 07261e284ca773da88c46d52c213a68d5fa5e152
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Jan 17 17:45:34 2010 +0100

Re-implement location action with our own completion popup

Completion is triggered on key press only, with a delay of 150ms.

Completion can be triggered by input method usage.

The popup size adjusts to the entry size and closes if focus is lost.

 midori/midori-locationaction.c |  398 ++--
 1 files changed, 301 insertions(+), 97 deletions(-)

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index c353b92..b2314e1 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -21,6 +21,7 @@
 #include glib/gi18n.h
 #include gdk/gdkkeysyms.h
 
+#define COMPLETION_DELAY 150
 #define MAX_ITEMS 25
 
 struct _MidoriLocationAction
@@ -34,6 +35,12 @@ struct _MidoriLocationAction
 
 GtkTreeModel* model;
 GtkTreeModel* filter_model;
+guint completion_timeout;
+gchar* key;
+GtkWidget* popup;
+GtkWidget* treeview;
+GtkTreeModel* completion_model;
+GtkWidget* entry;
 GdkPixbuf* default_icon;
 GHashTable* items;
 KatzeNet* net;
@@ -109,9 +116,17 @@ static void
 midori_location_action_disconnect_proxy (GtkAction* action,
  GtkWidget* proxy);
 
+static gboolean
+midori_location_entry_completion_match_cb (GtkTreeModel* model,
+   GtkTreeIter*  iter,
+   gpointer  data);
+
 static void
-midori_location_action_completion_init (MidoriLocationAction* location_action,
-GtkEntry* entry);
+midori_location_entry_render_text_cb (GtkCellLayout*   layout,
+  GtkCellRenderer* renderer,
+  GtkTreeModel*model,
+  GtkTreeIter* iter,
+  gpointer data);
 
 static void
 midori_location_action_class_init (MidoriLocationActionClass* class)
@@ -247,6 +262,153 @@ midori_location_action_class_init 
(MidoriLocationActionClass* class)
  style \midori-location-entry-style\\n);
 }
 
+static GtkTreeModel*
+midori_location_action_create_model (void)
+{
+GtkTreeModel* model = (GtkTreeModel*) gtk_list_store_new (N_COLS,
+GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING,
+G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_FLOAT);
+return model;
+}
+
+static void
+midori_location_action_popup_position (GtkWidget* popup,
+   GtkWidget* widget)
+{
+gint wx, wy;
+GtkRequisition menu_req;
+GtkRequisition widget_req;
+
+if (GTK_WIDGET_NO_WINDOW (widget))
+{
+gdk_window_get_position (widget-window, wx, wy);
+wx += widget-allocation.x;
+wy += widget-allocation.y;
+}
+else
+gdk_window_get_origin (widget-window, wx, wy);
+gtk_widget_size_request (popup, menu_req);
+gtk_widget_size_request (widget, widget_req);
+
+gtk_window_move (GTK_WINDOW (popup),
+wx, wy + widget_req.height);
+gtk_window_resize (GTK_WINDOW (popup),
+widget-allocation.width, 1);
+}
+
+static gboolean
+midori_location_action_popup_timeout_cb (gpointer data)
+{
+MidoriLocationAction* action = data;
+static GtkTreeModel* model = NULL;
+GtkTreeViewColumn* column;
+gint matches, height, screen_height;
+
+if (G_UNLIKELY (!action-popup))
+{
+GtkWidget* popup;
+GtkWidget* scrolled;
+GtkWidget* treeview;
+GtkCellRenderer* renderer;
+
+model = gtk_tree_model_filter_new (action-model, NULL);
+gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (model),
+midori_location_entry_completion_match_cb, action, NULL);
+action-completion_model = model;
+
+popup = gtk_window_new (GTK_WINDOW_POPUP);
+gtk_window_set_type_hint (GTK_WINDOW (popup), 
GDK_WINDOW_TYPE_HINT_COMBO);
+scrolled = g_object_new (GTK_TYPE_SCROLLED_WINDOW,
+hscrollbar-policy, GTK_POLICY_NEVER,
+vscrollbar-policy, GTK_POLICY_AUTOMATIC, NULL);
+gtk_container_add (GTK_CONTAINER (popup), scrolled);
+treeview = gtk_tree_view_new_with_model (model);
+gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
+gtk_container_add (GTK_CONTAINER (scrolled), treeview);
+/* FIXME: Handle button presses and hovering rows */
+action-treeview = treeview;
+
+column = gtk_tree_view_column_new ();
+renderer = gtk_cell_renderer_pixbuf_new ();
+gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), renderer,

[Xfce4-commits] midori:master Simpler element hiding and some adblock optimizations

2010-01-17 Thread Christian Dywan

Updating branch refs/heads/master
 to 57865955dcfb7d29657de6bbe36c9d1e28de9a57 (commit)
   from c99921022f769717ecda1319c7b555b04f3045d2 (commit)

commit 57865955dcfb7d29657de6bbe36c9d1e28de9a57
Author: Alexander Butenko a.bute...@gmail.com
Date:   Sun Jan 17 18:28:11 2010 +0100

Simpler element hiding and some adblock optimizations

1. Less hungry and simpler blocked element hider

2. We are now also adding a context menuitem for uris in
preparation for creating rules from the web inspector

3. Removed old hack for blocked element hider

4. Element hider javascript fixes

5. Unit test for small sized rules

6. Removed unneeded WebKitWebView casts

 extensions/adblock.c |  125 +++---
 1 files changed, 78 insertions(+), 47 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index f89c16e..2550419 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -638,34 +638,52 @@ adblock_is_matched (const gchar*  opts,
 
 #if HAVE_WEBKIT_RESOURCE_REQUEST
 static gchar*
-adblock_prepare_urihider_js (const gchar* uri)
+adblock_prepare_urihider_js (GList* uris)
 {
+GList* li = NULL;
+gchar* out;
+gchar* cmd = g_strdup ();
+gchar* tmp;
 const char *js =
 (function() {
-function getElementsByAttribute (strTagName, strAttributeName, 
strAttributeValue) {
+function getElementsByAttribute (strTagName, strAttributeName, 
arrAttributeValue) {
 var arrElements = document.getElementsByTagName (strTagName);
 var arrReturnElements = new Array();
-for (var i=0; iarrElements.length; i++) {
-var oCurrent = arrElements[i];
-var oAttribute = oCurrent.getAttribute  
oCurrent.getAttribute (strAttributeName);
-if (oAttribute  oAttribute.length  0  
strAttributeValue.indexOf (oAttribute) != -1)
-arrReturnElements.push (oCurrent);
+for (var j=0; jarrAttributeValue.length; j++) {
+var strAttributeValue = arrAttributeValue[j];
+for (var i=0; iarrElements.length; i++) {
+ var oCurrent = arrElements[i];
+ var oAttribute = oCurrent.getAttribute  
oCurrent.getAttribute (strAttributeName);
+ if (oAttribute  oAttribute.length  0  
strAttributeValue.indexOf (oAttribute) != -1)
+ arrReturnElements.push (oCurrent);
+}
 }
 return arrReturnElements;
-}
-function hideElementBySrc (strUri) {
-var oElements = getElementsByAttribute('img', 'src', strUri);
+};
+function hideElementBySrc (uris) {
+var oElements = getElementsByAttribute('img', 'src', uris);
 if (oElements.length == 0)
-oElements = getElementsByAttribute ('iframe', 'src', strUri);
+oElements = getElementsByAttribute ('iframe', 'src', uris);
 for (var i=0; ioElements.length; i++) {
 oElements[i].style.visibility = 'hidden !important';
 oElements[i].style.width = '0';
 oElements[i].style.height = '0';
 }
-}
-hideElementBySrc ('%s');
-})();
-return g_strdup_printf (js, uri);
+};
+var uris=new Array ();
+%s
+hideElementBySrc (uris);
+})();;
+
+for (li = uris; li != NULL; li = g_list_next (li))
+{
+tmp = g_strdup_printf (uris.push ('%s');%s, (gchar*)li-data, cmd);
+katze_assign (cmd, tmp);
+}
+out = g_strdup_printf (js, cmd);
+g_free (cmd);
+
+return out;
 }
 
 static void
@@ -677,6 +695,7 @@ adblock_resource_request_starting_cb (WebKitWebView*
 web_view,
   GtkWidget* image)
 {
 SoupMessage* msg;
+GList* blocked_uris;
 const gchar* req_uri;
 const char *page_uri;
 
@@ -701,19 +720,10 @@ adblock_resource_request_starting_cb (WebKitWebView*  
   web_view,
 /* TODO: opts should be defined */
 if (adblock_is_matched (NULL, req_uri, page_uri))
 {
-gchar* script = adblock_prepare_urihider_js (req_uri);
-JSContextRef js_context = webkit_web_frame_get_global_context 
(web_frame);
-WebKitWebFrame* main_frame;
-
+blocked_uris = g_object_get_data (G_OBJECT (web_view), blocked-uris);
+blocked_uris = g_list_prepend (blocked_uris, g_strdup (req_uri));
 webkit_network_request_set_uri (request, about:blank);
-sokoke_js_script_eval (js_context, script, NULL);
-main_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW 
(web_view));
-if (main_frame != web_frame)
-{
-js_context = webkit_web_frame_get_global_context (main_frame);
-sokoke_js_script_eval (js_context, script, NULL);
-}
-g_free

[Xfce4-commits] midori:master Use a tree model filter visible function to limit recent items

2010-01-17 Thread Christian Dywan

Updating branch refs/heads/master
 to 1f3313424f0b38bd3f8e62db9903e39d6547d879 (commit)
   from 57865955dcfb7d29657de6bbe36c9d1e28de9a57 (commit)

commit 1f3313424f0b38bd3f8e62db9903e39d6547d879
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Jan 17 22:36:44 2010 +0100

Use a tree model filter visible function to limit recent items

 midori/midori-locationaction.c |   62 +--
 1 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 1d962e9..3e2e4e2 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -122,9 +122,9 @@ midori_location_action_disconnect_proxy (GtkAction* action,
 
 #if !HAVE_SQLITE
 static gboolean
-midori_location_entry_completion_match_cb (GtkTreeModel* model,
-   GtkTreeIter*  iter,
-   gpointer  data);
+midori_location_action_filter_match_cb (GtkTreeModel* model,
+GtkTreeIter*  iter,
+gpointer  data);
 #endif
 
 static void
@@ -329,7 +329,7 @@ midori_location_action_popup_timeout_cb (gpointer data)
 #else
 model = gtk_tree_model_filter_new (action-model, NULL);
 gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (model),
-midori_location_entry_completion_match_cb, action, NULL);
+midori_location_action_filter_match_cb, action, NULL);
 #endif
 action-completion_model = model;
 
@@ -530,6 +530,18 @@ midori_location_action_freeze (MidoriLocationAction* 
location_action)
 g_hash_table_remove_all (location_action-items);
 }
 
+static gboolean
+midori_location_action_filter_recent_cb (GtkTreeModel* model,
+ GtkTreeIter*  iter,
+ gpointer  data)
+{
+GtkTreePath* path = gtk_tree_model_get_path (model, iter);
+gint* indices = gtk_tree_path_get_indices (path);
+gboolean visible = *indices  MAX_ITEMS;
+gtk_tree_path_free (path);
+return visible;
+}
+
 /**
  * midori_location_action_thaw:
  * @location_action: a #MidoriLocationAction
@@ -542,8 +554,6 @@ void
 midori_location_action_thaw (MidoriLocationAction* location_action)
 {
 GtkTreeModel* filter_model;
-GtkTreeIter iter;
-gint i;
 
 g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
 g_return_if_fail (midori_location_action_is_frozen (location_action));
@@ -553,18 +563,10 @@ midori_location_action_thaw (MidoriLocationAction* 
location_action)
 VISITS_COL, GTK_SORT_DESCENDING);
 
 filter_model = gtk_tree_model_filter_new (location_action-model, NULL);
-gtk_tree_model_filter_set_visible_column (
-GTK_TREE_MODEL_FILTER (filter_model), VISIBLE_COL);
-
+gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER 
(filter_model),
+midori_location_action_filter_recent_cb, location_action, NULL);
 location_action-filter_model = filter_model;
 midori_location_action_set_model (location_action, location_action-model);
-
-i = MAX_ITEMS;
-while (gtk_tree_model_iter_nth_child (location_action-model, iter, NULL, 
i++))
-{
-gtk_list_store_set (GTK_LIST_STORE (location_action-model),
-iter, VISIBLE_COL, FALSE, -1);
-}
 }
 
 static void
@@ -1126,9 +1128,9 @@ midori_location_action_match (GtkTreeModel* model,
 }
 
 static gboolean
-midori_location_entry_completion_match_cb (GtkTreeModel* model,
-   GtkTreeIter*  iter,
-   gpointer  data)
+midori_location_action_filter_match_cb (GtkTreeModel* model,
+GtkTreeIter*  iter,
+gpointer  data)
 {
 MidoriLocationAction* action = data;
 return midori_location_action_match (model, action-key, iter, data);
@@ -1228,7 +1230,6 @@ midori_location_action_set_item (MidoriLocationAction* 
location_action,
  gboolean  filter)
 {
 GtkTreeModel* model;
-GtkTreeModel* filter_model;
 GtkTreeIter iter;
 GdkPixbuf* new_icon;
 gint visits = 0;
@@ -1269,27 +1270,6 @@ midori_location_action_set_item (MidoriLocationAction* 
location_action,
 if (new_icon)
 gtk_list_store_set (GTK_LIST_STORE (model), iter,
 FAVICON_COL, new_icon, -1);
-
-if (filter)
-{
-filter_model = location_action-filter_model;
-
-if (filter_model)
-{
-GtkTreeIter idx;
-gint n;
-
-n = gtk_tree_model_iter_n_children (filter_model, NULL);
-if (n  MAX_ITEMS)
-{
-gtk_tree_model_iter_nth_child (filter_model, idx, NULL, n - 
1);
-

[Xfce4-commits] midori:master Read cache asynchronously, use GOutputStream, plug a leak

2010-01-17 Thread Christian Dywan

Updating branch refs/heads/master
 to 97a5eb0df2b48bfb0c359fb7abc6ee8f0b970238 (commit)
   from 1f3313424f0b38bd3f8e62db9903e39d6547d879 (commit)

commit 97a5eb0df2b48bfb0c359fb7abc6ee8f0b970238
Author: Alexander Butenko a.bute...@gmail.com
Date:   Sun Jan 17 22:49:13 2010 +0100

Read cache asynchronously, use GOutputStream, plug a leak

1. We are now reading from the cache asyncronously. Fixing UI freezes.

2. Cache writing switched to GOutputStream. One open/ close per file

3. Plugged a leak of cache headers in web_cache_message_rewrite ()

4. We don't need the URI in web_cache_mesage_got_headers_cb ()

 extensions/web-cache.c |  202 +---
 1 files changed, 123 insertions(+), 79 deletions(-)

diff --git a/extensions/web-cache.c b/extensions/web-cache.c
index df5b8ce..4e4d07c 100644
--- a/extensions/web-cache.c
+++ b/extensions/web-cache.c
@@ -41,6 +41,7 @@ web_cache_get_cached_path (MidoriExtension* extension,
 checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
 folder = g_strdup_printf (%c%c, checksum[0], checksum[1]);
 sub_path = g_build_path (G_DIR_SEPARATOR_S, cache_path, folder, NULL);
+/* FIXME: Wrong place? */
 katze_mkdir_with_parents (sub_path, 0700);
 g_free (folder);
 
@@ -87,6 +88,7 @@ web_cache_get_headers (gchar* filename)
 GHashTable* headers;
 FILE* file;
 gchar* dsc_filename;
+gchar line[128];
 
 if (!filename)
 return NULL;
@@ -100,45 +102,46 @@ web_cache_get_headers (gchar* filename)
(GDestroyNotify)g_free,
(GDestroyNotify)g_free);
 
-if ((file = g_fopen (dsc_filename, r)))
+if (!(file = g_fopen (dsc_filename, r)))
 {
-gchar line[128];
-while (fgets (line, 128, file))
-{
-gchar** data;
+g_hash_table_destroy (headers);
+g_free (dsc_filename);
+return NULL;
+}
+while (fgets (line, 128, file))
+{
+gchar** data;
 
-if (line == NULL)
-continue;
+if (line == NULL)
+continue;
 
-g_strchomp (line);
-data = g_strsplit (line, :, 2);
-if (data[0]  data[1])
-g_hash_table_insert (headers, g_strdup (data[0]),
- g_strdup (g_strchug (data[1])));
-g_strfreev (data);
-}
-fclose (file);
-g_free (dsc_filename);
-return headers;
+g_strchomp (line);
+data = g_strsplit (line, :, 2);
+if (data[0]  data[1])
+g_hash_table_insert (headers, g_strdup (data[0]),
+ g_strdup (g_strchug (data[1])));
+g_strfreev (data);
 }
-g_hash_table_destroy (headers);
+fclose (file);
 g_free (dsc_filename);
-return NULL;
+return headers;
 }
 
-static gboolean
+static GFile*
 web_cache_tmp_prepare (gchar* filename)
 {
-gchar* tmp_filename = g_strdup_printf (%s.tmp, filename);
+GFile *file;
 
+gchar* tmp_filename = g_strdup_printf (%s.tmp, filename);
 if (g_access (tmp_filename, F_OK) == 0)
 {
 g_free (tmp_filename);
-return FALSE;
+return NULL;
 }
-g_file_set_contents (tmp_filename, , -1, NULL);
+file = g_file_new_for_path (tmp_filename);
 g_free (tmp_filename);
-return TRUE;
+
+return file;
 }
 
 static void
@@ -146,27 +149,36 @@ web_cache_set_content_type (SoupMessage* msg,
 SoupBuffer*  buffer)
 {
 #if WEBKIT_CHECK_VERSION (1, 1, 15)
-const char *ct;
+gchar* sniffed_type;
 SoupContentSniffer* sniffer = soup_content_sniffer_new ();
-ct = soup_content_sniffer_sniff (sniffer, msg, buffer, NULL);
-if (!ct)
-ct = soup_message_headers_get_one (msg-response_headers, 
Content-Type);
-if (ct)
-g_signal_emit_by_name (msg, content-sniffed, ct, NULL);
+if ((sniffed_type = soup_content_sniffer_sniff (sniffer, msg, buffer, 
NULL)))
+{
+g_signal_emit_by_name (msg, content-sniffed, sniffed_type, NULL);
+g_free (sniffed_type);
+}
+else
+{
+const gchar* content_type = soup_message_headers_get_one (
+msg-response_headers, Content-Type);
+g_signal_emit_by_name (msg, content-sniffed, content_type, NULL);
+}
 #endif
 }
 
 static void
-web_cache_message_finished_cb (SoupMessage* msg,
-   gchar*   filename)
+web_cache_message_finished_cb (SoupMessage*   msg,
+   GOutputStream* stream)
 {
 gchar* headers;
 gchar* tmp_headers;
 gchar* tmp_data;
+gchar* filename;
 
+filename = g_object_get_data (G_OBJECT (stream), filename);
 headers = g_strdup_printf (%s.dsc, filename);
 tmp_headers = g_strdup_printf (%s.dsc.tmp, filename);
 tmp_data = g_strdup_printf (%s.tmp, filename);

[Xfce4-commits] gigolo:master And sort the list of available languages before writing them into the LINGUAS file

2010-01-17 Thread Enrico Tröger

Updating branch refs/heads/master
 to fe79d1bf25ac86d5472a1870196f6f72c750dd04 (commit)
   from e8e5b30a18d3bfac3f3b3a7e1d74f80add23f618 (commit)

commit fe79d1bf25ac86d5472a1870196f6f72c750dd04
Author: Enrico Tröger enr...@xfce.org
Date:   Sun Jan 17 18:53:45 2010 +0100

And sort the list of available languages before writing them into the 
LINGUAS file

This is not necessary at all but just nice

 wscript |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/wscript b/wscript
index 0889e7d..973841e 100644
--- a/wscript
+++ b/wscript
@@ -92,6 +92,7 @@ def write_linguas_file(self):
linguas = Build.bld.env['LINGUAS']
else:
files = os.listdir('%s/po' % self.path.abspath())
+   files.sort()
for f in files:
if f.endswith('.po'):
linguas += '%s ' % f[:-3]
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] gigolo:master Respect the LINGUAS environment variable when configuring the build system

2010-01-17 Thread Enrico Tröger

Updating branch refs/heads/master
 to e8e5b30a18d3bfac3f3b3a7e1d74f80add23f618 (commit)
   from c297ecf31ead7ce3b12c17767a2463af88744396 (commit)

commit e8e5b30a18d3bfac3f3b3a7e1d74f80add23f618
Author: Enrico Tröger enr...@xfce.org
Date:   Sun Jan 17 18:49:19 2010 +0100

Respect the LINGUAS environment variable when configuring the build system

 wscript |   14 ++
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/wscript b/wscript
index 1cfccc8..0889e7d 100644
--- a/wscript
+++ b/wscript
@@ -58,6 +58,9 @@ def configure(conf):
 
conf.write_config_header('config.h')
 
+   if 'LINGUAS' in os.environ:
+   conf.env['LINGUAS'] = os.environ['LINGUAS']
+
# debug flags
if Options.options.debug:
conf.env.append_value('CCFLAGS', '-g -O0 -DDEBUG '.split())
@@ -85,10 +88,13 @@ def set_options(opt):
 @feature('intltool_po')
 def write_linguas_file(self):
linguas = ''
-   files = os.listdir('%s/po' % self.path.abspath())
-   for f in files:
-   if f.endswith('.po'):
-   linguas += '%s ' % f[:-3]
+   if 'LINGUAS' in Build.bld.env:
+   linguas = Build.bld.env['LINGUAS']
+   else:
+   files = os.listdir('%s/po' % self.path.abspath())
+   for f in files:
+   if f.endswith('.po'):
+   linguas += '%s ' % f[:-3]
f = open(po/LINGUAS, w)
f.write('# This file is autogenerated. Do not edit.\n%s\n' % linguas)
f.close()
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] gigolo:master Respect the LINGUAS environment variable when configuring the build system

2010-01-17 Thread Enrico Tröger

Updating branch refs/heads/master
 to 0ec84f42a1dc3184cab04348b9b0147d95bc4203 (commit)
   from fe79d1bf25ac86d5472a1870196f6f72c750dd04 (commit)

commit 0ec84f42a1dc3184cab04348b9b0147d95bc4203
Author: Enrico Tröger enr...@xfce.org
Date:   Sun Jan 17 19:03:59 2010 +0100

Respect the LINGUAS environment variable when configuring the build system

This time for the autotools based build

 configure.ac |   11 ---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index b813474..4ac4b65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,10 +37,15 @@ GETTEXT_PACKAGE=gigolo
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, $GETTEXT_PACKAGE, [Gettext package.])
 
-if test -z $conf_dir ; then
-   conf_dir=.
+if [ ${LINGUAS} ]
+then
+   ALL_LINGUAS=${LINGUAS}
+else
+   if test -z $conf_dir ; then
+   conf_dir=.
+   fi
+   ALL_LINGUAS=`cd $conf_dir/po 2/dev/null  ls *.po 2/dev/null | 
$AWK 'BEGIN { FS=.; ORS=  } { print $1 }'`
 fi
-ALL_LINGUAS=`cd $conf_dir/po 2/dev/null  ls *.po 2/dev/null | $AWK 
'BEGIN { FS=.; ORS=  } { print $1 }'`
 
 AM_GLIB_GNU_GETTEXT
 # workaround for intltool bug 
(http://bugzilla.gnome.org/show_bug.cgi?id=490845)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] gigolo:master Expand tilde in folder names if a username is set for the bookmark

2010-01-17 Thread Enrico Tröger

Updating branch refs/heads/master
 to 7904194c58633270be180e54f660dc62aea778a1 (commit)
   from 0ec84f42a1dc3184cab04348b9b0147d95bc4203 (commit)

commit 7904194c58633270be180e54f660dc62aea778a1
Author: Enrico Tröger enr...@xfce.org
Date:   Sun Jan 17 23:58:16 2010 +0100

Expand tilde in folder names if a username is set for the bookmark

 src/bookmark.c   |   19 +++
 src/bookmark.h   |1 +
 src/bookmarkeditdialog.c |2 --
 src/window.c |   12 ++--
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/bookmark.c b/src/bookmark.c
index 12c701f..9df9282 100644
--- a/src/bookmark.c
+++ b/src/bookmark.c
@@ -430,6 +430,25 @@ const gchar *gigolo_bookmark_get_folder(GigoloBookmark 
*bookmark)
 }
 
 
+gchar *gigolo_bookmark_get_folder_expanded(GigoloBookmark *bookmark)
+{
+   const gchar *folder;
+   const gchar *username;
+   gchar *result;
+
+   g_return_val_if_fail(bookmark != NULL, NULL);
+
+   folder = GIGOLO_BOOKMARK_GET_PRIVATE(bookmark)-folder;
+   username = gigolo_bookmark_get_user(bookmark);
+   if (NZV(folder)  username  folder[0] == '~')
+   result = g_strconcat(/home/, username, folder + 1, NULL);
+   else
+   result = g_strdup(folder);
+
+   return result;
+}
+
+
 void gigolo_bookmark_set_folder(GigoloBookmark *bookmark, const gchar *folder)
 {
GigoloBookmarkPrivate *priv;
diff --git a/src/bookmark.h b/src/bookmark.h
index 4c8ca56..7b82bd9 100644
--- a/src/bookmark.h
+++ b/src/bookmark.h
@@ -67,6 +67,7 @@ void  gigolo_bookmark_set_host
(GigoloBookmark *bookmark, const gchar *host);
 
 const gchar*   gigolo_bookmark_get_folder  (GigoloBookmark 
*bookmark);
 void   gigolo_bookmark_set_folder  
(GigoloBookmark *bookmark, const gchar *folder);
+gchar* 
gigolo_bookmark_get_folder_expanded(GigoloBookmark *bookmark);
 
 const gchar*   gigolo_bookmark_get_path(GigoloBookmark 
*bookmark);
 void   gigolo_bookmark_set_path
(GigoloBookmark *bookmark, const gchar *path);
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 3b1bf29..1b1398d 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -276,7 +276,6 @@ gint 
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (tmp[0] == '/')
{   /* remove leading slashes */

gtk_entry_set_text(GTK_ENTRY(priv-path_entry), tmp + 1);
-
}
}
if (! error  gtk_widget_get_parent(priv-share_entry) 
!= NULL)
@@ -285,7 +284,6 @@ gint 
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (tmp[0] == '/')
{   /* remove leading slashes */

gtk_entry_set_text(GTK_ENTRY(priv-share_entry), tmp + 1);
-
}
}
if (! error)
diff --git a/src/window.c b/src/window.c
index f9b5a93..d5decd4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -500,7 +500,11 @@ static void action_copy_uri_cb(G_GNUC_UNUSED GtkAction 
*action, GigoloWindow *wi
 
b = gigolo_settings_get_bookmark_by_uri(priv-settings, 
uri);
if (b != NULL)
-   setptr(uri, g_build_filename(uri, 
gigolo_bookmark_get_folder(b), NULL));
+   {
+   gchar *folder = 
gigolo_bookmark_get_folder_expanded(b);
+   setptr(uri, g_build_filename(uri, folder, 
NULL));
+   g_free(folder);
+   }
 

gtk_clipboard_set_text(gtk_clipboard_get(gdk_atom_intern(CLIPBOARD, FALSE)), 
uri, -1);
 
@@ -536,7 +540,11 @@ static void action_open_cb(G_GNUC_UNUSED GtkAction 
*action, GigoloWindow *window
gigolo_backend_gvfs_get_name_and_uri_from_mount(mnt, 
NULL, uri);
b = gigolo_settings_get_bookmark_by_uri(priv-settings, 
uri);
if (b != NULL)
-   setptr(uri, g_build_filename(uri, 
gigolo_bookmark_get_folder(b), NULL));
+   {
+   gchar *folder = 
gigolo_bookmark_get_folder_expanded(b);
+   setptr(uri, g_build_filename(uri, folder, 
NULL));
+   g_free(folder);
+   }
/* escape spaces and similar */
setptr(uri, g_uri_unescape_string(uri, 
G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO));

[Xfce4-commits] gigolo:master Show an error message dialog if the file-manager command failed to execute

2010-01-17 Thread Enrico Tröger

Updating branch refs/heads/master
 to a95036f97824c682ca2c10ed3deb99195ed3c4eb (commit)
   from 7904194c58633270be180e54f660dc62aea778a1 (commit)

commit a95036f97824c682ca2c10ed3deb99195ed3c4eb
Author: Enrico Tröger enr...@xfce.org
Date:   Sun Jan 17 23:59:00 2010 +0100

Show an error message dialog if the file-manager command failed to execute

 src/window.c |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/window.c b/src/window.c
index d5decd4..00a1b28 100644
--- a/src/window.c
+++ b/src/window.c
@@ -551,8 +551,11 @@ static void action_open_cb(G_GNUC_UNUSED GtkAction 
*action, GigoloWindow *window
cmd = g_strconcat(file_manager,  \, uri, \, NULL);
if (! g_spawn_command_line_async(cmd, error))
{
-   verbose(%s, error-message);
+   gchar *msg = g_strdup_printf(_(The command 
'%s' failed), cmd);
+   gigolo_message_dialog((gpointer) window, 
GTK_MESSAGE_ERROR, _(Error), msg, error-message);
+   verbose(%s: %s, msg, error-message);
g_error_free(error);
+   g_free(msg);
}
 
g_free(cmd);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] gigolo:master Fix a stupid typo which causes lots of unnecessary casts

2010-01-17 Thread Enrico Tröger

Updating branch refs/heads/master
 to a4bc10567790f71920d7286f6f791db585d55677 (commit)
   from a95036f97824c682ca2c10ed3deb99195ed3c4eb (commit)

commit a4bc10567790f71920d7286f6f791db585d55677
Author: Enrico Tröger enr...@xfce.org
Date:   Mon Jan 18 00:02:27 2010 +0100

Fix a stupid typo which causes lots of unnecessary casts

 src/bookmarkeditdialog.c |   10 +-
 src/common.c |2 +-
 src/common.h |2 +-
 src/window.c |4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 1b1398d..2931b82 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -211,7 +211,7 @@ gint 
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
-   gigolo_message_dialog((gpointer)dialog, 
GTK_MESSAGE_ERROR, _(Error),
+   gigolo_message_dialog(dialog, 
GTK_MESSAGE_ERROR, _(Error),
_(You must enter a name for 
the bookmark.), NULL);
gtk_widget_grab_focus(priv-name_entry);
}
@@ -230,7 +230,7 @@ gint 
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (gigolo_str_equal(tmp, 
gigolo_bookmark_get_name(bm)))
{
error = TRUE;
-   
gigolo_message_dialog((gpointer)dialog, GTK_MESSAGE_ERROR, _(Error),
+   
gigolo_message_dialog(dialog, GTK_MESSAGE_ERROR, _(Error),
_(The entered bookmark name is already in use. Please 
choose another one.), NULL);

gtk_widget_grab_focus(priv-name_entry);
}
@@ -243,7 +243,7 @@ gint 
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
-   gigolo_message_dialog((gpointer)dialog, 
GTK_MESSAGE_ERROR, _(Error),
+   gigolo_message_dialog(dialog, 
GTK_MESSAGE_ERROR, _(Error),
_(You must enter a server 
address or name.), NULL);
gtk_widget_grab_focus(priv-host_entry);
}
@@ -254,7 +254,7 @@ gint 
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
-   gigolo_message_dialog((gpointer)dialog, 
GTK_MESSAGE_ERROR, _(Error),
+   gigolo_message_dialog(dialog, 
GTK_MESSAGE_ERROR, _(Error),
_(You must enter a share 
name.), NULL);

gtk_widget_grab_focus(priv-share_combo);
}
@@ -265,7 +265,7 @@ gint 
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
if (! *tmp)
{
error = TRUE;
-   gigolo_message_dialog((gpointer)dialog, 
GTK_MESSAGE_ERROR, _(Error),
+   gigolo_message_dialog(dialog, 
GTK_MESSAGE_ERROR, _(Error),
_(You must enter a valid URI 
for the connection.), NULL);
gtk_widget_grab_focus(priv-uri_entry);
}
diff --git a/src/common.c b/src/common.c
index ebb6d2d..13ad491 100644
--- a/src/common.c
+++ b/src/common.c
@@ -149,7 +149,7 @@ gboolean gigolo_is_desktop_xfce(void)
 }
 
 
-gboolean gigolo_message_dialog(gpointer *parent, gint type, const gchar *title,
+gboolean gigolo_message_dialog(gpointer parent, gint type, const gchar *title,
   const gchar *text, 
const gchar *secondary)
 {
gboolean ret = FALSE;
diff --git a/src/common.h b/src/common.h
index 554e4ab..24a4e8e 100644
--- a/src/common.h
+++ b/src/common.h
@@ -58,7 +58,7 @@ void gigolo_show_uri(const gchar *uri);
 
 guint gigolo_get_default_port(const gchar *scheme);
 
-gboolean gigolo_message_dialog(gpointer *parent, gint type, const gchar *title,
+gboolean gigolo_message_dialog(gpointer parent, gint type, const gchar *title,

[Xfce4-commits] parole:master l10n: Updated Japanese (ja) translation to 100%

2010-01-17 Thread Transifex

Updating branch refs/heads/master
 to 898be529b0a71d0145844c54594579d67a329db8 (commit)
   from c54e5fc2cc583a5e2712b6bd4c3cb0ca758607c5 (commit)

commit 898be529b0a71d0145844c54594579d67a329db8
Author: Masato Hashimoto cabezon.hashim...@gmail.com
Date:   Mon Jan 18 08:54:09 2010 +0100

l10n: Updated Japanese (ja) translation to 100%

New status: 182 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/ja.po |  126 --
 1 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 3cef55c..2a8faa9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid 
 msgstr 
 Project-Id-Version: parole 0.1.90\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2009-12-11 00:26+0900\n
-PO-Revision-Date: 2009-12-11 00:27+0900\n
+POT-Creation-Date: 2010-01-18 16:52+0900\n
+PO-Revision-Date: 2010-01-18 16:52+0900\n
 Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n
 Language-Team: Japanese xfce-users...@ml.fdiary.net\n
 MIME-Version: 1.0\n
@@ -43,85 +43,93 @@ msgid Chapter Menu
 msgstr チャプターメニュー
 
 #: ../data/interfaces/parole.ui.h:7
+msgid DVD
+msgstr DVD
+
+#: ../data/interfaces/parole.ui.h:8
 msgid DVD Menu
 msgstr DVD メニュー
 
-#: ../data/interfaces/parole.ui.h:8
+#: ../data/interfaces/parole.ui.h:9
+msgid From ISO image
+msgstr ISO イメージから
+
+#: ../data/interfaces/parole.ui.h:10
 msgid Media player
 msgstr メディアプレーヤー
 
-#: ../data/interfaces/parole.ui.h:9
+#: ../data/interfaces/parole.ui.h:11
 msgid Mute
 msgstr ミュート
 
-#: ../data/interfaces/parole.ui.h:10 ../src/parole-player.c:1098
+#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:1198
 #: ../src/parole-disc-menu.c:113
 msgid Next Chapter
 msgstr 次のチャプター
 
-#: ../data/interfaces/parole.ui.h:11
+#: ../data/interfaces/parole.ui.h:13
 msgid None
 msgstr なし
 
-#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
+#: ../data/interfaces/parole.ui.h:14 ../data/desktop/parole.desktop.in.in.h:1
 #: ../src/parole-about.c:70 ../plugins/window-title/window-title-provider.c:58
 msgid Parole Media Player
 msgstr Parole Media Player
 
-#: ../data/interfaces/parole.ui.h:13
+#: ../data/interfaces/parole.ui.h:15
 msgid Plugins
 msgstr プラグイン
 
-#: ../data/interfaces/parole.ui.h:14 ../src/parole-player.c:1110
+#: ../data/interfaces/parole.ui.h:16 ../src/parole-player.c:1210
 #: ../src/parole-disc-menu.c:114
 msgid Previous Chapter
 msgstr 前のチャプター
 
-#: ../data/interfaces/parole.ui.h:15
+#: ../data/interfaces/parole.ui.h:17
 msgid Repeat
 msgstr 繰り返し
 
-#: ../data/interfaces/parole.ui.h:16
+#: ../data/interfaces/parole.ui.h:18
 msgid Select Track
 msgstr トラックの選択
 
-#: ../data/interfaces/parole.ui.h:17
+#: ../data/interfaces/parole.ui.h:19
 msgid Shuffle
 msgstr シャッフル
 
-#: ../data/interfaces/parole.ui.h:18
+#: ../data/interfaces/parole.ui.h:20
 msgid Sound
 msgstr サウンド
 
-#: ../data/interfaces/parole.ui.h:19
+#: ../data/interfaces/parole.ui.h:21
 msgid Square
 msgstr スクエア
 
-#: ../data/interfaces/parole.ui.h:20
+#: ../data/interfaces/parole.ui.h:22
 msgid Volume Down
 msgstr ボリュームを下げる
 
-#: ../data/interfaces/parole.ui.h:21
+#: ../data/interfaces/parole.ui.h:23
 msgid Volume Up
 msgstr ボリュームを上げる
 
-#: ../data/interfaces/parole.ui.h:22
+#: ../data/interfaces/parole.ui.h:24
 msgid _Edit
 msgstr 編集(_E)
 
-#: ../data/interfaces/parole.ui.h:23
+#: ../data/interfaces/parole.ui.h:25
 msgid _Help
 msgstr ヘルプ(_H)
 
-#: ../data/interfaces/parole.ui.h:24
+#: ../data/interfaces/parole.ui.h:26
 msgid _Media
 msgstr メディア(_M)
 
-#: ../data/interfaces/parole.ui.h:25
+#: ../data/interfaces/parole.ui.h:27
 msgid _Open location
 msgstr 場所を開く(_O)
 
-#: ../data/interfaces/parole.ui.h:26
+#: ../data/interfaces/parole.ui.h:28
 msgid _View
 msgstr 表示(_V)
 
@@ -233,22 +241,22 @@ msgstr 拡張子
 msgid Select File Types (By Extension)
 msgstr ファイルタイプの選択 (拡張子で)
 
-#: ../gst/parole-gst.c:1494
+#: ../gst/parole-gst.c:1511
 msgid The stream is taking too much time to load
 msgstr このストリームを読み込むにはかなり時間がかかります
 
-#: ../gst/parole-gst.c:1494
+#: ../gst/parole-gst.c:1511
 msgid Stop
 msgstr 停止
 
-#: ../gst/parole-gst.c:1683
+#: ../gst/parole-gst.c:1700
 msgid 
 Unable to load playbin GStreamer plugin, check your GStreamer installation
 msgstr 
 playbin GStreamer プラグインを読み込めません。GStreamer が正しくインストール
 されていることを確認してください。
 
-#: ../gst/parole-gst.c:1703
+#: ../gst/parole-gst.c:1720
 msgid 
 Unable to load video GStreamer plugin, check your GStreamer installation
 msgstr 
@@ -276,71 +284,71 @@ msgstr 
 Licensed under the GNU GPL.\n
 \n
 
-#: ../src/main.c:175
+#: ../src/main.c:187
 msgid Unknown argument 
 msgstr 不明な引数
 
-#: ../src/main.c:212
+#: ../src/main.c:224
 msgid Open a new instance
 msgstr 新しいインスタンスを開く
 
-#: ../src/main.c:213
+#: ../src/main.c:225
 msgid Do not load plugins
 msgstr プラグインをロードしない
 
-#: ../src/main.c:214
+#: ../src/main.c:226
 msgid Set Audio-CD/VCD/DVD device path
 msgstr 音楽 CD/VCD/DVD

[Xfce4-commits] www:master Fix the link to the Fedora Xfce Spin.

[Xfce4-commits] www:master Fix the size of the Slackware icon.

[Xfce4-commits] www:master Add a link to the build order in the development page.

[Xfce4-commits] gigolo:master l10n: Updated Czech (cs) translation to 100%

[Xfce4-commits] ristretto:master l10n: Updated Czech (cs) translation to 100%

[Xfce4-commits] xfswitch-plugin:master l10n: Updated Dutch (Flemish) (nl) translation to 66%

[Xfce4-commits] xfce4-appfinder:master l10n: Updated Dutch (Flemish) (nl) translation to 85%

[Xfce4-commits] xfce4-appfinder:xfce-4.6 l10n: Updated Dutch (Flemish) (nl) translation to 94%

[Xfce4-commits] xfce4-screenshooter:master l10n: Updated Dutch (Flemish) (nl) translation to 100%

[Xfce4-commits] xfce4-power-manager:master l10n: Updated Dutch (Flemish) (nl) translation to 32%

[Xfce4-commits] midori:master Add G_GNUC_CONST to all Katze type functions

[Xfce4-commits] midori:master Add G_GNUC_CONST to all Midori type functions

[Xfce4-commits] midori:master Use prepared statement to read history array instead of exec

[Xfce4-commits] midori:master Generate LINGUAS at buildtime and recognize LINGUAS variable

[Xfce4-commits] midori:master Remove 'Search engines in completion' functionality

[Xfce4-commits] midori:master Implement completion with live sqlite queries

[Xfce4-commits] midori:master Re-implement location action with our own completion popup

[Xfce4-commits] midori:master Simpler element hiding and some adblock optimizations

[Xfce4-commits] midori:master Use a tree model filter visible function to limit recent items

[Xfce4-commits] midori:master Read cache asynchronously, use GOutputStream, plug a leak

[Xfce4-commits] gigolo:master And sort the list of available languages before writing them into the LINGUAS file

[Xfce4-commits] gigolo:master Respect the LINGUAS environment variable when configuring the build system

[Xfce4-commits] gigolo:master Respect the LINGUAS environment variable when configuring the build system

[Xfce4-commits] gigolo:master Expand tilde in folder names if a username is set for the bookmark

[Xfce4-commits] gigolo:master Show an error message dialog if the file-manager command failed to execute

[Xfce4-commits] gigolo:master Fix a stupid typo which causes lots of unnecessary casts

[Xfce4-commits] parole:master l10n: Updated Japanese (ja) translation to 100%

27 matches

Site Navigation

Mail list logo

Footer information