[Xfce4-commits] xfce4-weather-plugin:master Fix certain labels not appearing in scrollbox (bug #9120).
Updating branch refs/heads/master to dd50f8b36b511e3983b286b285c39a9e60c04458 (commit) from 5a00a49cd9756c820b3b37e0f9ec9fa9722e74d8 (commit) commit dd50f8b36b511e3983b286b285c39a9e60c04458 Author: Harald Judt h.j...@gmx.at Date: Tue Jul 17 10:30:16 2012 +0200 Fix certain labels not appearing in scrollbox (bug #9120). Entries for some labels were missing in make_label(). Thanks to Masato Hashimoto for reporting. panel-plugin/weather.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c index 802761f..22fcd78 100644 --- a/panel-plugin/weather.c +++ b/panel-plugin/weather.c @@ -132,9 +132,15 @@ make_label (xfceweather_data *data, case WIND_SPEED: lbl = _(WS); break; +case WIND_BEAUFORT: + lbl = _(WB); + break; case WIND_DIRECTION: lbl = _(WD); break; +case WIND_DIRECTION_DEG: + lbl = _(WD); + break; case HUMIDITY: lbl = _(H); break; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to 23ee4dc71f77e77329acd97e0a3abb1cd6bd9f6a (commit) from dd50f8b36b511e3983b286b285c39a9e60c04458 (commit) commit 23ee4dc71f77e77329acd97e0a3abb1cd6bd9f6a Author: Masato Hashimoto hash...@xfce.org Date: Tue Jul 17 12:19:53 2012 +0200 l10n: Updated Japanese (ja) translation to 100% New status: 155 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 60 1 files changed, 28 insertions(+), 32 deletions(-) diff --git a/po/ja.po b/po/ja.po index 0e86702..4c2570f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,8 +12,8 @@ msgid msgstr Project-Id-Version: xfce-weather-plugin 0.6.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-07-16 22:16+0200\n -PO-Revision-Date: 2012-07-16 17:57+0900\n +POT-Creation-Date: 2012-07-17 19:18+0900\n +PO-Revision-Date: 2012-07-17 19:18+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n Language-Team: Japanese xfce-i...@xfce.org\n Language: ja\n @@ -34,57 +34,61 @@ msgid WS msgstr 風速 #: ../panel-plugin/weather.c:136 +msgid WB +msgstr 風力 + +#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142 msgid WD msgstr 風向 -#: ../panel-plugin/weather.c:139 +#: ../panel-plugin/weather.c:145 msgid H msgstr 湿度 -#: ../panel-plugin/weather.c:142 +#: ../panel-plugin/weather.c:148 msgid CL msgstr 下層雲 -#: ../panel-plugin/weather.c:145 +#: ../panel-plugin/weather.c:151 msgid CM msgstr 中層雲 -#: ../panel-plugin/weather.c:148 +#: ../panel-plugin/weather.c:154 msgid CH msgstr 上層雲 -#: ../panel-plugin/weather.c:151 +#: ../panel-plugin/weather.c:157 msgid C msgstr 雲量 -#: ../panel-plugin/weather.c:154 +#: ../panel-plugin/weather.c:160 msgid F msgstr 霧 -#: ../panel-plugin/weather.c:157 +#: ../panel-plugin/weather.c:163 msgid R msgstr 降水量 -#: ../panel-plugin/weather.c:233 +#: ../panel-plugin/weather.c:239 msgid No Data msgstr データ無し -#: ../panel-plugin/weather.c:260 ../panel-plugin/weather.c:858 +#: ../panel-plugin/weather.c:266 ../panel-plugin/weather.c:864 msgid Cannot update weather data msgstr 気象データを更新できません -#: ../panel-plugin/weather.c:788 +#: ../panel-plugin/weather.c:794 #, c-format msgid Unable to open the following url: %s msgstr 次の URL を開くことができません: %s -#: ../panel-plugin/weather.c:816 ../panel-plugin/weather-summary.c:601 +#: ../panel-plugin/weather.c:822 ../panel-plugin/weather-summary.c:601 #: ../panel-plugin/weather.desktop.in.in.h:1 msgid Weather Update -msgstr 最新の気象情報 +msgstr 最新の天気情報 #. add refresh button to right click menu, for people who missed the middle mouse click feature -#: ../panel-plugin/weather.c:947 ../panel-plugin/weather-summary.c:646 +#: ../panel-plugin/weather.c:953 ../panel-plugin/weather-summary.c:646 msgid _Forecast msgstr 予報(_F) @@ -166,9 +170,8 @@ msgid Metric msgstr メートル法 #: ../panel-plugin/weather-config.c:473 -#, fuzzy msgid L_ocation: -msgstr 地域: +msgstr 地域(_O): #: ../panel-plugin/weather-config.c:505 msgid Chan_ge... @@ -176,14 +179,12 @@ msgstr 変更(_G)... #. proxy #: ../panel-plugin/weather-config.c:518 -#, fuzzy msgid _Proxy server: -msgstr プロキシサーバー: +msgstr プロキシサーバー(_P): #: ../panel-plugin/weather-config.c:523 -#, fuzzy msgid Use proxy _server -msgstr プロキシサーバーを使用する(_U) +msgstr プロキシサーバーを使用する(_S) #: ../panel-plugin/weather-config.c:525 msgid Auto-detect from _environment @@ -200,24 +201,23 @@ msgstr 表示するラベル(_L) #: ../panel-plugin/weather-config.c:616 msgid _Add -msgstr +msgstr 追加(_A) #: ../panel-plugin/weather-config.c:632 msgid _Remove -msgstr +msgstr 削除(_R) #: ../panel-plugin/weather-config.c:637 msgid Move _Up -msgstr +msgstr 上へ(_U) #: ../panel-plugin/weather-config.c:642 msgid Move _Down -msgstr +msgstr 下へ(_D) #: ../panel-plugin/weather-config.c:680 -#, fuzzy msgid Animate _transitions between labels -msgstr ラベルの切り換えをアニメーションで行う(_A) +msgstr ラベルの切り換えをアニメーションで行う(_T) #: ../panel-plugin/weather-data.c:131 msgid ft @@ -325,7 +325,7 @@ msgid Weather report for: %s.\n \n msgstr -%s の気象情報です。\n +%s の天気情報です。\n \n #: ../panel-plugin/weather-summary.c:278 @@ -730,10 +730,6 @@ msgstr 不明 msgid Show current weather conditions msgstr 現在の天気状況を表示します。 -#, fuzzy -#~ msgid WDD -#~ msgstr 風向 - #~ msgid V #~ msgstr 視程 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Fix typo and missing casts in show_page_info
Updating branch refs/heads/master to 65844ecf4c199325a8b3dc6cd408c5b7d24393e9 (commit) from 96ad359d344e38e5ef24a89f0487f49451a032e3 (commit) commit 65844ecf4c199325a8b3dc6cd408c5b7d24393e9 Author: Christian Dywan christ...@twotoasts.de Date: Tue Jul 17 13:47:56 2012 +0200 Fix typo and missing casts in show_page_info midori/midori-locationaction.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 0bfea5b..456b7da 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1249,7 +1249,7 @@ midori_location_action_show_page_info (GtkWidget* widget, g_signal_connect (dialog, response, G_CALLBACK (midori_location_action_cert_response_cb), gcr_cert); #else -const gchar* tls_error = midori_location_action_tls_flags_to_string (tls_clags); +const gchar* tls_error = midori_location_action_tls_flags_to_string (tls_flags); if (!g_tls_certificate_get_issuer (tls_cert)) gtk_box_pack_start (box, gtk_label_new (_(Self-signed)), FALSE, FALSE, 0); @@ -1272,8 +1272,8 @@ midori_location_action_icon_released_cb (GtkWidget* widget, const gchar* title = _(Security details); GtkWidget* content_area; GtkWidget* hbox; -gint root_x, root_y; #ifdef HAVE_GRANITE +gint root_x, root_y; GdkRectangle icon_rect; /* FIXME: granite: should return GtkWidget* like GTK+ */ GtkWidget* dialog = (GtkWidget*)granite_widgets_pop_over_new (); @@ -1290,7 +1290,7 @@ midori_location_action_icon_released_cb (GtkWidget* widget, granite_widgets_pop_over_move_to_coords (GRANITE_WIDGETS_POP_OVER (dialog), root_x, root_y, TRUE); #else -GtkWidget* dialog = gtk_dialog_new_with_buttons (title, gtk_widget_get_toplevel (widget), +GtkWidget* dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (gtk_widget_get_toplevel (widget)), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, NULL, NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); #endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Cosmetic fix for formatting label data.
Updating branch refs/heads/master
to 345f18d34e76630f1d539db5ffb6e8526de2af7d (commit)
from 23ee4dc71f77e77329acd97e0a3abb1cd6bd9f6a (commit)
commit 345f18d34e76630f1d539db5ffb6e8526de2af7d
Author: Harald Judt h.j...@gmx.at
Date: Tue Jul 17 15:21:50 2012 +0200
Cosmetic fix for formatting label data.
There should be no space between the value and the degrees (°) sign,
e.g. WD: 290,9 ° == WD: 290,9°
It's already correct in the forecast details tab.
panel-plugin/weather.c | 24 ++--
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 22fcd78..4ab363b 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -119,7 +119,7 @@ make_label (xfceweather_data *data,
{
gchar *str, *value, *rawvalue;
xml_time*conditions;
- const gchar *lbl, *txtsize;
+ const gchar *lbl, *txtsize, *unit;
switch (opt)
{
@@ -189,26 +189,30 @@ make_label (xfceweather_data *data,
if (data-labels-len 1) {
if (value != NULL)
{
- str = g_strdup_printf (span size=\%s\%s: %s/span,
+str = g_strdup_printf (span size=\%s\%s: %s/span,
txtsize, lbl, value);
- g_free (value);
+g_free (value);
}
else
{
- str = g_strdup_printf (span size=\%s\%s: %s %s/span,
- txtsize, lbl, rawvalue, get_unit (conditions,
data-unit_system, opt));
+unit = get_unit (conditions, data-unit_system, opt);
+str = g_strdup_printf (span size=\%s\%s: %s%s%s/span,
+ txtsize, lbl, rawvalue,
+ strcmp(unit, °) ? : , unit);
}
} else {
if (value != NULL)
{
- str = g_strdup_printf (span size=\%s\%s/span,
- txtsize, value);
- g_free (value);
+ str = g_strdup_printf (span size=\%s\%s/span,
+ txtsize, value);
+ g_free (value);
}
else
{
- str = g_strdup_printf (span size=\%s\%s %s/span,
- txtsize, rawvalue, get_unit (conditions,
data-unit_system, opt));
+unit = get_unit (conditions, data-unit_system, opt);
+str = g_strdup_printf (span size=\%s\%s%s%s/span,
+ txtsize, rawvalue,
+ strcmp(unit, °) ? : , unit);
}
}
g_free (rawvalue);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-netload-plugin:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to bad7f567b760b226263577f38f60555790f87de4 (commit) from 0127080d603095578360ba91f50f20b47eb5835a (commit) commit bad7f567b760b226263577f38f60555790f87de4 Author: Sergio Marques smarque...@gmail.com Date: Tue Jul 17 16:53:51 2012 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 30 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 74 +++--- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/po/pt.po b/po/pt.po index c7ada8a..10ba48f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,43 +2,43 @@ # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4-netload-plugin package. # Nuno Miguel nu...@netcabo.pt, 2007. -# +# msgid msgstr Project-Id-Version: xfce4-netload-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-07-15 09:12+\n -PO-Revision-Date: 2012-01-09 11:39-\n +POT-Creation-Date: 2012-07-17 14:42+\n +PO-Revision-Date: 2012-07-17 15:52-\n Last-Translator: Sérgio Marques smarque...@gmail.com\n Language-Team: \n +Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n -Language: \n -#: ../panel-plugin/netload.c:60 +#: ../panel-plugin/netload.c:61 msgid Xfce4-Netload-Plugin msgstr \Plug-in\ Xfce4 Netload -#: ../panel-plugin/netload.c:63 +#: ../panel-plugin/netload.c:64 msgid Unknown error. msgstr Erro desconhecido. -#: ../panel-plugin/netload.c:64 +#: ../panel-plugin/netload.c:65 msgid Linux proc device '/proc/net/dev' not found. msgstr Dispositivo proc \/proc/net/dev\ não encontrado. -#: ../panel-plugin/netload.c:65 +#: ../panel-plugin/netload.c:66 msgid Interface was not found. msgstr Interface não encontrada. -#: ../panel-plugin/netload.c:162 +#: ../panel-plugin/netload.c:163 #, c-format msgid %s (Interface down) msgstr %s (Interface desligada) -#: ../panel-plugin/netload.c:249 -#, fuzzy, c-format +#: ../panel-plugin/netload.c:250 +#, c-format msgid %s (%s)\n Average of last %d measures\n @@ -48,16 +48,17 @@ msgid Total: %s msgstr %s (%s)\n -Média das últimas %d medições:\n -Recebidos: %s kByte/s\n -Enviados: %s kByte/s\n -Total: %s kByte/s +Média das últimas %d medições\n +com um intervalo de %.2fs:\n +Recebidos: %s\n +Enviados: %s\n +Total: %s -#: ../panel-plugin/netload.c:252 +#: ../panel-plugin/netload.c:253 msgid no IP address msgstr sem endereço IP -#: ../panel-plugin/netload.c:572 +#: ../panel-plugin/netload.c:567 #, c-format msgid %s: Error in initializing:\n @@ -66,71 +67,72 @@ msgstr %s: erro ao iniciar:\n %s -#: ../panel-plugin/netload.c:887 +#: ../panel-plugin/netload.c:882 msgid Select color msgstr Selecione a cor -#: ../panel-plugin/netload.c:953 +#: ../panel-plugin/netload.c:948 msgid Bar color (i_ncoming): msgstr Cor da barra (rece_bidos) : -#: ../panel-plugin/netload.c:954 +#: ../panel-plugin/netload.c:949 msgid Bar color (_outgoing): msgstr Cor da barra (enviad_os) : -#: ../panel-plugin/netload.c:957 +#: ../panel-plugin/netload.c:952 msgid Maximum (inco_ming): msgstr Máximo (recebi_dos): -#: ../panel-plugin/netload.c:958 +#: ../panel-plugin/netload.c:953 msgid Maximum (o_utgoing): msgstr Máximo (e_nviados): -#: ../panel-plugin/netload.c:963 ../panel-plugin/netload.desktop.in.in.h:1 +#: ../panel-plugin/netload.c:958 +#: ../panel-plugin/netload.desktop.in.in.h:1 msgid Network Monitor msgstr Monitor de rede -#: ../panel-plugin/netload.c:992 +#: ../panel-plugin/netload.c:987 msgid _Text to display: msgstr _Texto a exibir: -#: ../panel-plugin/netload.c:1023 +#: ../panel-plugin/netload.c:1018 msgid Network _device: msgstr _Dispositivo de rede: -#: ../panel-plugin/netload.c:1051 +#: ../panel-plugin/netload.c:1046 msgid Update _interval: msgstr _Intervalo de atualização: -#: ../panel-plugin/netload.c:1064 +#: ../panel-plugin/netload.c:1059 msgid s msgstr s -#: ../panel-plugin/netload.c:1077 +#: ../panel-plugin/netload.c:1072 msgid _Automatic maximum msgstr Máximo _automático -#: ../panel-plugin/netload.c: +#: ../panel-plugin/netload.c:1106 msgid KiB/s msgstr KB/s -#: ../panel-plugin/netload.c:1136 +#: ../panel-plugin/netload.c:1131 msgid _Present data as: -msgstr A_presentar dados: +msgstr Mos_trar dados em: -#: ../panel-plugin/netload.c:1145 +#: ../panel-plugin/netload.c:1140 msgid Bars msgstr Barras -#: ../panel-plugin/netload.c:1146 +#: ../panel-plugin/netload.c:1141 msgid Values msgstr Valores -#: ../panel-plugin/netload.c:1147 +#: ../panel-plugin/netload.c:1142 msgid Bars and values msgstr Barras e valores -#: ../panel-plugin/netload.c:1197 +#: ../panel-plugin/netload.c:1192 msgid _Colorize values msgstr _Colorir valores @@ -154,5 +156,3 @@ msgstr MB msgid GiB msgstr GB -#~ msgid
[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Portuguese (pt) translation to 98%
Updating branch refs/heads/master to 1b2986a38b904d48fd87285a3001974efc478e8b (commit) from 345f18d34e76630f1d539db5ffb6e8526de2af7d (commit) commit 1b2986a38b904d48fd87285a3001974efc478e8b Author: Sergio Marques smarque...@gmail.com Date: Tue Jul 17 16:55:05 2012 +0200 l10n: Updated Portuguese (pt) translation to 98% New status: 151 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 34 +- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/po/pt.po b/po/pt.po index 47bbbe4..f36fd83 100644 --- a/po/pt.po +++ b/po/pt.po @@ -8,7 +8,7 @@ msgstr Project-Id-Version: weather-plugin\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-07-16 22:16+0200\n -PO-Revision-Date: 2012-01-09 18:22-\n +PO-Revision-Date: 2012-07-17 15:53-\n Last-Translator: Sérgio Marques smarque...@gmail.com\n Language-Team: \n Language: \n @@ -67,7 +67,8 @@ msgstr P msgid No Data msgstr Sem dados -#: ../panel-plugin/weather.c:260 ../panel-plugin/weather.c:858 +#: ../panel-plugin/weather.c:260 +#: ../panel-plugin/weather.c:858 msgid Cannot update weather data msgstr Incapaz de atualizar os dados @@ -76,13 +77,15 @@ msgstr Incapaz de atualizar os dados msgid Unable to open the following url: %s msgstr Incapaz de abrir o url: %s -#: ../panel-plugin/weather.c:816 ../panel-plugin/weather-summary.c:601 +#: ../panel-plugin/weather.c:816 +#: ../panel-plugin/weather-summary.c:601 #: ../panel-plugin/weather.desktop.in.in.h:1 msgid Weather Update msgstr Atualização climatérica #. add refresh button to right click menu, for people who missed the middle mouse click feature -#: ../panel-plugin/weather.c:947 ../panel-plugin/weather-summary.c:646 +#: ../panel-plugin/weather.c:947 +#: ../panel-plugin/weather-summary.c:646 msgid _Forecast msgstr _Previsão @@ -138,7 +141,8 @@ msgstr Nevoeiro (N) msgid Precipitations (R) msgstr Precipitação (P) -#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:387 +#: ../panel-plugin/weather-config.c:229 +#: ../panel-plugin/weather-config.c:387 #: ../panel-plugin/weather-config.c:492 msgid Unset msgstr Não definido @@ -164,9 +168,8 @@ msgid Metric msgstr Métrico #: ../panel-plugin/weather-config.c:473 -#, fuzzy msgid L_ocation: -msgstr Localização: +msgstr L_ocalização: #: ../panel-plugin/weather-config.c:505 msgid Chan_ge... @@ -174,14 +177,12 @@ msgstr Al_terar... #. proxy #: ../panel-plugin/weather-config.c:518 -#, fuzzy msgid _Proxy server: -msgstr Servidor proxy: +msgstr Servidor _proxy: #: ../panel-plugin/weather-config.c:523 -#, fuzzy msgid Use proxy _server -msgstr U_tilizar servidor proxy +msgstr Utilizar _servidor proxy #: ../panel-plugin/weather-config.c:525 msgid Auto-detect from _environment @@ -210,12 +211,11 @@ msgstr #: ../panel-plugin/weather-config.c:642 msgid Move _Down -msgstr +msgstr Mover para _baixo #: ../panel-plugin/weather-config.c:680 -#, fuzzy msgid Animate _transitions between labels -msgstr _Animar transições entre campos +msgstr Animar _transições entre campos #: ../panel-plugin/weather-data.c:131 msgid ft @@ -300,7 +300,8 @@ msgstr Incapaz de detetar o conteúdo. msgid No content received. msgstr Nenhum conteúdo recebido. -#: ../panel-plugin/weather-search.c:148 ../panel-plugin/weather-search.c:280 +#: ../panel-plugin/weather-search.c:148 +#: ../panel-plugin/weather-search.c:280 msgid Results msgstr Resultados @@ -380,8 +381,7 @@ msgid \twhile the remaining information originates from point data.\n msgstr \n -\tO intervalo de dados disponibiliza o ícone, a descrição e a precipitação -e\n +\tO intervalo de dados disponibiliza o ícone, a descrição e a precipitação e\n \to ponto de dados disponibiliza a informação restante.\n #. Temperature ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Replace _web_view_open with _load_uri
Updating branch refs/heads/master
to 760f4895a378e07d24481a0686342b14eed5e27e (commit)
from 2f2b33abeed9890b884875556d9758ac4b247905 (commit)
commit 760f4895a378e07d24481a0686342b14eed5e27e
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Jul 17 21:56:56 2012 +0200
Replace _web_view_open with _load_uri
midori/main.c|2 +-
midori/midori-view.c | 10 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index 6a3e59a..3044809 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -2145,7 +2145,7 @@ main (intargc,
#endif
g_signal_connect (web_view, load-finished,
G_CALLBACK (snapshot_load_finished_cb), filename);
-webkit_web_view_open (WEBKIT_WEB_VIEW (web_view), snapshot);
+webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), snapshot);
gtk_main ();
g_free (filename);
return 0;
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 4cbad7b..a6eba18 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3826,7 +3826,7 @@ midori_view_construct_web_view (MidoriView* view)
view-web_view = webkit_web_view_new ();
/* Load something to avoid a bug where WebKit might not set a main frame */
-webkit_web_view_open (WEBKIT_WEB_VIEW (view-web_view), );
+webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view-web_view), );
#if HAVE_HILDON
gtk_widget_tap_and_hold_setup (view-web_view, NULL, NULL, 0);
@@ -4453,7 +4453,7 @@ midori_view_set_uri (MidoriView* view,
katze_item_set_uri (view-item, view-uri);
katze_assign (view-title, NULL);
g_object_notify (G_OBJECT (view), uri);
-webkit_web_view_open (WEBKIT_WEB_VIEW (view-web_view), uri);
+webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view-web_view), uri);
}
}
}
@@ -6145,8 +6145,8 @@ thumb_view_load_status_cb (WebKitWebView* thumb_view_,
{
g_object_set_data_full (G_OBJECT (thumb_view), spec,
thumb_queue-data, (GDestroyNotify)g_free);
-webkit_web_view_open (WEBKIT_WEB_VIEW (thumb_view),
- strstr (thumb_queue-data, |) + 1);
+webkit_web_view_load_uri (WEBKIT_WEB_VIEW (thumb_view),
+ strstr (thumb_queue-data, |) + 1);
}
else
g_signal_handlers_disconnect_by_func (
@@ -6223,7 +6223,7 @@ midori_view_speed_dial_get_thumb (MidoriView* view,
thumb_queue-data, (GDestroyNotify)g_free);
g_signal_connect (thumb_view, notify::load-status,
G_CALLBACK (thumb_view_load_status_cb), view);
-webkit_web_view_open (WEBKIT_WEB_VIEW (thumb_view), url);
+webkit_web_view_load_uri (WEBKIT_WEB_VIEW (thumb_view), url);
}
/**
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Show view-overlay_label
Updating branch refs/heads/master
to 7bcc270b0528777a985f9ef7e2256c5548ae8b28 (commit)
from 760f4895a378e07d24481a0686342b14eed5e27e (commit)
commit 7bcc270b0528777a985f9ef7e2256c5548ae8b28
Author: André Stösel an...@stoesel.de
Date: Tue Jul 17 16:03:58 2012 +0200
Show view-overlay_label
midori/midori-view.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index a6eba18..c00ceb9 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3302,6 +3302,7 @@ midori_view_init (MidoriView* view)
{
GtkWidget* frame = gtk_frame_new (NULL);
view-overlay_label = gtk_label_new (NULL);
+gtk_widget_show (view-overlay_label);
gtk_container_add (GTK_CONTAINER (frame), view-overlay_label);
gtk_widget_set_halign (frame, GTK_ALIGN_START);
gtk_widget_set_valign (frame, GTK_ALIGN_END);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Automatically close security details on focus out
Updating branch refs/heads/master
to 7eb4aa78aad522de5a23615064b312e7a057d7e3 (commit)
from 7bcc270b0528777a985f9ef7e2256c5548ae8b28 (commit)
commit 7eb4aa78aad522de5a23615064b312e7a057d7e3
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Jul 18 00:48:02 2012 +0200
Automatically close security details on focus out
midori/midori-locationaction.c | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 456b7da..c30795c 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -1261,6 +1261,17 @@ midori_location_action_show_page_info (GtkWidget* widget,
}
#endif
+#ifndef HAVE_GRANITE
+static gboolean
+midori_location_action_dialog_focus_out_cb (GtkWidget* dialog,
+GdkEvent* event,
+gpointer user_data)
+{
+gtk_widget_destroy (dialog);
+return TRUE;
+}
+#endif
+
static void
midori_location_action_icon_released_cb (GtkWidget* widget,
GtkIconEntryPosition icon_pos,
@@ -1292,6 +1303,8 @@ midori_location_action_icon_released_cb (GtkWidget*
widget,
#else
GtkWidget* dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW
(gtk_widget_get_toplevel (widget)),
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, NULL,
NULL);
+g_signal_connect (dialog, focus-out-event,
+G_CALLBACK (midori_location_action_dialog_focus_out_cb), NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
#endif
hbox = gtk_hbox_new (FALSE, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Allow trusting a website inside the error message
Updating branch refs/heads/master
to 3259ab1be2a43cbdbbcbca8194edf6523072c833 (commit)
from 7eb4aa78aad522de5a23615064b312e7a057d7e3 (commit)
commit 3259ab1be2a43cbdbbcbca8194edf6523072c833
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Jul 18 00:51:04 2012 +0200
Allow trusting a website inside the error message
midori/midori-view.c | 54 ++---
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index c00ceb9..b4d8412 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -26,6 +26,14 @@
#include granite.h
#endif
+#if HAVE_GCR
+#define GCR_API_SUBJECT_TO_CHANGE
+#include gcr/gcr.h
+
+SoupMessage*
+midori_map_get_message (SoupMessage* message);
+#endif
+
#include string.h
#include stdlib.h
#include glib/gi18n.h
@@ -948,6 +956,47 @@ midori_view_web_view_navigation_decision_cb
(WebKitWebView* web_view
return TRUE;
}
}
+#if HAVE_GCR
+else if (/* view-special */ !strncmp (uri, https, 5))
+{
+/* We show an error page if the certificate is invalid.
+ If a special, unverified page loads a form, it must be that page.
+ if (webkit_web_navigation_action_get_reason (action) ==
WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED)
+ FIXME: Verify more stricly that this cannot be eg. a simple Reload
*/
+if (webkit_web_navigation_action_get_reason (action) ==
WEBKIT_WEB_NAVIGATION_REASON_RELOAD)
+{
+SoupMessage* message = webkit_network_request_get_message
(request);
+if (!(soup_message_get_flags (message)
SOUP_MESSAGE_CERTIFICATE_TRUSTED))
+{
+SoupURI* soup_uri = soup_message_get_uri (message);
+GTlsCertificate* tls_cert;
+GcrCertificate* gcr_cert;
+GByteArray* der_cert;
+
+message = midori_map_get_message (message);
+g_object_get (message, tls-certificate, tls_cert, NULL);
+g_return_val_if_fail (tls_cert != NULL, FALSE);
+g_object_get (tls_cert, certificate, der_cert, NULL);
+gcr_cert = gcr_simple_certificate_new (der_cert-data,
der_cert-len);
+g_byte_array_unref (der_cert);
+if (soup_uri soup_uri-host
!gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH,
soup_uri-host, NULL, NULL))
+{
+GError* error = NULL;
+gcr_trust_add_pinned_certificate (gcr_cert,
GCR_PURPOSE_SERVER_AUTH, soup_uri-host, NULL, error);
+if (error != NULL)
+{
+g_warning (Error granting trust: %s, error-message);
+g_error_free (error);
+}
+}
+else
+g_warn_if_reached ();
+g_object_unref (gcr_cert);
+g_object_unref (tls_cert);
+}
+}
+}
+#endif
view-special = FALSE;
/* Remove link labels */
@@ -999,9 +1048,6 @@ midori_view_display_error (MidoriView* view,
WebKitWebFrame* web_frame);
#if HAVE_GCR
-#define GCR_API_SUBJECT_TO_CHANGE
-#include gcr/gcr.h
-
const gchar*
midori_location_action_tls_flags_to_string (GTlsCertificateFlags flags);
@@ -1087,7 +1133,7 @@ webkit_web_view_load_committed_cb (WebKitWebView*
web_view,
view, view-uri, view-title ? view-title : view-uri,
_(Security unknown),
midori_location_action_tls_flags_to_string (tls_flags),
-_(Load page),
+_(Trust this website),
NULL);
}
g_object_unref (tls_cert);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Save non-text as single file, checkbox otherwise
Updating branch refs/heads/master
to 3d14faf9bed31d108082f1fdd9d64bbde1174278 (commit)
from 3259ab1be2a43cbdbbcbca8194edf6523072c833 (commit)
commit 3d14faf9bed31d108082f1fdd9d64bbde1174278
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Jul 18 01:17:29 2012 +0200
Save non-text as single file, checkbox otherwise
Fixes: https://bugs.launchpad.net/midori/+bug/1025894
midori/midori-browser.c | 29 +++--
midori/midori-view.c|3 +--
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index b6c7563..7a30766 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1104,6 +1104,8 @@ midori_browser_save_uri (MidoriBrowser* browser,
GtkWidget* dialog;
const gchar* title = midori_view_get_display_title (view);
gchar* filename;
+gboolean file_only;
+GtkWidget* checkbox;
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
@@ -,6 +1113,15 @@ midori_browser_save_uri (MidoriBrowser* browser,
dialog = sokoke_file_chooser_dialog_new (_(Save file as),
GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE);
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
TRUE);
+if (midori_view_can_view_source (view))
+{
+file_only = FALSE;
+checkbox = gtk_check_button_new_with_mnemonic (_(Save associated
_resources));
+gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE);
+gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog),
checkbox);
+}
+else
+file_only = TRUE;
if (last_dir *last_dir)
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
last_dir);
else
@@ -1122,7 +1133,7 @@ midori_browser_save_uri (MidoriBrowser* browser,
if (uri == NULL)
uri = midori_view_get_display_uri (view);
-if (!g_str_equal (title, uri))
+if (!file_only !g_str_equal (title, uri))
filename = midori_browser_fixup_filename (g_strdup (title));
else
filename = midori_browser_get_filename_suggestion_for_uri (view, uri);
@@ -1131,14 +1142,20 @@ midori_browser_save_uri (MidoriBrowser* browser,
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
{
-gchar* fullname;
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-fullname = g_strconcat (filename, .html, NULL);
-midori_view_save_source (view, uri, fullname);
+file_only = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(checkbox));
+if (!file_only !g_str_equal (title, uri))
+{
+gchar* fullname = g_strconcat (filename, .html, NULL);
+midori_view_save_source (view, uri, fullname);
+g_free (fullname);
+}
+else
+midori_view_save_source (view, uri, filename);
+if (!file_only)
+midori_browser_save_resources (view, filename);
katze_assign (last_dir,
gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
-midori_browser_save_resources (view, filename);
-g_free (fullname);
}
gtk_widget_destroy (dialog);
}
diff --git a/midori/midori-view.c b/midori/midori-view.c
index b4d8412..e14a61a 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -5448,10 +5448,9 @@ const gchar*
midori_view_fallback_extension (MidoriView* view,
const gchar* extension)
{
-if (!view-mime_type)
-extension = ;
if (extension *extension)
return extension;
+g_return_val_if_fail (view-mime_type != NULL, );
if (strstr (view-mime_type, css))
return .css;
if (strstr (view-mime_type, javascript))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
