[Xfce4-commits] ristretto:master l10n: Updates to Japanese (ja) translation

[Transifex]

Updating branch refs/heads/master
 to bfdff74842cd3526b1a8b9f328841477f595e0c1 (commit)
   from 6b7f3c147d2076f4dbfdfbe263d24b5dd4ce1a42 (commit)

commit bfdff74842cd3526b1a8b9f328841477f595e0c1
Author: Masato Hashimoto cabezon.hashim...@gmail.com
Date:   Sat Oct 3 06:04:19 2009 +

l10n: Updates to Japanese (ja) translation

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

 po/ja.po |  196 ++
 1 files changed, 83 insertions(+), 113 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 59ecccb..51b77da 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid 
 msgstr 
 Project-Id-Version: 0.0.18\n
 Report-Msgid-Bugs-To: xfce-i...@xfce.org\n
-POT-Creation-Date: 2009-09-27 23:47+0200\n
-PO-Revision-Date: 2009-08-17 21:41+0900\n
+POT-Creation-Date: 2009-10-03 14:39+0900\n
+PO-Revision-Date: 2009-10-03 14:39+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
@@ -45,67 +45,59 @@ msgstr ファイル(_F)
 
 #: ../src/main_window.c:265
 msgid _Open
-msgstr 
+msgstr 開く(_O)
 
 #: ../src/main_window.c:265
-#, fuzzy
 msgid Open an image
-msgstr 画像を開く
+msgstr 画像を開きます
 
 #: ../src/main_window.c:266
-#, fuzzy
 msgid Open _Folder
-msgstr フォルダを開く(_P)
+msgstr フォルダを開く(_F)
 
 #: ../src/main_window.c:266
-#, fuzzy
 msgid Open a folder
-msgstr フォルダを開く
+msgstr フォルダを開きます
 
 #: ../src/main_window.c:267
 msgid _Save copy
-msgstr 
+msgstr コピーを保存(_S)
 
 #: ../src/main_window.c:267
 msgid Save a copy of the image
-msgstr 
+msgstr 画像のコピーを保存します。
 
 #: ../src/main_window.c:268
 msgid _Print
-msgstr 
+msgstr 印刷(_P)
 
 #: ../src/main_window.c:268
 msgid Print the image
-msgstr 
+msgstr 画像を印刷します。
 
 #: ../src/main_window.c:269
-#, fuzzy
 msgid _Close
-msgstr 全て閉じる(_A)
+msgstr 閉じる(_C)
 
 #: ../src/main_window.c:269
 msgid Close this image
-msgstr 
+msgstr 画像を閉じます。
 
 #: ../src/main_window.c:270
-#, fuzzy
 msgid _Close All
 msgstr 全て閉じる(_A)
 
 #: ../src/main_window.c:270
-#, fuzzy
 msgid Close all images
-msgstr 全て閉じる(_A)
+msgstr 画像を全て閉じます
 
 #: ../src/main_window.c:271
-#, fuzzy
 msgid _Quit
-msgstr 編集(_E)
+msgstr 終了(_Q)
 
 #: ../src/main_window.c:271
-#, fuzzy
 msgid Quit Ristretto
-msgstr Ristretto
+msgstr Ristretto を終了します
 
 #. Edit Menu
 #: ../src/main_window.c:273
@@ -113,23 +105,20 @@ msgid _Edit
 msgstr 編集(_E)
 
 #: ../src/main_window.c:274
-#, fuzzy
 msgid _Open with...
-msgstr アプリケーションで開く...
+msgstr アプリケーションで開く(_O)...
 
 #: ../src/main_window.c:275
-#, fuzzy
 msgid _Sorting
-msgstr 拡大/縮小(_Z)
+msgstr 並び替え(_S)
 
 #: ../src/main_window.c:276
 msgid _Delete
-msgstr 
+msgstr 削除(_D)
 
 #: ../src/main_window.c:277
-#, fuzzy
 msgid _Preferences
-msgstr 画像ビューア設定
+msgstr 設定(_P)
 
 #. View Menu
 #: ../src/main_window.c:279
@@ -138,14 +127,13 @@ msgstr 表示(_V)
 
 #: ../src/main_window.c:280
 msgid _Fullscreen
-msgstr 
+msgstr 全画面化(_F)
 
 #: ../src/main_window.c:281
 msgid _Leave Fullscreen
-msgstr 
+msgstr 元に戻す(_L)
 
 #: ../src/main_window.c:282
-#, fuzzy
 msgid _Set as Wallpaper
 msgstr 壁紙に設定(_S)
 
@@ -155,25 +143,23 @@ msgid _Zooming
 msgstr 拡大/縮小(_Z)
 
 #: ../src/main_window.c:285
-#, fuzzy
 msgid Zoom _In
-msgstr 拡大/縮小(_Z)
+msgstr 拡大(_I)
 
 #: ../src/main_window.c:286
 msgid Zoom _Out
-msgstr 
+msgstr 縮小(_O)
 
 #: ../src/main_window.c:287
 msgid Zoom _Fit
-msgstr 
+msgstr ウィンドウに合わせる(_F)
 
 #: ../src/main_window.c:288
 msgid _Normal Size
-msgstr 
+msgstr 標準サイズ(_N)
 
 #. Rotation submenu
 #: ../src/main_window.c:290
-#, fuzzy
 msgid _Rotation
 msgstr 回転(_R)
 
@@ -192,19 +178,19 @@ msgstr 移動(_G)
 
 #: ../src/main_window.c:295
 msgid _Forward
-msgstr 
+msgstr 進む(_F)
 
 #: ../src/main_window.c:296
 msgid _Back
-msgstr 
+msgstr 戻る(_B)
 
 #: ../src/main_window.c:297
 msgid _First
-msgstr 
+msgstr 先頭(_F)
 
 #: ../src/main_window.c:298
 msgid _Last
-msgstr 
+msgstr 最後(_L)
 
 #. Help Menu
 #: ../src/main_window.c:300
@@ -213,92 +199,88 @@ msgstr ヘルプ(_H)
 
 #: ../src/main_window.c:302
 msgid _Contents
-msgstr 
+msgstr 目次(_C)
 
 #: ../src/main_window.c:304
 msgid Display ristretto user manual
-msgstr 
+msgstr Ristretto ユーザマニュアルを表示します。
 
 #: ../src/main_window.c:307
 msgid _About
-msgstr 
+msgstr 情報(_A)
 
 #: ../src/main_window.c:309
 msgid Display information about ristretto
-msgstr 
+msgstr Ristretto についての情報を表示します。
 
 #. Position Menu
 #: ../src/main_window.c:312
 msgid _Position
-msgstr 
+msgstr 位置(_P)
 
 #. Misc
 #: ../src/main_window.c:314
 msgid Leave _Fullscreen

[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updates to Japanese (ja) translation

[Transifex]

Updating branch refs/heads/master
 to 1c6871b75726f75ce3e81df72834c1966e3493e6 (commit)
   from 7b30e48becd6838269fd28a35886d852ac17388f (commit)

commit 1c6871b75726f75ce3e81df72834c1966e3493e6
Author: Masato Hashimoto cabezon.hashim...@gmail.com
Date:   Sat Oct 3 06:06:55 2009 +

l10n: Updates to Japanese (ja) translation

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

 po/ja.po |9 -
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 406300d..2476796 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-clipman-plugin 0.8.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2009-09-30 17:49+0200\n
-PO-Revision-Date: 2009-07-04 22:32+0900\n
+POT-Creation-Date: 2009-10-03 15:04+0900\n
+PO-Revision-Date: 2009-10-03 15:02+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
@@ -151,9 +151,8 @@ msgstr 
 チェックマークをつけると、新しい Xfce 
セッション開始時に履歴が復元されます
 
 #: ../panel-plugin/settings-dialog.glade.h:18
-#, fuzzy
 msgid Ignore s_elections
-msgstr 選択領域と同期をとる(_S)
+msgstr 選択領域を無視する(_E)
 
 #: ../panel-plugin/settings-dialog.glade.h:19
 msgid Name:
@@ -181,7 +180,7 @@ msgstr 選択領域と同期をとる(_S)
 
 #: ../panel-plugin/settings-dialog.glade.h:25
 msgid The pattern is always anchored within the special characters ^$
-msgstr 
+msgstr パターンには常に特殊文字 ^$ が適用されます
 
 #: ../panel-plugin/settings-dialog.glade.h:26
 msgid 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] ristretto:master fix Makefile.am

[Stephan Arts]

Updating branch refs/heads/master
 to b581b8307ba0df8fd69a1518c5a4c4a76d8046cb (commit)
   from 21a924b3ce5efbcd541919d6f219afdae1703d40 (commit)

commit b581b8307ba0df8fd69a1518c5a4c4a76d8046cb
Author: Stephan Arts step...@xfce.org
Date:   Sat Oct 3 11:21:17 2009 +0200

fix Makefile.am

 src/Makefile.am |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2467eba..1fdba5f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,9 +9,9 @@ ristretto_SOURCES = \
preferences_dialog.h preferences_dialog.c \
main_window_ui.h \
main_window.c main_window.h \
-wallpaper_manager.c wallpaper_manager.h \
-xfce_wallpaper_manager.c xfce_wallpaper_manager.h \
-app_menu_item.c app_menu_item.h \
+   wallpaper_manager.c wallpaper_manager.h \
+   xfce_wallpaper_manager.c xfce_wallpaper_manager.h \
+   app_menu_item.c app_menu_item.h \
thumbnail_bar.c thumbnail_bar.h \
thumbnail.c thumbnail.h \
main.c
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] ristretto:master Check if a supported desktop-manager (xfdesktop) is running, and set the set-wallpaper button sensitivity based on that. Update ChangeLog

[Stephan Arts]

Updating branch refs/heads/master
 to c2e33860a30b9c1d58fc69fc1827455cda3d2eb3 (commit)
   from b581b8307ba0df8fd69a1518c5a4c4a76d8046cb (commit)

commit c2e33860a30b9c1d58fc69fc1827455cda3d2eb3
Author: Stephan Arts step...@xfce.org
Date:   Sat Oct 3 11:24:58 2009 +0200

Check if a supported desktop-manager (xfdesktop) is running, and set the 
set-wallpaper button sensitivity based on that.
Update ChangeLog

 ChangeLog |7 +++
 src/main_window.c |   11 +--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d6543b8..c624518 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-03  Stephan Arts step...@xfce.org
+
+   * src/main_window.c: Check if a desktop-manager is running before making
+ the set-wallpaper button sensitive
+   * src/Makefile.am: Replace spaces with tabs, fixes compilation-issues
+ with certain versions of automake
+
 2009-09-27  Stephan Arts step...@xfce.org
 
*  src/preferences_dialog.c: Add option to load all images in a
diff --git a/src/main_window.c b/src/main_window.c
index 983c716..15aea93 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -903,7 +903,10 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
 
 
 /* View Menu */
-gtk_widget_set_sensitive (gtk_ui_manager_get_widget 
(window-priv-ui_manager, /main-menu/view-menu/set-as-wallpaper), TRUE);
+if (rstto_wallpaper_manager_check_running 
(window-priv-wallpaper_manager))
+{
+gtk_widget_set_sensitive (gtk_ui_manager_get_widget 
(window-priv-ui_manager, /main-menu/view-menu/set-as-wallpaper), TRUE);
+}
 gtk_widget_set_sensitive (gtk_ui_manager_get_widget 
(window-priv-ui_manager, /main-menu/view-menu/zoom-menu), TRUE);
 gtk_widget_set_sensitive (gtk_ui_manager_get_widget 
(window-priv-ui_manager, /main-menu/view-menu/rotation-menu), TRUE);
 
@@ -946,7 +949,10 @@ rstto_main_window_update_buttons (RsttoMainWindow *window)
 
 
 /* View Menu */
-gtk_widget_set_sensitive (gtk_ui_manager_get_widget 
(window-priv-ui_manager, /main-menu/view-menu/set-as-wallpaper), TRUE);
+if (rstto_wallpaper_manager_check_running 
(window-priv-wallpaper_manager))
+{
+gtk_widget_set_sensitive (gtk_ui_manager_get_widget 
(window-priv-ui_manager, /main-menu/view-menu/set-as-wallpaper), TRUE);
+}
 gtk_widget_set_sensitive (gtk_ui_manager_get_widget 
(window-priv-ui_manager, /main-menu/view-menu/zoom-menu), TRUE);
 gtk_widget_set_sensitive (gtk_ui_manager_get_widget 
(window-priv-ui_manager, /main-menu/view-menu/rotation-menu), TRUE);
 
@@ -2196,6 +2202,7 @@ cb_rstto_main_window_close_all (GtkWidget *widget, 
RsttoMainWindow *window)
 static void
 cb_rstto_main_window_delete (GtkWidget *widget, RsttoMainWindow *window)
 {
+g_return_if_fail (rstto_image_list_get_n_images 
(window-priv-props.image_list)  0);
 RsttoImage *image = rstto_image_list_iter_get_image (window-priv-iter);
 GFile *file = rstto_image_get_file (image);
 gchar *path = g_file_get_path (file);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] ristretto:master Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto

[Stephan Arts]

Updating branch refs/heads/master
 to 46f80f42f466ddf7f340126d00018d14a87bdf37 (commit)
   from c2e33860a30b9c1d58fc69fc1827455cda3d2eb3 (commit)

commit 46f80f42f466ddf7f340126d00018d14a87bdf37
Merge: c2e33860a30b9c1d58fc69fc1827455cda3d2eb3 
bfdff74842cd3526b1a8b9f328841477f595e0c1
Author: Stephan Arts step...@xfce.org
Date:   Sat Oct 3 11:26:13 2009 +0200

Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto

commit bfdff74842cd3526b1a8b9f328841477f595e0c1
Author: Masato Hashimoto cabezon.hashim...@gmail.com
Date:   Sat Oct 3 06:04:19 2009 +

l10n: Updates to Japanese (ja) translation

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

commit 6b7f3c147d2076f4dbfdfbe263d24b5dd4ce1a42
Author: Leandro Regueiro leandro.regue...@gmail.com
Date:   Thu Oct 1 15:21:15 2009 +

l10n: Updates to Galician (gl) translation

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

commit bd128501c181c9e9115be42c1b05778180865b14
Author: Ignacio Velasco el...@elega.com.ar
Date:   Mon Sep 28 20:37:43 2009 +

l10n: Updates to Spanish (Castilian) (es) translation

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

commit dadc12e86641edb55e2e7b8317bf9d5a2411ff01
Author: Per Kongstad p_kongs...@op.pl
Date:   Mon Sep 28 16:42:46 2009 +

l10n: Updates to Danish (da) translation

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

 po/da.po |   53 ++
 po/es.po |  236 ++---
 po/gl.po |  586 --
 po/ja.po |  196 +
 4 files changed, 343 insertions(+), 728 deletions(-)

diff --git a/po/da.po b/po/da.po
index 7835d14..02d2878 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgstr 
 Project-Id-Version: ristretto 0.0.22\n
 Report-Msgid-Bugs-To: xfce-i...@xfce.org\n
 POT-Creation-Date: 2009-09-27 23:47+0200\n
-PO-Revision-Date: 2009-09-20 17:59+0100\n
+PO-Revision-Date: 2009-09-28 18:41+0100\n
 Last-Translator: Per Kongstad p_kongs...@op.pl\n
 Language-Team: Danish da...@dansk-gruppen.dk\n
 MIME-Version: 1.0\n
@@ -37,8 +37,7 @@ msgid 
 Try %s --help to see a full list of available command line options.\n
 msgstr 
 %s: %s\n
-Prøv %s --help for at se en fuld liste over tilgængelige 
-kommandolinjetilvalg.\n
+Prøv %s --help for at se en fuld liste over tilgængelige 
kommandolinjetilvalg.\n
 
 #. File Menu
 #: ../src/main_window.c:264
@@ -266,13 +265,15 @@ msgstr Top
 msgid Bottom
 msgstr Bund
 
-#: ../src/main_window.c:514 ../src/main_window.c:780
+#: ../src/main_window.c:514
+#: ../src/main_window.c:780
 msgid Press open to select an image
 msgstr Tryk åbn for at vælge et billede
 
-#: ../src/main_window.c:767 ../src/main_window.c:772
+#: ../src/main_window.c:767
+#: ../src/main_window.c:772
 msgid Empty
-msgstr 
+msgstr Tom
 
 #: ../src/main_window.c:1545
 msgid Developer:
@@ -302,8 +303,10 @@ msgstr Billeder
 msgid .jp(e)g
 msgstr .jp(e)g
 
-#: ../src/main_window.c:1917 ../src/main_window.c:1940
-#: ../src/main_window.c:2099 ../src/main_window.c:2114
+#: ../src/main_window.c:1917
+#: ../src/main_window.c:1940
+#: ../src/main_window.c:2099
+#: ../src/main_window.c:2114
 msgid Could not open file
 msgstr Kunne ikke åbne fil
 
@@ -342,7 +345,7 @@ msgstr Maksimal renderingskvalitet:
 
 #: ../src/preferences_dialog.c:269
 msgid Show preview when loading image
-msgstr 
+msgstr Forhåndsvis ved indlæsning af billede
 
 #: ../src/preferences_dialog.c:276
 msgid Best
@@ -426,19 +429,19 @@ msgstr Undlad at skalere mere end 100%, når vindue 
maksimeres.
 
 #: ../src/preferences_dialog.c:421
 msgid Startup
-msgstr 
+msgstr Opstart
 
 #: ../src/preferences_dialog.c:423
 msgid Resize window to image on startup
-msgstr 
+msgstr Tilpas vindue til billede ved opstart
 
 #: ../src/preferences_dialog.c:427
 msgid Open entire folder on startup
-msgstr 
+msgstr Åbn hele mappen ved opstart
 
 #: ../src/preferences_dialog.c:440
 msgid Memory
-msgstr 
+msgstr Hukommelse
 
 #: ../src/preferences_dialog.c:446
 msgid Image cache
@@ -469,70 +472,52 @@ msgid Look at your photo's easily
 msgstr Se nemt dine billeder
 
 #: ../ristretto.desktop.in.h:2
-#, fuzzy
 msgid Photo Viewer
-msgstr Ristretto billedviser
+msgstr Billedfremviser
 
 #: ../ristretto.desktop.in.h:3
-#, fuzzy
 msgid Ristretto
-msgstr Afslut ristretto
+msgstr Ristretto
 
 #~ msgid _Thumbnail Bar
 #~ msgstr _Miniaturebjælke
-
 #~ msgid Image Viewer
 #~ msgstr Billedfremviser
-
 #~ msgid Opening file(s)...
 #~ msgstr Åbne(r) fil(er)...
-
 #~ msgid _Recently used
 #~ msgstr _Senest brugte
-
 #~ msgid No applications available
 #~ msgstr Ingen tilgængelige programmer
-
 #~ msgid Thumbnail _Viewer
 #~ msgstr Miniature_viser
-
 #~ msgid Show _Horizontally
 #~ msgstr Vis _vandret
-
 #~ msgid Show _Vertically
 #~ msgstr Vis _lodret
-
 #~ msgid H_ide
 #~ msgstr S_kjul
-
 #~ msgid 
 #~ One or more images have been modified, do you want to save the changes?
 #~ msgstr 
 #~ Et eller flere billeder er 

[Xfce4-commits] ristretto:master Change default settings

[Stephan Arts]

Updating branch refs/heads/master
 to 08a1da7bfe3324c67a2851c22648ad07418ff445 (commit)
   from 46f80f42f466ddf7f340126d00018d14a87bdf37 (commit)

commit 08a1da7bfe3324c67a2851c22648ad07418ff445
Author: Stephan Arts step...@xfce.org
Date:   Sat Oct 3 11:34:47 2009 +0200

Change default settings

 ChangeLog  |1 +
 src/settings.c |7 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c624518..520caea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
  the set-wallpaper button sensitive
* src/Makefile.am: Replace spaces with tabs, fixes compilation-issues
  with certain versions of automake
+   * src/settings.c: Change default-settings
 
 2009-09-27  Stephan Arts step...@xfce.org
 
diff --git a/src/settings.c b/src/settings.c
index cc9c7ab..1346732 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -151,6 +151,11 @@ rstto_settings_init (GObject *object)
 settings-priv-bgcolor = g_new0 (GdkColor, 1);
 settings-priv-bgcolor_fullscreen = g_new0 (GdkColor, 1);
 settings-priv-image_quality = 200;
+settings-priv-navigationbar_position = g_strdup (bottom);
+settings-priv-show_file_toolbar = TRUE;
+settings-priv-show_nav_toolbar = TRUE;
+settings-priv-window_width = 600;
+settings-priv-window_height = 400;
 
 xfconf_g_property_bind (settings-priv-channel, /window/width, 
G_TYPE_UINT, settings, window-width);
 xfconf_g_property_bind (settings-priv-channel, /window/height, 
G_TYPE_UINT, settings, window-height);
@@ -265,7 +270,7 @@ rstto_settings_class_init (GObjectClass *object_class)
 pspec = g_param_spec_string  (navigationbar-position,
   ,
   ,
-  right,
+  bottom,
   G_PARAM_READWRITE);
 g_object_class_install_property (object_class,
  PROP_NAVBAR_POSITION,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:xfce-4.6 Fix bugs #3532 (umask 0022 not honoured) and #5813 properly (I hope).

[Jannis Pohlmann]

Updating branch refs/heads/xfce-4.6
 to eb58c6a6ba7f77c2c16016db064524df598ef421 (commit)
   from 622ebb3ac3867e54c402f46ad88f1beaed163721 (commit)

commit eb58c6a6ba7f77c2c16016db064524df598ef421
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Oct 3 11:49:41 2009 +0200

Fix bugs #3532 (umask  0022 not honoured) and #5813 properly (I hope).

The previous patch applied in e53de71e6add9b28ba034111a1d19db7def8f7e7
made things worse than before: it used DEFFILEMODE which seems to be
BSD-specific for creating files. It also reset the umask to 0 when
creating the first directory with _thunar_vfs_io_jobs_mkdir().

What we really want is to use 0777 (dirs) and 0666 (files) and let the
standard C system calls like open() apply the umask value. This should
work on all POSIX-compliant systems.

Patch provided by Craig Ringer cr...@postnewspapers.com.au.

 thunar-vfs/thunar-vfs-io-jobs.c |   17 +
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/thunar-vfs/thunar-vfs-io-jobs.c b/thunar-vfs/thunar-vfs-io-jobs.c
index 8d70812..c94523a 100644
--- a/thunar-vfs/thunar-vfs-io-jobs.c
+++ b/thunar-vfs/thunar-vfs-io-jobs.c
@@ -432,8 +432,12 @@ _thunar_vfs_io_jobs_create (ThunarVfsJob *job,
   absolute_path = thunar_vfs_path_dup_string (lp-data);
 
 again:
-  /* try to create the file at the given path */
-  fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, DEFFILEMODE);
+  /* Try to create the file at the given path.
+   *
+   * Note that despite the 0666 mask, we won't really create a 
world-writable
+   * file unless the user's umask permits it (ie the umask is ).
+   */
+  fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, 0666);
   if (G_UNLIKELY (fd  0))
 {
   /* check if the file already exists */
@@ -707,8 +711,13 @@ _thunar_vfs_io_jobs_mkdir (ThunarVfsJob *job,
   /* update the progress information */
   _thunar_vfs_job_process_path (job, lp);
 
-  /* try to create the target directory */
-  if (!_thunar_vfs_io_ops_mkdir (lp-data, 0777  ~umask(0), 
THUNAR_VFS_IO_OPS_NONE, error))
+  /* try to create the target directory
+   *
+   * Note that the mode specified here is limited by the user's umask, so 
we will not
+   * actually be creating a world writable directory unless the user's 
umask permits
+   * it.
+   */
+  if (!_thunar_vfs_io_ops_mkdir (lp-data, 0777, THUNAR_VFS_IO_OPS_NONE, 
error))
 return FALSE;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-vfs:master Fix bugs #3532 (umask 0022 not honoured) and #5813 properly (I hope).

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 59ea6bc0250b0af8b15ad24009b060ae6a327a9e (commit)
   from e62bded7e82aa0d7206f95a54acaf2cce0d1ce66 (commit)

commit 59ea6bc0250b0af8b15ad24009b060ae6a327a9e
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Oct 3 11:49:41 2009 +0200

Fix bugs #3532 (umask  0022 not honoured) and #5813 properly (I hope).

The previous patch applied in e53de71e6add9b28ba034111a1d19db7def8f7e7
made things worse than before: it used DEFFILEMODE which seems to be
BSD-specific for creating files. It also reset the umask to 0 when
creating the first directory with _thunar_vfs_io_jobs_mkdir().

What we really want is to use 0777 (dirs) and 0666 (files) and let the
standard C system calls like open() apply the umask value. This should
work on all POSIX-compliant systems.

Patch provided by Craig Ringer cr...@postnewspapers.com.au.

 thunar-vfs/thunar-vfs-io-jobs.c |   17 +
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/thunar-vfs/thunar-vfs-io-jobs.c b/thunar-vfs/thunar-vfs-io-jobs.c
index 8d70812..c94523a 100644
--- a/thunar-vfs/thunar-vfs-io-jobs.c
+++ b/thunar-vfs/thunar-vfs-io-jobs.c
@@ -432,8 +432,12 @@ _thunar_vfs_io_jobs_create (ThunarVfsJob *job,
   absolute_path = thunar_vfs_path_dup_string (lp-data);
 
 again:
-  /* try to create the file at the given path */
-  fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, DEFFILEMODE);
+  /* Try to create the file at the given path.
+   *
+   * Note that despite the 0666 mask, we won't really create a 
world-writable
+   * file unless the user's umask permits it (ie the umask is ).
+   */
+  fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, 0666);
   if (G_UNLIKELY (fd  0))
 {
   /* check if the file already exists */
@@ -707,8 +711,13 @@ _thunar_vfs_io_jobs_mkdir (ThunarVfsJob *job,
   /* update the progress information */
   _thunar_vfs_job_process_path (job, lp);
 
-  /* try to create the target directory */
-  if (!_thunar_vfs_io_ops_mkdir (lp-data, 0777  ~umask(0), 
THUNAR_VFS_IO_OPS_NONE, error))
+  /* try to create the target directory
+   *
+   * Note that the mode specified here is limited by the user's umask, so 
we will not
+   * actually be creating a world writable directory unless the user's 
umask permits
+   * it.
+   */
+  if (!_thunar_vfs_io_ops_mkdir (lp-data, 0777, THUNAR_VFS_IO_OPS_NONE, 
error))
 return FALSE;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Fix a crash caused by freeing the adblock filters in the wrong way

[Christian Dywan]

Updating branch refs/heads/master
 to 7c2eb4de16a28b65978ee7d2488e50f5a8a69508 (commit)
   from 096a48b14cc43171934c4f8fde4af8b2f8738b2f (commit)

commit 7c2eb4de16a28b65978ee7d2488e50f5a8a69508
Author: Christian Dywan christ...@twotoasts.de
Date:   Sat Oct 3 13:24:43 2009 +0200

Fix a crash caused by freeing the adblock filters in the wrong way

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

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 9def25a..5208dea 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -169,7 +169,7 @@ adblock_preferences_model_row_changed_cb (GtkTreeModel*
model,
 while (gtk_tree_model_iter_next (model, iter));
 filters[length] = NULL;
 midori_extension_set_string_list (extension, filters, filters, length);
-g_strfreev (filters);
+g_free (filters);
 if (need_reload)
 adblock_reload_rules (extension);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfdesktop:master l10n: Updates to Greek (el) translation

[Transifex]

Updating branch refs/heads/master
 to 58e11992718c3fb522092400fe0d2278268160fb (commit)
   from f17459c8242d0686e9f0e1aa98237c2b6bd4d277 (commit)

commit 58e11992718c3fb522092400fe0d2278268160fb
Author: Evaggelos Balaskas ebalas...@ebalaskas.gr
Date:   Sat Oct 3 14:11:33 2009 +

l10n: Updates to Greek (el) translation

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

 po/el.po |  614 ++
 1 files changed, 53 insertions(+), 561 deletions(-)

diff --git a/po/el.po b/po/el.po
index 9781c82..663091c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: xfdesktop git\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2009-09-18 18:20+0200\n
-PO-Revision-Date: 2009-08-30 20:31+0200\n
+PO-Revision-Date: 2009-10-03 17:09+0200\n
 Last-Translator: Evaggelos Balaskas ebalas...@ebalaskas.gr\n
 Language-Team: Greek n...@tux.hellug.gr\n
 MIME-Version: 1.0\n
@@ -19,7 +19,8 @@ msgstr 
 X-Poedit-Country: GREECE\n
 X-Poedit-SourceCharset: utf-8\n
 
-#: ../common/xfdesktop-common.c:95 ../common/xfdesktop-common.c:199
+#: ../common/xfdesktop-common.c:95
+#: ../common/xfdesktop-common.c:199
 #, c-format
 msgid Backdrop list file is not valid
 msgstr Το αρχείο δεν είναι έγκυρο
@@ -104,8 +105,7 @@ msgstr Επεξεργασία μενού
 
 #: ../panel-plugin/xfce4-menu.desktop.in.in.h:1
 msgid Shows a menu containing categories of installed applications
-msgstr 
-Εμφανίζει ένα μενού που περιέχει τις 
κατηγορίες των εγκατεστημένων εφαρμογών
+msgstr Εμφανίζει ένα μενού που περιέχει τις 
κατηγορίες των εγκατεστημένων εφαρμογών
 
 #. no need to escape markup; it's already done for us
 #: ../settings/main.c:162
@@ -117,7 +117,8 @@ msgstr 
 %s\n
 iΜέγεθος %dx%d/i
 
-#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:259
+#: ../settings/main.c:272
+#: ../src/xfdesktop-special-file-icon.c:259
 msgid Home
 msgstr Αρχικός κατάλογος
 
@@ -138,7 +139,8 @@ msgstr Αφαιρούμενα μέσα
 msgid Cannot create backdrop list \%s\
 msgstr Δεν ήταν δυνατή η δημιουργία του 
αρχείου λίστας \%s\
 
-#: ../settings/main.c:462 ../settings/main.c:779
+#: ../settings/main.c:462
+#: ../settings/main.c:779
 msgid Backdrop List Error
 msgstr Σφάλμα στη λίστα παρασκηνίων
 
@@ -148,11 +150,8 @@ msgstr Δημιουργία/φόρτωση λίστας 
παρασκηνίων
 
 #: ../settings/main.c:511
 #, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr 
-Το αρχείο \%s\ δεν είναι έγκυρο αρχείο 
λίστας εικόνων παρασκηνίου. Θέλετε 
-να το αντικαταστήσετε;
+msgid File \%s\ is not a valid backdrop list file.  Do you wish to 
overwrite it?
+msgstr Το αρχείο \%s\ δεν είναι έγκυρο αρχείο 
λίστας εικόνων παρασκηνίου. Θέλετε να το 
αντικαταστήσετε;
 
 #: ../settings/main.c:516
 msgid Invalid List File
@@ -262,11 +261,15 @@ msgstr Επιλογές:\n
 msgid Desktop Menu:%s\n
 msgstr Μενού επιφάνειας εργασίας: %s\n
 
-#: ../src/main.c:249 ../src/main.c:256 ../src/main.c:263
+#: ../src/main.c:249
+#: ../src/main.c:256
+#: ../src/main.c:263
 msgid enabled
 msgstr ενεργοποιημένο
 
-#: ../src/main.c:251 ../src/main.c:258 ../src/main.c:265
+#: ../src/main.c:251
+#: ../src/main.c:258
+#: ../src/main.c:265
 msgid disabled
 msgstr απενεργοποιημένο
 
@@ -293,9 +296,7 @@ msgstr Οι επιλογές είναι:\n
 #: ../src/main.c:292
 #, c-format
 msgid --reload  Reload all settings, refresh image list\n
-msgstr 
---reload  Επαναφόρτωση όλων των 
ρυθμίσεων, ανανέωση της λίστας 
-εικόνων\n
+msgstr --reload  Επαναφόρτωση όλων των 
ρυθμίσεων, ανανέωση της λίστας εικόνων\n
 
 #: ../src/main.c:293
 #, c-format
@@ -304,11 +305,8 @@ msgstr --menu   Εμφάνιση του 
μενού (στην τρέχο
 
 #: ../src/main.c:294
 #, c-format
-msgid 
---windowlist  Pop up the window list (at the current mouse position)\n
-msgstr 
---windowlist Εμφάνιση της λίστας παραθύρων 
(στην τρέχουσα θέση του 
-κέρσορα)\n
+msgid --windowlist  Pop up the window list (at the current mouse 
position)\n
+msgstr --windowlist Εμφάνιση της λίστας 
παραθύρων (στην τρέχουσα θέση του κέρσορα)\n
 
 #: ../src/main.c:295
 #, c-format
@@ -343,7 +341,8 @@ msgstr Χώρος εργασίας %d
 msgid iWorkspace 

[Xfce4-commits] midori:master Add a module.xml for cgit

[Christian Dywan]

Updating branch refs/heads/master
 to b13c69a365286eb5abd215786527cabe1913d13b (commit)
   from 7c2eb4de16a28b65978ee7d2488e50f5a8a69508 (commit)

commit b13c69a365286eb5abd215786527cabe1913d13b
Author: Enrico Tröger enrico.troe...@uvena.de
Date:   Sat Oct 3 18:17:59 2009 +0200

Add a module.xml for cgit

 module.xml |   20 
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/module.xml b/module.xml
new file mode 100644
index 000..bfe1074
--- /dev/null
+++ b/module.xml
@@ -0,0 +1,20 @@
+?xml version='1.0' encoding='UTF-8'?
+Project xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+  xmlns:rdfs=http://www.w3.org/2000/01/rdf-schema#;
+  xmlns:foaf=http://xmlns.com/foaf/0.1/;
+  xmlns:gnome=http://api.gnome.org/doap-extensions#;
+  xmlns=http://usefulinc.com/ns/doap#;
+
+  name xml:lang=enmidori/name
+  shortdesc xml:lang=enMidori is a lightweight web browser/shortdesc
+  homepage rdf:resource=http://www.twotoasts.de/
+  mailing-list rdf:resource=http://foo-projects.org/mailman/listinfo/xfce/
+
+  maintainer
+foaf:Person
+  foaf:nameChristian Dywan/foaf:name
+  foaf:mboxchrist...@twotoasts.de/foaf:mbox
+  gnome:useridkalikiana/gnome:userid
+/foaf:Person
+  /maintainer
+/Project
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] terminal:master l10n: Updates to Czech (cs) translation

[Transifex]

Updating branch refs/heads/master
 to ce12f1298e6dc63d845c916921a474c758258c38 (commit)
   from 009b57c91c7f7fe5bc1074cf94a77bef9db15746 (commit)

commit ce12f1298e6dc63d845c916921a474c758258c38
Author: Michal Várady miko.v...@gmail.com
Date:   Sat Oct 3 17:34:34 2009 +

l10n: Updates to Czech (cs) translation

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

 po/cs.po |  314 +++--
 1 files changed, 77 insertions(+), 237 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 89a0844..fa4d6ad 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgstr 
 Project-Id-Version: Terminal 0.2.10\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2009-10-01 21:47+0200\n
-PO-Revision-Date: 2009-07-19 20:55+0100\n
+PO-Revision-Date: 2009-10-03 19:33+0100\n
 Last-Translator: Michal Várady miko.v...@gmail.com\n
 Language-Team: Czech translation-team...@lists.sourceforge.net\n
 MIME-Version: 1.0\n
@@ -30,22 +30,17 @@ msgstr Obecné
 
 #: ../terminal/main.c:50
 msgid   -h, --help  Print this help message and exit
-msgstr 
-  -h, --help  Zobrazí tuto nápovědu a ukončí se
+msgstr   -h, --help  Zobrazí tuto nápovědu a 
ukončí se
 
 #: ../terminal/main.c:51
-msgid 
-  -V, --version   Print version information and exit
-msgstr 
-  -V, --version   Zobrazí informace o verzi a ukončí 
se
+msgid   -V, --version   Print version information and 
exit
+msgstr   -V, --version   Zobrazí informace o verzi a 
ukončí se
 
 #: ../terminal/main.c:52
 msgid 
   --disable-serverDo not register with the D-BUS\n
   session message bus
-msgstr 
-  --disable-serverNezaregistruje se k relaci sběrnice D-
-BUS
+msgstr   --disable-serverNezaregistruje se k relaci 
sběrnice D-BUS
 
 #: ../terminal/main.c:54
 msgid   --default-display=DISPLAY   default X display to use
@@ -80,8 +75,7 @@ msgid 
   provided
 msgstr 
   --windowOtevřít nové okno obsahující 
jednu\n
-  kartu; lze zadat více než jednu 
-takovou\n
+  kartu; lze zadat více než jednu 
takovou\n
   volbu
 
 #: ../terminal/main.c:66
@@ -92,9 +86,7 @@ msgstr Možnosti karty
 msgid 
   -x, --execute   Execute the remainder of the command\n
   line inside the terminal
-msgstr 
-  -x, --execute   Spustí zbytek příkazové řádky v 
-terminálu
+msgstr   -x, --execute   Spustí zbytek příkazové 
řádky v terminálu
 
 #: ../terminal/main.c:69
 msgid 
@@ -105,10 +97,8 @@ msgstr 
   terminálu
 
 #: ../terminal/main.c:71
-msgid 
-  --working-directory=DIRNAME Set the terminal's working directory
-msgstr 
-  --working-directory=NÁZEV_ADRESÁŘE  Nastaví pracovní adresář 
terminálu
+msgid   --working-directory=DIRNAME Set the terminal's working 
directory
+msgstr   --working-directory=NÁZEV_ADRESÁŘE  Nastaví pracovní adresář 
terminálu
 
 #: ../terminal/main.c:72
 msgid   -T, --title=TITLE   Set the terminal's title
@@ -140,10 +130,8 @@ msgid 
   man page), can be specified once per\n
   window to be opened
 msgstr 
-  --geometry=GEOMETRIESpecifikace geometrie X (viz 
-manuálová\n
-  stránka \X\), může být zadána 
jedna 
-na\n
+  --geometry=GEOMETRIESpecifikace geometrie X (viz 
manuálová\n
+  stránka \X\), může být zadána 
jedna na\n
   otevřené okno
 
 #: ../terminal/main.c:82
@@ -163,8 +151,7 @@ msgid 
   --startup-id=STRING ID for the startup notification\n
   protocol
 msgstr 
-  --startup-id=ŘETĚZECIdentifikátor pro protokol 
oznámení 
-při\n
+  --startup-id=ŘETĚZECIdentifikátor pro protokol 
oznámení při\n
   spuštění
 
 #: ../terminal/main.c:88
@@ -172,10 +159,8 @@ msgid 
   -I, --icon=ICON Set the terminal's icon as an icon\n
   name or filename
 msgstr 
-  -I, --icon=IKONANastaví ikonu terminálu jako název 
-ikony\n
- nebo název souboru name or 
-filename
+  -I, --icon=IKONANastaví ikonu terminálu jako název 
ikony\n
+ nebo název souboru 

[Xfce4-commits] midori:master Go back to the previous, faster pattern handling in adblock

[Christian Dywan]

Updating branch refs/heads/master
 to c812efad2b0ee360077625b05376d0fa98904f8c (commit)
   from b13c69a365286eb5abd215786527cabe1913d13b (commit)

commit c812efad2b0ee360077625b05376d0fa98904f8c
Author: Alexander Butenko a.bute...@gmail.com
Date:   Sat Oct 3 23:52:59 2009 +0200

Go back to the previous, faster pattern handling in adblock

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

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 5208dea..1d964ca 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -508,31 +508,10 @@ adblock_parse_line (gchar* line)
 return adblock_fixup_regexp (line);
 }
 
-static GRegex*
-adblock_add_regexp (gchar *line)
-{
-GError* error;
-GRegex* regex;
-
-error = NULL;
-regex = g_regex_new (line, G_REGEX_OPTIMIZE | G_REGEX_CASELESS,
-   G_REGEX_MATCH_NOTEMPTY, error);
-if (error)
-{
-g_warning (%s: %s, G_STRFUNC, error-message);
-g_error_free (error);
-return NULL;
-}
-else
-return regex;
-}
-
 static GHashTable*
 adblock_parse_file (gchar* path)
 {
 FILE* file;
-int maxlimit = 150;
-int i = 0;
 if ((file = g_fopen (path, r)))
 {
 GHashTable* patt = g_hash_table_new_full (g_str_hash, g_str_equal,
@@ -541,35 +520,33 @@ adblock_parse_file (gchar* path)
 
 gboolean have_pattern = FALSE;
 gchar line[500];
-gchar* rline = ;
+GRegex* regex;
 
 while (fgets (line, 500, file))
 {
+GError* error = NULL;
 gchar* parsed;
 
 parsed = adblock_parse_line (line);
 if (!parsed)
 continue;
 
-i++;
-rline = g_strdup_printf (%s|%s, rline, parsed);
-if (rline  *rline  i = maxlimit)
+regex = g_regex_new (parsed, G_REGEX_OPTIMIZE,
+ G_REGEX_MATCH_NOTEMPTY, error);
+if (error)
+{
+g_warning (%s: %s, G_STRFUNC, error-message);
+g_error_free (error);
+g_free (parsed);
+}
+else
 {
 have_pattern = TRUE;
-g_hash_table_insert (patt, rline, adblock_add_regexp (rline));
-rline = g_strdup ();
-i = 0;
+g_hash_table_insert (patt, parsed, regex);
 }
 }
 fclose (file);
 
-if (rline  *rline)
-{
-have_pattern = TRUE;
-g_hash_table_insert (patt, rline, adblock_add_regexp (rline));
-rline = g_strdup ();
-}
-
 if (have_pattern)
 return patt;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Use orientation property of the toolbar instead of the function

[Christian Dywan]

Updating branch refs/heads/master
 to 136f5d981f5eee654d77c4007b47c5becb1a366f (commit)
   from 53b3c6aee3a8ebc902c8eb04e3c6826554595940 (commit)

commit 136f5d981f5eee654d77c4007b47c5becb1a366f
Author: Christian Dywan christ...@twotoasts.de
Date:   Sat Oct 3 23:59:32 2009 +0200

Use orientation property of the toolbar instead of the function

The function is superseded with the introduction of the orientable
interface in new GTK+ releases, but the property is the same.

 midori/midori-panel.c |3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index 6ae27e1..1368017 100644
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -356,8 +356,7 @@ midori_panel_init (MidoriPanel* panel)
 gtk_toolbar_set_style (GTK_TOOLBAR (panel-toolbar), GTK_TOOLBAR_BOTH);
 gtk_toolbar_set_icon_size (GTK_TOOLBAR (panel-toolbar),
GTK_ICON_SIZE_BUTTON);
-gtk_toolbar_set_orientation (GTK_TOOLBAR (panel-toolbar),
- GTK_ORIENTATION_VERTICAL);
+g_object_set (panel-toolbar, orientation, GTK_ORIENTATION_VERTICAL, 
NULL);
 gtk_box_pack_start (GTK_BOX (panel), panel-toolbar, FALSE, FALSE, 0);
 gtk_widget_show_all (panel-toolbar);
 vbox = gtk_vbox_new (FALSE, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Measure the performance of adblock parsing with a unit test

[Christian Dywan]

Updating branch refs/heads/master
 to 53b3c6aee3a8ebc902c8eb04e3c6826554595940 (commit)
   from c812efad2b0ee360077625b05376d0fa98904f8c (commit)

commit 53b3c6aee3a8ebc902c8eb04e3c6826554595940
Author: Alexander Butenko a.bute...@gmail.com
Date:   Sat Oct 3 23:57:12 2009 +0200

Measure the performance of adblock parsing with a unit test

 extensions/adblock.c |   28 
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 1d964ca..b742ae2 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -657,11 +657,39 @@ test_adblock_pattern (void)
 g_unlink (filename);
 }
 
+static void
+test_adblock_count (void)
+{
+gchar* urls[6] = {
+
https://bugs.webkit.org/buglist.cgi?query_format=advancedshort_desc_type=allwordssubstrshort_desc=long_desc_type=substringlong_desc=bug_file_loc_type=allwordssubstrbug_file_loc=keywords_type=allwordskeywords=bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDemailassigned_to1=1emailtype1=substringemail1=emailassigned_to2=1emailreporter2=1emailcc2=1emailtype2=substringemail2=bugidtype=includebug_id=votes=chfieldfrom=chfieldto=Nowchfieldvalue=query_based_on=gtkportfield0-0-0=keywordstype0-0-0=anywordssubstrvalue0-0-0=Gtk%20Cairo%20soupfield0-0-1=short_desctype0-0-1=anywordssubstrvalue0-0-1=Gtk%20Cairo%20soup%20autoconf%20automake%20autotoolfield0-0-2=componenttype0-0-2=equalsvalue0-0-2=WebKit%20Gtk;,
+
http://www.engadget.com/2009/09/24/google-hits-android-rom-modder-with-a-cease-and-desist-letter/;,
+
http://karibik-invest.com/es/bienes_raices/search.php?sqT=19sqN=sqMp=sqL=0qR=1sqMb=searchMode=1action=B%FAsqueda;,
+http://google.com;,
+http://ya.ru;,
+http://google.com;
+};
+/* FIXME */
+gchar* filename = 
/home/avb/.cache/midori/adblock/bb6cd38a4579b3605946b1228fa65297;
+gdouble elapsed = 0.0;
+gchar* str;
+int i;
+pattern = adblock_parse_file (filename);
+for (i = 0; i  6; i++)
+{
+str = urls[i];
+g_test_timer_start ();
+g_hash_table_find (pattern, (GHRFunc) adblock_is_matched,str);
+elapsed += g_test_timer_elapsed ();
+}
+g_print (Search took %f seconds\n, elapsed);
+}
+
 void
 extension_test (void)
 {
 g_test_add_func (/extensions/adblock/parse, test_adblock_parse);
 g_test_add_func (/extensions/adblock/pattern, test_adblock_pattern);
+g_test_add_func (/extensions/adblock/count, test_adblock_count);
 }
 #endif
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Fix a leaked folder string when activating extensions

[Christian Dywan]

Updating branch refs/heads/master
 to d4c9c87f79e3dd2d1ebba7972fd1102d90aba343 (commit)
   from 2ff14cf64d920a55c66c81f08fb53f4153659af7 (commit)

commit d4c9c87f79e3dd2d1ebba7972fd1102d90aba343
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Oct 4 00:02:52 2009 +0200

Fix a leaked folder string when activating extensions

 midori/midori-extension.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/midori/midori-extension.c b/midori/midori-extension.c
index 27ab9df..9eceea8 100644
--- a/midori/midori-extension.c
+++ b/midori/midori-extension.c
@@ -278,6 +278,7 @@ midori_extension_activate_cb (MidoriExtension* extension,
 gchar* folder = g_strconcat (extensions/, filename, NULL);
 katze_assign (config_file,
 sokoke_find_config_filename (folder, config));
+g_free (folder);
 g_key_file_load_from_file (extension-priv-key_file, 
config_file,
G_KEY_FILE_KEEP_COMMENTS, NULL);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Fix a leaked URI string when injecting user scripts

[Christian Dywan]

Updating branch refs/heads/master
 to 2ff14cf64d920a55c66c81f08fb53f4153659af7 (commit)
   from 136f5d981f5eee654d77c4007b47c5becb1a366f (commit)

commit 2ff14cf64d920a55c66c81f08fb53f4153659af7
Author: Christian Dywan christ...@twotoasts.de
Date:   Sun Oct 4 00:02:23 2009 +0200

Fix a leaked URI string when injecting user scripts

 panels/midori-addons.c |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/panels/midori-addons.c b/panels/midori-addons.c
index cb81b01..0d1c092 100644
--- a/panels/midori-addons.c
+++ b/panels/midori-addons.c
@@ -781,7 +781,7 @@ midori_web_widget_context_ready_cb (GtkWidget* 
web_widget,
 JSGlobalContextRef js_context,
 MidoriAddons*  addons)
 {
-const gchar* uri;
+gchar* uri;
 GSList* elements;
 struct AddonElement* element;
 gchar* fullname;
@@ -831,6 +831,8 @@ midori_web_widget_context_ready_cb (GtkWidget* 
web_widget,
 
 elements = g_slist_next (elements);
 }
+
+g_free (uri);
 }
 
 /**
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits