[Xfce4-commits] Show opener or tab domain of download in dialog
Updating branch refs/heads/master to b97140d3fd6d0353ddc4ccbaac0600917cd6d88c (commit) from 5c26087e6272f1d0bc3d835ce901613e9d488a28 (commit) commit b97140d3fd6d0353ddc4ccbaac0600917cd6d88c Author: Christian Dywan Date: Fri Aug 10 18:51:30 2012 +0200 Show opener or tab domain of download in dialog An attacker may try to abuse the fact that a download can start on an unrelated tab. See http://lcamtuf.coredump.cx/fldl/ http://lcamtuf.coredump.cx/switch/ midori/midori-view.c | 21 ++--- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index d4d56ea..4d7ffe7 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3127,6 +3127,8 @@ webkit_web_view_create_web_view_cb (GtkWidget* web_view, g_signal_connect (new_view->web_view, "web-view-ready", G_CALLBACK (webkit_web_view_web_view_ready_cb), view); } +g_object_set_data_full (G_OBJECT (new_view), "opener-uri", +g_strdup (webkit_web_frame_get_uri (web_frame)), g_free); return new_view->web_view; } @@ -3172,10 +3174,11 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view, WebKitDownload* download, MidoriView* view) { +gchar* opener_uri; +gchar* hostname; GtkWidget* dialog; gchar* content_type; gchar* description; -gchar* name; WebKitWebFrame* web_frame; gchar* mime_type; WebKitWebDataSource* datasource; @@ -3189,9 +3192,14 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view, gint response; gboolean handled; -dialog = gtk_message_dialog_new ( -NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, -_("Open or download file")); +/* Opener may differ from displaying view: + http://lcamtuf.coredump.cx/fldl/ http://lcamtuf.coredump.cx/switch/ */ +opener_uri = g_object_get_data (G_OBJECT (view), "opener-uri"); +hostname = midori_uri_parse_hostname ( +opener_uri ? opener_uri : midori_view_get_display_uri (view), NULL); +dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, +_("Open or download file from %s"), hostname); +g_free (hostname); mime_type = g_object_get_data (G_OBJECT (view), "download-mime-type"); request = webkit_download_get_network_request (download); if (mime_type != NULL) @@ -3214,10 +3222,9 @@ webkit_web_view_download_requested_cb (GtkWidget* web_view, g_free (content_type); details = g_string_sized_new (20 * 4); -name = sokoke_get_download_filename (download); -g_string_append_printf (details, _("File Name: %s"), name); +g_string_append_printf (details, _("File Name: %s"), +webkit_download_get_suggested_filename (download)); g_string_append_c (details, '\n'); -g_free (name); if (g_strrstr (description, mime_type)) g_string_append_printf (details, _("File Type: '%s'"), mime_type); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Return no search engine if there's no form
Updating branch refs/heads/master to 5c26087e6272f1d0bc3d835ce901613e9d488a28 (commit) from cb7e28b11fdd1e889e2a171f0282143d75cbd3fe (commit) commit 5c26087e6272f1d0bc3d835ce901613e9d488a28 Author: Paweł Forysiuk Date: Fri Aug 10 18:46:41 2012 +0200 Return no search engine if there's no form Such as http://valadoc.org/#!wiki=index midori/midori-view.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 4fd9ce3..d4d56ea 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2471,6 +2471,10 @@ midori_view_search_engine_for_form (MidoriView*view, active_element = webkit_dom_html_document_get_active_element ((WebKitDOMHTMLDocument*)doc); active_form = webkit_dom_html_input_element_get_form ((WebKitDOMHTMLInputElement*)active_element); + +if (!active_form) +return NULL; + token_element = webkit_dom_element_get_attribute (active_element, "name"); form_nodes = webkit_dom_html_form_element_get_elements (active_form); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Korean (ko) translation to 100%
Updating branch refs/heads/master to 414d5828c4177872480378a4f9b2c00e0cab0d75 (commit) from b66a5934ed4b17026dbb179caf404461d8e86ebb (commit) commit 414d5828c4177872480378a4f9b2c00e0cab0d75 Author: Seong-ho Cho Date: Fri Aug 10 17:55:00 2012 +0200 l10n: Updated Korean (ko) translation to 100% New status: 185 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ko.po | 136 -- 1 files changed, 70 insertions(+), 66 deletions(-) diff --git a/po/ko.po b/po/ko.po index 52fa000..ffc5b96 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: parole.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-29 18:45+\n" -"PO-Revision-Date: 2012-07-30 04:34+0900\n" +"POT-Creation-Date: 2012-08-10 14:18+\n" +"PO-Revision-Date: 2012-08-11 00:54+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: xfce4-users-kr-i18n \n" "Language: ko\n" @@ -51,41 +51,40 @@ msgid "Buffering (0%)" msgstr "버퍼링(0%)" #: ../data/interfaces/parole.ui.h:9 -#: ../src/parole-player.c:645 +#: ../src/parole-player.c:663 msgid "Empty" msgstr "비어 있음" #: ../data/interfaces/parole.ui.h:10 +#: ../src/parole-disc.c:125 +msgid "Insert Disc" +msgstr "디스크를 삽입하십시오" + +#: ../data/interfaces/parole.ui.h:11 msgid "Languages" msgstr "언어" -#: ../data/interfaces/parole.ui.h:11 +#: ../data/interfaces/parole.ui.h:12 msgid "Media player" msgstr "미디어 재생기" -#: ../data/interfaces/parole.ui.h:12 +#: ../data/interfaces/parole.ui.h:13 msgid "None" msgstr "없음" -#: ../data/interfaces/parole.ui.h:13 +#: ../data/interfaces/parole.ui.h:14 msgid "Open _location" msgstr "위치 열기(_L)" -#: ../data/interfaces/parole.ui.h:14 +#: ../data/interfaces/parole.ui.h:15 #: ../src/parole-about.c:55 msgid "Parole Media Player" msgstr "빠롤 미디어 재생기" -#: ../data/interfaces/parole.ui.h:15 +#: ../data/interfaces/parole.ui.h:16 msgid "Pl_ugins" msgstr "플러그인(_U)" -#: ../data/interfaces/parole.ui.h:16 -#: ../src/parole-disc.c:218 -#: ../src/parole-disc.c:270 -msgid "Play Disc" -msgstr "디스크 재생" - #: ../data/interfaces/parole.ui.h:17 msgid "Select Text Subtitles..." msgstr "텍스트 자막을 선택하십시오..." @@ -331,35 +330,35 @@ msgstr "메시지" msgid "Error" msgstr "오류" -#: ../src/gst/parole-gst.c:1495 +#: ../src/gst/parole-gst.c:1493 msgid "Stop" msgstr "멈춤" -#: ../src/gst/parole-gst.c:1496 +#: ../src/gst/parole-gst.c:1494 msgid "The stream is taking too much time to load" msgstr "스트림을 불러오는데 너무나 많은 시간이 걸립니다" -#: ../src/gst/parole-gst.c:1665 +#: ../src/gst/parole-gst.c:1663 msgid "Unable to load playbin GStreamer plugin, check your GStreamer installation" msgstr "채플레이빈 GStreamer 플러그인을 불러올 수 없습니다. GStreamer를 설치했는지 확인하십시오" -#: ../src/gst/parole-gst.c:1689 +#: ../src/gst/parole-gst.c:1687 msgid "Unable to load video GStreamer plugin, check your GStreamer installation" msgstr "동영상 GStreamer 플러그인을 불러올 수 없습니다. GStreamer를 설치했는지 확인하십시오" -#: ../src/gst/parole-gst.c:2223 -#: ../src/gst/parole-gst.c:2227 +#: ../src/gst/parole-gst.c:2244 +#: ../src/gst/parole-gst.c:2248 #, c-format msgid "Audio Track #%d" msgstr "%d번 트랙" -#: ../src/gst/parole-gst.c:2255 -#: ../src/gst/parole-gst.c:2259 +#: ../src/gst/parole-gst.c:2276 +#: ../src/gst/parole-gst.c:2280 #, c-format msgid "Subtitle #%d" msgstr "%d번 자막" -#: ../src/main.c:55 +#: ../src/main.c:56 #, c-format msgid "" "\n" @@ -380,108 +379,108 @@ msgstr "" "GNU GPL라이선스를 따릅니다.\n" "\n" -#: ../src/main.c:188 +#: ../src/main.c:189 msgid "Unknown argument " msgstr "알 수 없는 인자" -#: ../src/main.c:226 +#: ../src/main.c:227 msgid "Open a new instance" msgstr "새 인스턴스 열기" -#: ../src/main.c:227 +#: ../src/main.c:228 msgid "Do not load plugins" msgstr "플러그인 불러오지 않음" -#: ../src/main.c:228 +#: ../src/main.c:229 msgid "Set Audio-CD/VCD/DVD device path" msgstr "Audio-CD/VCD/DVD 장치 경로 설정" -#: ../src/main.c:229 +#: ../src/main.c:230 msgid "Play or pause if already playing" msgstr "이미 재생중이라면 재생 또는 일시정지 하기" -#: ../src/main.c:230 +#: ../src/main.c:231 msgid "Stop playing" msgstr "재생 정지" -#: ../src/main.c:231 +#: ../src/main.c:232 msgid "Next track" msgstr "다음 트랙" -#: ../src/main.c:232 +#: ../src/main.c:233 msgid "Previous track" msgstr "이전 트랙" -#: ../src/main.c:233 +#: ../src/main.c:234 msgid "Seek forward" msgstr "이후 탐색" -#: ../src/main.c:234 +#: ../src/main.c:235 msgid "Seek Backward" msgstr "이전 탐색" -#: ../src/main.c:235 +#: ../src/main.c:236 msgid "Raise volume" msgstr "음량 키우기" -#: ../src/main.c:236 +#: ../src/main.c:237 msgid "Lower volume" msgstr "음량 줄이기" -#: ../src/main.c:237 +#: ../src/main.c:238 msgid "Mute volume" msgstr "음소거" -#: ../src/main.c:238 +#: ../src/main.c:239 msgid "Version information" msgstr "버전 정보" -#: ../src/main.c:239 +#: ../src/main.c:240 msgid "Start in fullscreen mode" msgstr "전체 화면 상태로 시작하기" -#: ../src/main.c:240 +#: ../src/mai
[Xfce4-commits] l10n: Updated Croatian (hr) translation to 45%
Updating branch refs/heads/master to 1201030fbd77804988fcfe7985401b7713179d88 (commit) from dd69bbcc3f69fb85e281ff0ad60baaa0a2171280 (commit) commit 1201030fbd77804988fcfe7985401b7713179d88 Author: Ivica Kolić Date: Fri Aug 10 13:29:21 2012 +0200 l10n: Updated Croatian (hr) translation to 45% New status: 83 messages complete with 0 fuzzies and 99 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/hr.po b/po/hr.po index 2990e43..5699557 100644 --- a/po/hr.po +++ b/po/hr.po @@ -14,11 +14,11 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Country: CROATIA\n" "Language: \n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Croatian\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-Country: CROATIA\n" #. TRANSLATORS: Keep in sync with labeloptions in weather-config.c #: ../panel-plugin/weather.c:137 @@ -333,9 +333,9 @@ msgid "Failed to get the hostname %s. Retry in %d seconds." msgstr "" #: ../panel-plugin/weather-http.c:239 -#, fuzzy, c-format +#, c-format msgid "Failed to open the socket(%s)." -msgstr "Neuspješno slanje zahtjeva (%s)." +msgstr "" #: ../panel-plugin/weather-http.c:245 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Greek (el) translation to 100%
Updating branch refs/heads/master to b66a5934ed4b17026dbb179caf404461d8e86ebb (commit) from 4d1e816bc48a01494495da498d14b803b7ac87e8 (commit) commit b66a5934ed4b17026dbb179caf404461d8e86ebb Author: gapan Date: Fri Aug 10 12:21:50 2012 +0200 l10n: Updated Greek (el) translation to 100% New status: 185 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/el.po | 104 +++--- 1 files changed, 52 insertions(+), 52 deletions(-) diff --git a/po/el.po b/po/el.po index 4891291..f3cc2c6 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: parole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-09 16:54+\n" +"POT-Creation-Date: 2012-08-10 08:57+\n" "PO-Revision-Date: 2010-03-30 23:39+0200\n" "Last-Translator: George Vlahavas \n" "Language-Team: \n" @@ -48,7 +48,7 @@ msgstr "Αυτόματο" msgid "Buffering (0%)" msgstr "Φόρτωση (0%)" -#: ../data/interfaces/parole.ui.h:9 ../src/parole-player.c:645 +#: ../data/interfaces/parole.ui.h:9 ../src/parole-player.c:663 msgid "Empty" msgstr "Άδειο" @@ -66,7 +66,7 @@ msgstr "Εφαρμογή αναπαραγωγής πολυμέσων" #: ../data/interfaces/parole.ui.h:13 msgid "None" -msgstr "Κανένα" +msgstr "Κανένας" #: ../data/interfaces/parole.ui.h:14 msgid "Open _location" @@ -325,39 +325,39 @@ msgstr "Μήνυμα" msgid "Error" msgstr "Σφάλμα" -#: ../src/gst/parole-gst.c:1495 +#: ../src/gst/parole-gst.c:1493 msgid "Stop" msgstr "Σταμάτημα" -#: ../src/gst/parole-gst.c:1496 +#: ../src/gst/parole-gst.c:1494 msgid "The stream is taking too much time to load" msgstr "Η ροή απαιτεί πολύ χρόνο για να φορτωθεί" -#: ../src/gst/parole-gst.c:1665 +#: ../src/gst/parole-gst.c:1663 msgid "" "Unable to load playbin GStreamer plugin, check your GStreamer installation" msgstr "" "Δεν ήταν δυνατό να φορτωθεί το πρόσθετο GStreamer playbin, ελέγξτε την " "εγκατάσταση του GStreamer" -#: ../src/gst/parole-gst.c:1689 +#: ../src/gst/parole-gst.c:1687 msgid "" "Unable to load video GStreamer plugin, check your GStreamer installation" msgstr "" "Δεν ήταν δυνατό να φορτωθεί το πρόσθετο Gstreamer video, ελέξτε την " "εγκατάσταση του GStreamer" -#: ../src/gst/parole-gst.c:2246 ../src/gst/parole-gst.c:2250 +#: ../src/gst/parole-gst.c:2244 ../src/gst/parole-gst.c:2248 #, c-format msgid "Audio Track #%d" msgstr "Κομμάτι ήχου #%d" -#: ../src/gst/parole-gst.c:2278 ../src/gst/parole-gst.c:2282 +#: ../src/gst/parole-gst.c:2276 ../src/gst/parole-gst.c:2280 #, c-format msgid "Subtitle #%d" msgstr "Υπότιτλος #%d" -#: ../src/main.c:55 +#: ../src/main.c:56 #, c-format msgid "" "\n" @@ -378,109 +378,109 @@ msgstr "" "Αδειοδοτημένο με χρήση της GNU GPL.\n" "\n" -#: ../src/main.c:188 +#: ../src/main.c:189 msgid "Unknown argument " msgstr "Άγνωστη παράμετρος" -#: ../src/main.c:226 +#: ../src/main.c:227 msgid "Open a new instance" msgstr "Άνοιγμα νέου παραθύρου" -#: ../src/main.c:227 +#: ../src/main.c:228 msgid "Do not load plugins" msgstr "Άρνηση φόρτωσης πρόσθετων" -#: ../src/main.c:228 +#: ../src/main.c:229 msgid "Set Audio-CD/VCD/DVD device path" msgstr "Ορισμός της διαδρομής της συσκευής Audio-CD/VCD/DVD" -#: ../src/main.c:229 +#: ../src/main.c:230 msgid "Play or pause if already playing" msgstr "Αναπαραγωγή ή παύση αν γίνεται ήδη αναπαραγωγή" -#: ../src/main.c:230 +#: ../src/main.c:231 msgid "Stop playing" msgstr "Σταμάτημα αναπαραγωγής" -#: ../src/main.c:231 +#: ../src/main.c:232 msgid "Next track" msgstr "Επόμενο κομμάτι" -#: ../src/main.c:232 +#: ../src/main.c:233 msgid "Previous track" msgstr "Προηγούμενο κομμάτι" -#: ../src/main.c:233 +#: ../src/main.c:234 msgid "Seek forward" msgstr "Αναζήτηση μπροστά" -#: ../src/main.c:234 +#: ../src/main.c:235 msgid "Seek Backward" msgstr "Αναζήτηση πίσω" -#: ../src/main.c:235 +#: ../src/main.c:236 msgid "Raise volume" msgstr "Αύξηση έντασης ήχου" -#: ../src/main.c:236 +#: ../src/main.c:237 msgid "Lower volume" msgstr "Μείωση έντασης ήχου" -#: ../src/main.c:237 +#: ../src/main.c:238 msgid "Mute volume" msgstr "Σίγαση ήχου" -#: ../src/main.c:238 +#: ../src/main.c:239 msgid "Version information" msgstr "Πληροφορίες έκδοσης" -#: ../src/main.c:239 +#: ../src/main.c:240 msgid "Start in fullscreen mode" msgstr "Εκκίνηση σε πλήρη οθόνη" -#: ../src/main.c:240 +#: ../src/main.c:241 msgid "Enabled/Disable XV support" msgstr "Ενεργοποίηση/Απενεργοποίηση υποστήριξης XV" -#: ../src/main.c:241 +#: ../src/main.c:242 msgid "Add files to playlist" msgstr "Απόκρυψη λίστας αναπαραγωγής" -#: ../src/main.c:243 +#: ../src/main.c:244 msgid "Media to play" msgstr "Πολυμέσα προς αναπαραγωγή" -#: ../src/main.c:280 +#: ../src/main.c:281 #, c-format msgid "Parole is already running, use -i to open a new instance\n" msgstr "" "Το Parole ήδη εκτελείται, χρησιμοποιήστε το -i για να ανοίξετε