[Xfce4-commits] use guint8 instead of guchar for priority to make the API less weird

[Brian J . Tarricone]

Updating branch refs/heads/kelnos/new-sm-client
 to 84cd0e06784a873e7bd3545e36658f11812bdd00 (commit)
   from cefce6747008210fdc97b84e96f2f0624a3767a7 (commit)

commit 84cd0e06784a873e7bd3545e36658f11812bdd00
Author: Brian J. Tarricone 
Date:   Mon Oct 5 23:37:37 2009 -0700

use guint8 instead of guchar for priority to make the API less weird

 libxfce4ui/xfce-sm-client.c |6 +++---
 libxfce4ui/xfce-sm-client.h |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index 8177d01..ace857f 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -141,7 +141,7 @@ struct _XfceSMClient
 XfceSMClientState state;
 XfceSMClientRestartStyle restart_style;
 
-guchar priority;
+guint8 priority;
 
 gchar *client_id;
 
@@ -1961,7 +1961,7 @@ xfce_sm_client_set_restart_style(XfceSMClient *sm_client,
  **/
 void
 xfce_sm_client_set_priority(XfceSMClient *sm_client,
-guchar priority)
+guint8 priority)
 {
 g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client));
 
@@ -2101,7 +2101,7 @@ xfce_sm_client_get_restart_style(XfceSMClient *sm_client)
  *
  * Returns: a value from #G_MININT8 to #G_MAXINT8
  **/
-guchar
+guint8
 xfce_sm_client_get_priority(XfceSMClient *sm_client)
 {
 g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client),
diff --git a/libxfce4ui/xfce-sm-client.h b/libxfce4ui/xfce-sm-client.h
index e0acac0..82878e9 100644
--- a/libxfce4ui/xfce-sm-client.h
+++ b/libxfce4ui/xfce-sm-client.h
@@ -102,8 +102,8 @@ void xfce_sm_client_set_restart_style(XfceSMClient 
*sm_client,
 XfceSMClientRestartStyle xfce_sm_client_get_restart_style(XfceSMClient 
*sm_client);
 
 void xfce_sm_client_set_priority(XfceSMClient *sm_client,
- guchar priority);
-guchar xfce_sm_client_get_priority(XfceSMClient *sm_client);
+ guint8 priority);
+guint8 xfce_sm_client_get_priority(XfceSMClient *sm_client);
 
 void xfce_sm_client_set_current_directory(XfceSMClient *sm_client,
   const gchar *current_directory);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] constify the xfce_sm_client_get_restart_command() return value

[Brian J . Tarricone]

Updating branch refs/heads/kelnos/new-sm-client
 to cefce6747008210fdc97b84e96f2f0624a3767a7 (commit)
   from 00f1a6a61f95ffa749e9a5346e154cb76ab7593d (commit)

commit cefce6747008210fdc97b84e96f2f0624a3767a7
Author: Brian J. Tarricone 
Date:   Mon Oct 5 22:06:53 2009 -0700

constify the xfce_sm_client_get_restart_command() return value

 libxfce4ui/xfce-sm-client.c |4 ++--
 libxfce4ui/xfce-sm-client.h |3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index c0dd427..8177d01 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -2234,9 +2234,9 @@ xfce_sm_client_get_current_directory(XfceSMClient 
*sm_client)
  *
  * Returns: an object-owned string vector
  **/
-gchar **
+G_CONST_RETURN gchar * G_CONST_RETURN *
 xfce_sm_client_get_restart_command(XfceSMClient *sm_client)
 {
 g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client), NULL);
-return sm_client->restart_command;
+return (const gchar * const *)sm_client->restart_command;
 }
diff --git a/libxfce4ui/xfce-sm-client.h b/libxfce4ui/xfce-sm-client.h
index 6b84858..e0acac0 100644
--- a/libxfce4ui/xfce-sm-client.h
+++ b/libxfce4ui/xfce-sm-client.h
@@ -111,7 +111,8 @@ G_CONST_RETURN gchar 
*xfce_sm_client_get_current_directory(XfceSMClient *sm_clie
 
 void xfce_sm_client_set_restart_command(XfceSMClient *sm_client,
 gchar **restart_command);
-gchar **xfce_sm_client_get_restart_command(XfceSMClient *sm_client);
+G_CONST_RETURN gchar * G_CONST_RETURN *
+xfce_sm_client_get_restart_command(XfceSMClient *sm_client);
 
 G_END_DECLS
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Format addresses nicely, with no percents and no punycode

[Christian Dywan]

Updating branch refs/heads/master
 to 7aaf59ec9a75553ea081c9988bf03b6d3006bb3c (commit)
   from 19982199339aa083d8dc08d2c4dc95e02198485d (commit)

commit 7aaf59ec9a75553ea081c9988bf03b6d3006bb3c
Author: Christian Dywan 
Date:   Mon Oct 5 20:50:08 2009 +0200

Format addresses nicely, with no percents and no punycode

 midori/midori-browser.c |2 +-
 midori/midori-view.c|4 ++--
 midori/sokoke.c |   36 
 midori/sokoke.h |3 +++
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 2d48f23..dc549a8 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -351,7 +351,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
 gboolean is_location = widget ?
 MIDORI_IS_LOCATION_ENTRY (gtk_widget_get_parent (widget)) : FALSE;
 
-katze_assign (browser->statusbar_text, g_strdup (text));
+katze_assign (browser->statusbar_text, sokoke_format_uri_for_display 
(text));
 
 if (!GTK_WIDGET_VISIBLE (browser->statusbar) && !is_location)
 {
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 35bcb69..01c743e 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -748,7 +748,7 @@ webkit_web_view_load_committed_cb (WebKitWebView*  web_view,
 
 uri = webkit_web_frame_get_uri (web_frame);
 g_return_if_fail (uri != NULL);
-katze_assign (view->uri, g_strdup (uri));
+katze_assign (view->uri, sokoke_format_uri_for_display (uri));
 if (view->item)
 {
 #if 0
@@ -2831,7 +2831,7 @@ midori_view_set_uri (MidoriView*  view,
 }
 else
 {
-katze_assign (view->uri, g_strdup (uri));
+katze_assign (view->uri, sokoke_format_uri_for_display (uri));
 g_object_notify (G_OBJECT (view), "uri");
 if (view->item)
 katze_item_set_uri (view->item, uri);
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 7d40e8d..a1fa336 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -358,6 +358,42 @@ sokoke_magic_uri (const gchar* uri,
 return search;
 }
 
+/**
+ * sokoke_format_uri_for_display:
+ * @uri: an URI string
+ *
+ * Formats an URI for display, for instance by converting
+ * percent encoded characters and by decoding punycode.
+ *
+ * Return value: a newly allocated URI
+ **/
+gchar*
+sokoke_format_uri_for_display (const gchar* uri)
+{
+if (uri && g_str_has_prefix (uri, "http://";))
+{
+gchar* unescaped = g_uri_unescape_string (uri, NULL);
+#ifdef HAVE_LIBSOUP_2_27_90
+gchar* decoded = g_hostname_to_unicode (unescaped);
+if (decoded)
+{
+g_free (unescaped);
+return decoded;
+}
+return unescaped;
+#elif HAVE_LIBIDN
+gchar* decoded;
+if (!idna_to_unicode_8z8z (unescaped, &decoded, 0) == IDNA_SUCCESS)
+return unescaped;
+g_free (unescaped);
+return decoded;
+#else
+return unescaped;
+#endif
+}
+return g_strdup (uri);
+}
+
 void
 sokoke_combo_box_add_strings (GtkComboBox* combobox,
   const gchar* label_first, ...)
diff --git a/midori/sokoke.h b/midori/sokoke.h
index ea23caa..15f2c88 100644
--- a/midori/sokoke.h
+++ b/midori/sokoke.h
@@ -48,6 +48,9 @@ gchar*
 sokoke_magic_uri(const gchar*uri,
  KatzeArray* search_engines);
 
+gchar*
+sokoke_format_uri_for_display   (const gchar*uri);
+
 typedef enum {
 SOKOKE_MENU_POSITION_CURSOR = 0,
 SOKOKE_MENU_POSITION_LEFT,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Enable integrated page setup combo box for printing

[Christian Dywan]

Updating branch refs/heads/master
 to c624048c218c2d3d73518de81f5138e41e1797b2 (commit)
   from 7aaf59ec9a75553ea081c9988bf03b6d3006bb3c (commit)

commit c624048c218c2d3d73518de81f5138e41e1797b2
Author: Christian Dywan 
Date:   Mon Oct 5 20:52:34 2009 +0200

Enable integrated page setup combo box for printing

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

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 01c743e..1ca49dc 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3774,6 +3774,9 @@ midori_view_print (MidoriView* view)
 #if WEBKIT_CHECK_VERSION (1, 1, 5)
 operation = gtk_print_operation_new ();
 gtk_print_operation_set_custom_tab_label (operation, _("Features"));
+#if GTK_CHECK_VERSION (2, 18, 0)
+gtk_print_operation_set_embed_page_setup (operation, TRUE);
+#endif
 g_signal_connect (operation, "create-custom-widget",
 G_CALLBACK (midori_view_print_create_custom_widget_cb), view);
 g_signal_connect (operation, "custom-widget-apply",
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] don't try to call g_set_application_name() if it's already set

[Brian J . Tarricone]

Updating branch refs/heads/kelnos/new-sm-client
 to b2598aef0fb1dbe516a6746ec2da4b919543589b (commit)
   from 5699458f827e758aa087e4796db5764778bac5aa (commit)

commit b2598aef0fb1dbe516a6746ec2da4b919543589b
Author: Brian J. Tarricone 
Date:   Mon Oct 5 13:03:17 2009 -0700

don't try to call g_set_application_name() if it's already set

 libxfce4ui/xfce-sm-client.c |8 +---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index 888a711..bca246d 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -1815,9 +1815,11 @@ xfce_sm_client_set_desktop_file(XfceSMClient *sm_client,
 
 xfce_rc_set_group(rcfile, "Desktop Entry");
 
-name = xfce_rc_read_entry(rcfile, "Name", NULL);
-if(name)
-g_set_application_name(name);
+if(!g_get_application_name()) {
+name = xfce_rc_read_entry(rcfile, "Name", NULL);
+if(name)
+g_set_application_name(name);
+}
 
 icon = xfce_rc_read_entry(rcfile, "Icon", NULL);
 if(icon) {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] use g_strcmp0() instead of custom xfce_safe_strcmp()

[Brian J . Tarricone]

Updating branch refs/heads/kelnos/new-sm-client
 to 00f1a6a61f95ffa749e9a5346e154cb76ab7593d (commit)
   from a6767cb98b36c5544623effdd29ecfb080148566 (commit)

commit 00f1a6a61f95ffa749e9a5346e154cb76ab7593d
Author: Brian J. Tarricone 
Date:   Mon Oct 5 13:37:04 2009 -0700

use g_strcmp0() instead of custom xfce_safe_strcmp()

 libxfce4ui/xfce-sm-client.c |   11 +++
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index dc85962..c0dd427 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -73,11 +73,6 @@
 #define SM_ARG_APPEND 1
 #define SM_ARG_REMOVE 2
 
-#define xfce_safe_strcmp(s1, s2)  ( (!s1 && !s2) \
-? 0 : (!s1 \
-   ? -1 : (!s2 \
-   ? 1 : strcmp(s1, s2))) )
-
 typedef enum
 {
 XFCE_SM_CLIENT_STATE_DISCONNECTED = 0,
@@ -636,7 +631,7 @@ static void
 xfce_sm_client_set_client_id(XfceSMClient *sm_client,
  const gchar *client_id)
 {
-if(!xfce_safe_strcmp(sm_client->client_id, client_id))
+if(!g_strcmp0(sm_client->client_id, client_id))
 return;
 
 g_free(sm_client->client_id);
@@ -1784,7 +1779,7 @@ xfce_sm_client_set_desktop_file(XfceSMClient *sm_client,
 g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client));
 g_return_if_fail(desktop_file);
 
-if(!xfce_safe_strcmp(sm_client->desktop_file, desktop_file))
+if(!g_strcmp0(sm_client->desktop_file, desktop_file))
 return;
 
 if(!g_path_is_absolute(desktop_file)) {
@@ -2011,7 +2006,7 @@ xfce_sm_client_set_current_directory(XfceSMClient 
*sm_client,
 g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client));
 g_return_if_fail(current_directory && current_directory[0]);
 
-if(!xfce_safe_strcmp(sm_client->current_directory, current_directory))
+if(!g_strcmp0(sm_client->current_directory, current_directory))
 return;
 
 g_free(sm_client->current_directory);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] don't set the default window icon if it's already set

[Brian J . Tarricone]

Updating branch refs/heads/kelnos/new-sm-client
 to a6767cb98b36c5544623effdd29ecfb080148566 (commit)
   from b2598aef0fb1dbe516a6746ec2da4b919543589b (commit)

commit a6767cb98b36c5544623effdd29ecfb080148566
Author: Brian J. Tarricone 
Date:   Mon Oct 5 13:07:37 2009 -0700

don't set the default window icon if it's already set

 libxfce4ui/xfce-sm-client.c |   27 +--
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index bca246d..dc85962 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -1777,6 +1777,8 @@ xfce_sm_client_set_desktop_file(XfceSMClient *sm_client,
 {
 XfceRc *rcfile = NULL;
 gchar *real_desktop_file = NULL;
+gboolean has_default_icon = FALSE;
+GList *icon_list;
 const gchar *name, *icon, *exec;
 
 g_return_if_fail(XFCE_IS_SM_CLIENT(sm_client));
@@ -1821,12 +1823,25 @@ xfce_sm_client_set_desktop_file(XfceSMClient *sm_client,
 g_set_application_name(name);
 }
 
-icon = xfce_rc_read_entry(rcfile, "Icon", NULL);
-if(icon) {
-if(g_path_is_absolute(icon))
-gtk_window_set_default_icon_from_file(icon, NULL);
-else
-gtk_window_set_default_icon_name(icon);
+#if GTK_CHECK_VERSION(2, 16, 0)
+if(gtk_window_get_default_icon_name())
+has_default_icon = TRUE;
+#endif
+
+icon_list = gtk_window_get_default_icon_list();
+if(icon_list) {
+has_default_icon = TRUE;
+g_list_free(icon_list);
+}
+
+if(!has_default_icon) {
+icon = xfce_rc_read_entry(rcfile, "Icon", NULL);
+if(icon) {
+if(g_path_is_absolute(icon))
+gtk_window_set_default_icon_from_file(icon, NULL);
+else
+gtk_window_set_default_icon_name(icon);
+}
 }
 
 exec = xfce_rc_read_entry(rcfile, "Exec", NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

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

[Enrico Tröger]

Updating branch refs/heads/master
 to 323453c2e311806687055a60032ca5bb531ebf0f (commit)
   from f05d445ecbfc8e5ddfb08c2073ec72b6782df520 (commit)

commit 323453c2e311806687055a60032ca5bb531ebf0f
Merge: f05d445ecbfc8e5ddfb08c2073ec72b6782df520 
ff3f3031e5cf8a3ef302a70aa3af5c4f7b901811
Author: Enrico Tröger 
Date:   Mon Oct 5 19:47:04 2009 +0200

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

commit ff3f3031e5cf8a3ef302a70aa3af5c4f7b901811
Author: Masato Hashimoto 
Date:   Mon Oct 5 14:26:26 2009 +

l10n: Updates to Japanese (ja) translation

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

 po/ja.po |  281 --
 1 files changed, 145 insertions(+), 136 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index d7e9b09..6df4a69 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gigolo 0.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-10 22:54+0900\n"
-"PO-Revision-Date: 2009-06-13 20:21+0900\n"
+"POT-Creation-Date: 2009-10-05 23:09+0900\n"
+"PO-Revision-Date: 2009-10-05 23:10+0900\n"
 "Last-Translator: Masato Hashimoto \n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -37,210 +37,210 @@ msgstr "バージョン情報を表示する"
 msgid "- a simple frontend to easily connect to remote filesystems"
 msgstr "- 
リモートファイルシステムに簡単に接続するシンプルなフロントエンド"
 
-#: ../src/common.c:73
+#: ../src/common.c:77
 msgid "Unix Device"
 msgstr "Unix デバイス"
 
-#: ../src/common.c:75
+#: ../src/common.c:79
 msgid "Windows Share"
 msgstr "Windows 共有"
 
-#: ../src/common.c:77
+#: ../src/common.c:81
 msgid "FTP"
 msgstr "FTP"
 
-#: ../src/common.c:79
+#: ../src/common.c:83
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/common.c:81
+#: ../src/common.c:85
 msgid "SSH"
 msgstr "SSH"
 
-#: ../src/common.c:83
+#: ../src/common.c:87
 msgid "Obex"
 msgstr "Obex"
 
-#: ../src/common.c:85
+#: ../src/common.c:89
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../src/common.c:87
+#: ../src/common.c:91
 msgid "WebDAV (secure)"
 msgstr "WebDAV (セキュア)"
 
-#: ../src/common.c:89
-#: ../src/window.c:1394
+#: ../src/common.c:93
+#: ../src/window.c:1351
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../src/common.c:91
+#: ../src/common.c:95
 msgid "Archive"
 msgstr "アーカイブ"
 
-#: ../src/common.c:93
+#: ../src/common.c:97
 msgid "Photos"
 msgstr "写真"
 
-#: ../src/common.c:95
+#: ../src/common.c:99
 msgid "Custom Location"
 msgstr "個別に指定した場所"
 
-#: ../src/window.c:280
+#: ../src/window.c:253
 #, c-format
 msgid "Connecting to \"%s\""
 msgstr "接続しています: \"%s\""
 
-#: ../src/window.c:448
+#: ../src/window.c:421
 #: ../gigolo.desktop.in.h:1
 msgid "A simple frontend to easily connect to remote filesystems"
 msgstr 
"リモートファイルシステムに簡単に接続するシンプルなフロントエンド"
 
-#: ../src/window.c:449
+#: ../src/window.c:422
 msgid "Copyright 2008-2009 Enrico Tröger"
 msgstr "Copyright 2008-2009 Enrico Tröger"
 
-#: ../src/window.c:452
+#: ../src/window.c:425
 msgid "translator-credits"
 msgstr "Masato Hashimoto "
 
-#: ../src/window.c:484
+#: ../src/window.c:457
 msgid "Gigolo can use the following protocols provided by GVfs:"
 msgstr "Gigolo は GVFS 
により以下のプロトコルを使用することができます:"
 
-#: ../src/window.c:713
-#: ../src/bookmarkeditdialog.c:189
-#: ../src/bookmarkeditdialog.c:208
-#: ../src/bookmarkeditdialog.c:221
-#: ../src/bookmarkeditdialog.c:232
-#: ../src/bookmarkeditdialog.c:243
+#: ../src/window.c:670
+#: ../src/bookmarkeditdialog.c:210
+#: ../src/bookmarkeditdialog.c:229
+#: ../src/bookmarkeditdialog.c:242
+#: ../src/bookmarkeditdialog.c:253
+#: ../src/bookmarkeditdialog.c:264
 msgid "Error"
 msgstr "エラー"
 
-#: ../src/window.c:1180
+#: ../src/window.c:1137
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../src/window.c:1181
+#: ../src/window.c:1138
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../src/window.c:1182
+#: ../src/window.c:1139
 msgid "_Actions"
 msgstr "アクション(_A)"
 
-#: ../src/window.c:1183
+#: ../src/window.c:1140
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../src/window.c:1184
+#: ../src/window.c:1141
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../src/window.c:1188
-#: ../src/browsenetworkpanel.c:439
-#: ../src/browsenetworkpanel.c:481
+#: ../src/window.c:1145
+#: ../src/browsenetworkpanel.c:453
+#: ../src/browsenetworkpanel.c:497
 msgid "Create _Bookmark"
 msgstr "ブックマークの作成(_B)"
 
-#: ../src/window.c:1190
+#: ../src/window.c:1147
 msgid "_Edit Bookmarks"
 msgstr "ブックマークの編集(_E)"
 
-#: ../src/window.c:1191
+#: ../src/window.c:1148
 msgid "Open the bookmark manager to add, edit or delete bookmarks"
 msgstr 
"ブックマークマネージャを開き、ブックマークの追加、編集、または削除を行います"
 
-#: ../sr

[Xfce4-commits] Rename D-Bus service file, add others for the cache and the manager.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to f9053a4334e1a8642ae31284c734052d0e206347 (commit)
   from e3995be157cf9c161f09ba24e07ac8ef92ca04ec (commit)

commit f9053a4334e1a8642ae31284c734052d0e206347
Author: Jannis Pohlmann 
Date:   Mon Oct 5 19:46:26 2009 +0200

Rename D-Bus service file, add others for the cache and the manager.

This finally fixes the D-Bus activation issues and starts tumblerd
automatically e.g. when Thunar is started.

 tumblerd/Makefile.am   |6 +-
 ...service.in => org.xfce.TumblerCache.service.in} |0
 ...rvice.in => org.xfce.TumblerManager.service.in} |2 +-
 ...e.in => org.xfce.TumblerThumbnailer.service.in} |0
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am
index aeaa0f9..75e4e91 100644
--- a/tumblerd/Makefile.am
+++ b/tumblerd/Makefile.am
@@ -73,7 +73,11 @@ tumblerd_LDADD = 
\
$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
 
 servicedir = $(datadir)/dbus-1/services
-service_in_files = org.xfce.Tumbler.service.in
+service_in_files = \
+   org.xfce.TumblerCache.service.in\
+   org.xfce.TumblerManager.service.in  \
+   org.xfce.TumblerThumbnailer.service.in
+
 service_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
diff --git a/tumblerd/org.xfce.Tumbler.service.in 
b/tumblerd/org.xfce.TumblerCache.service.in
similarity index 100%
copy from tumblerd/org.xfce.Tumbler.service.in
copy to tumblerd/org.xfce.TumblerCache.service.in
diff --git a/tumblerd/org.xfce.Tumbler.service.in 
b/tumblerd/org.xfce.TumblerManager.service.in
similarity index 53%
copy from tumblerd/org.xfce.Tumbler.service.in
copy to tumblerd/org.xfce.TumblerManager.service.in
index cdf8b8e..af2d536 100644
--- a/tumblerd/org.xfce.Tumbler.service.in
+++ b/tumblerd/org.xfce.TumblerManager.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.xfce.thumbnails.Thumbnailer
+Name=org.xfce.thumbnails.Manager
 ex...@libexecdir@/tumblerd
diff --git a/tumblerd/org.xfce.Tumbler.service.in 
b/tumblerd/org.xfce.TumblerThumbnailer.service.in
similarity index 100%
rename from tumblerd/org.xfce.Tumbler.service.in
rename to tumblerd/org.xfce.TumblerThumbnailer.service.in
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Minor fixes

[Enrico Tröger]

Updating branch refs/heads/master
 to f05d445ecbfc8e5ddfb08c2073ec72b6782df520 (commit)
   from 4cc13a5a6ca3e29e035896c7225da726b2f58b7d (commit)

commit f05d445ecbfc8e5ddfb08c2073ec72b6782df520
Author: Enrico Tröger 
Date:   Mon Oct 5 19:46:43 2009 +0200

Minor fixes

 src/backendgvfs.c |8 ++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/backendgvfs.c b/src/backendgvfs.c
index 8ce95cd..1146de4 100644
--- a/src/backendgvfs.c
+++ b/src/backendgvfs.c
@@ -229,9 +229,13 @@ static gchar *get_tooltip_text(GigoloBackendGVFS *backend, 
gpointer ref, gint re
clean_uri = g_uri_unescape_string(uri, 
G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO);
 
settings = 
gigolo_window_get_settings(GIGOLO_WINDOW(priv->parent));
-   b = gigolo_settings_get_bookmark_by_uri(settings, 
clean_uri);
+   b = gigolo_settings_get_bookmark_by_uri(settings, uri);
if (b != NULL)
-   setptr(clean_uri, g_build_filename(clean_uri, 
gigolo_bookmark_get_folder(b), NULL));
+   {
+   const gchar *folder = 
gigolo_bookmark_get_folder(b);
+   if (NZV(folder))
+   setptr(clean_uri, 
g_build_filename(clean_uri, folder, NULL));
+   }
 
result = g_strdup_printf(
_("%s\n\nURI: %s\nConnected: 
Yes\nService Type: %s"), name, clean_uri, type);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Properly handle spaces in URIs

[Enrico Tröger]

Updating branch refs/heads/master
 to 4cc13a5a6ca3e29e035896c7225da726b2f58b7d (commit)
   from 1d01283125a224e96a3008dd4e28d92f6c26a7e1 (commit)

commit 4cc13a5a6ca3e29e035896c7225da726b2f58b7d
Author: Enrico Tröger 
Date:   Mon Oct 5 19:45:32 2009 +0200

Properly handle spaces in URIs

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

diff --git a/src/window.c b/src/window.c
index 7070dcb..7fcfd90 100644
--- a/src/window.c
+++ b/src/window.c
@@ -537,9 +537,10 @@ static void action_open_cb(G_GNUC_UNUSED GtkAction 
*action, GigoloWindow *window
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));
+   /* escape spaces and similar */
+   setptr(uri, g_uri_unescape_string(uri, 
G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO));
 
-   cmd = g_strconcat(file_manager, " ", uri, NULL);
-
+   cmd = g_strconcat(file_manager, " \"", uri, "\"", NULL);
if (! g_spawn_command_line_async(cmd, &error))
{
verbose("%s", error->message);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix displaying of additional bookmark information in the bookmark dialog

[Enrico Tröger]

Updating branch refs/heads/master
 to 1d01283125a224e96a3008dd4e28d92f6c26a7e1 (commit)
   from f2957c1f66b82c111f2df571a75a37f17eb6f3ce (commit)

commit 1d01283125a224e96a3008dd4e28d92f6c26a7e1
Author: Enrico Tröger 
Date:   Mon Oct 5 19:24:07 2009 +0200

Fix displaying of additional bookmark information in the bookmark dialog

 src/bookmarkdialog.c |8 ++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c
index f8f47e1..647927e 100644
--- a/src/bookmarkdialog.c
+++ b/src/bookmarkdialog.c
@@ -90,8 +90,6 @@ static void update_row_in_model(GigoloBookmarkDialog *dialog, 
GtkTreeIter *iter,
else
port[0] = '\0';
 
-   if (NZV(tmp = gigolo_bookmark_get_folder(bm)))
-   g_string_append_printf(other_text, _("Folder: %s"), tmp);
if (NZV(tmp = gigolo_bookmark_get_domain(bm)))
g_string_append_printf(other_text, _("Domain: %s"), tmp);
if (NZV(tmp = gigolo_bookmark_get_share(bm)))
@@ -100,6 +98,12 @@ static void update_row_in_model(GigoloBookmarkDialog 
*dialog, GtkTreeIter *iter,
g_string_append(other_text, ", ");
g_string_append_printf(other_text, _("Share: %s"), tmp);
}
+   if (NZV(tmp = gigolo_bookmark_get_folder(bm)))
+   {
+   if (other_text->len > 0)
+   g_string_append(other_text, ", ");
+   g_string_append_printf(other_text, _("Folder: %s"), tmp);
+   }
 
gtk_list_store_set(priv->store, iter,
COL_NAME, gigolo_bookmark_get_name(bm),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Asturian (ast) translation

[Transifex]

Updating branch refs/heads/master
 to 89289414e601cec38126beebfe652c1530324244 (commit)
   from 08a1da7bfe3324c67a2851c22648ad07418ff445 (commit)

commit 89289414e601cec38126beebfe652c1530324244
Author: Iñigo Varela 
Date:   Mon Oct 5 16:24:15 2009 +

l10n: Updates to Asturian (ast) translation

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

 po/ast.po |  224 +++--
 1 files changed, 85 insertions(+), 139 deletions(-)

diff --git a/po/ast.po b/po/ast.po
index fbce014..fbd6e17 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: ristretto\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-10 23:31+0100\n"
+"PO-Revision-Date: 2009-10-05 18:16+0100\n"
 "Last-Translator: astur \n"
 "Language-Team: Asturian \n"
 "MIME-Version: 1.0\n"
@@ -30,8 +30,7 @@ msgid ""
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
 "%s: %s\n"
-"Preba %s --help pa ver una llista completa d'opciones de llinia de comandu "
-"disponibles.\n"
+"Preba %s --help pa ver una llista completa d'opciones de llinia de comandu 
disponibles.\n"
 
 #. File Menu
 #: ../src/main_window.c:264
@@ -40,69 +39,59 @@ msgstr "_Ficheru"
 
 #: ../src/main_window.c:265
 msgid "_Open"
-msgstr ""
+msgstr "_Abrir"
 
 #: ../src/main_window.c:265
-#, fuzzy
 msgid "Open an image"
 msgstr "Abrir imaxe"
 
 #: ../src/main_window.c:266
-#, fuzzy
 msgid "Open _Folder"
 msgstr "_Abrir carpeta"
 
 #: ../src/main_window.c:266
-#, fuzzy
 msgid "Open a folder"
-msgstr "Abrir direutoriu"
+msgstr "Abrir una carpeta"
 
 #: ../src/main_window.c:267
 msgid "_Save copy"
-msgstr ""
+msgstr "_Guardar copia"
 
 #: ../src/main_window.c:267
 msgid "Save a copy of the image"
-msgstr ""
+msgstr "Guardar una copia de la imaxe"
 
 #: ../src/main_window.c:268
 msgid "_Print"
-msgstr ""
+msgstr "_Imprentar"
 
 #: ../src/main_window.c:268
-#, fuzzy
 msgid "Print the image"
-msgstr "_Precargar les imáxenes"
+msgstr "_Imprentar les imáxenes"
 
 #: ../src/main_window.c:269
-#, fuzzy
 msgid "_Close"
-msgstr "Zarrar _too"
+msgstr "Z_arrar"
 
 #: ../src/main_window.c:269
-#, fuzzy
 msgid "Close this image"
-msgstr "Zarrar _too"
+msgstr "Zarrar esta imaxe"
 
 #: ../src/main_window.c:270
-#, fuzzy
 msgid "_Close All"
 msgstr "Zarrar _too"
 
 #: ../src/main_window.c:270
-#, fuzzy
 msgid "Close all images"
-msgstr "Zarrar _too"
+msgstr "Zarrar toles imáxenes"
 
 #: ../src/main_window.c:271
-#, fuzzy
 msgid "_Quit"
-msgstr "_Editar"
+msgstr "_Colar"
 
 #: ../src/main_window.c:271
-#, fuzzy
 msgid "Quit Ristretto"
-msgstr "Ristretto"
+msgstr "Quitar Ristretto"
 
 #. Edit Menu
 #: ../src/main_window.c:273
@@ -110,23 +99,20 @@ msgid "_Edit"
 msgstr "_Editar"
 
 #: ../src/main_window.c:274
-#, fuzzy
 msgid "_Open with..."
-msgstr "Abrir con..."
+msgstr "Abrir _con..."
 
 #: ../src/main_window.c:275
-#, fuzzy
 msgid "_Sorting"
-msgstr "_Ampliar"
+msgstr "_Axeitar"
 
 #: ../src/main_window.c:276
 msgid "_Delete"
-msgstr ""
+msgstr "_Desaniciar"
 
 #: ../src/main_window.c:277
-#, fuzzy
 msgid "_Preferences"
-msgstr "Preferencies del visor d'imáxenes"
+msgstr "_Preferencies"
 
 #. View Menu
 #: ../src/main_window.c:279
@@ -135,14 +121,13 @@ msgstr "_Ver"
 
 #: ../src/main_window.c:280
 msgid "_Fullscreen"
-msgstr ""
+msgstr "_Pantalla completa"
 
 #: ../src/main_window.c:281
 msgid "_Leave Fullscreen"
-msgstr ""
+msgstr "_Colar de pantalla completa"
 
 #: ../src/main_window.c:282
-#, fuzzy
 msgid "_Set as Wallpaper"
 msgstr "_Afitar como fondu d'escritoriu"
 
@@ -152,27 +137,23 @@ msgid "_Zooming"
 msgstr "_Ampliar"
 
 #: ../src/main_window.c:285
-#, fuzzy
 msgid "Zoom _In"
 msgstr "_Ampliar"
 
 #: ../src/main_window.c:286
-#, fuzzy
 msgid "Zoom _Out"
-msgstr "_Ampliar"
+msgstr "_Amenorgar"
 
 #: ../src/main_window.c:287
-#, fuzzy
 msgid "Zoom _Fit"
-msgstr "_Ampliar"
+msgstr "_Axustar"
 
 #: ../src/main_window.c:288
 msgid "_Normal Size"
-msgstr ""
+msgstr "_Tamañu normal"
 
 #. Rotation submenu
 #: ../src/main_window.c:290
-#, fuzzy
 msgid "_Rotation"
 msgstr "_Voltiar"
 
@@ -191,19 +172,19 @@ msgstr "_Dir"
 
 #: ../src/main_window.c:295
 msgid "_Forward"
-msgstr ""
+msgstr "_Avanzar"
 
 #: ../src/main_window.c:296
 msgid "_Back"
-msgstr ""
+msgstr "_Retroceder"
 
 #: ../src/main_window.c:297
 msgid "_First"
-msgstr ""
+msgstr "_Primera"
 
 #: ../src/main_window.c:298
 msgid "_Last"
-msgstr ""
+msgstr "_Cabera"
 
 #. Help Menu
 #: ../src/main_window.c:300
@@ -212,92 +193,88 @@ msgstr "A_ida"
 
 #: ../src/main_window.c:302
 msgid "_Contents"
-msgstr ""
+msgstr "_Conteníos"
 
 #: ../src/main_window.c:304
 msgid "Display ristretto user manual"
-msgstr ""
+msgstr "Amosar el manual d'usuariu de ristretto"
 
 #: ../src/main_window.c:307
 msgid "_About"
-msgstr ""
+msgstr "_Tocante a"
 
 #: ../src/main_window.c:309
 msgid "Display information about ristretto"
-msgstr ""
+msgstr "Amosar 

[Xfce4-commits] Use Git in the build files and drop unneeded po files.

[Nick Schermer]

Updating branch refs/heads/master
 to c04e48a473029b9b397926822cef066ebaccc5c2 (commit)
   from b168abc19af269cb94b3bb30791f2cda86b13c9f (commit)

commit c04e48a473029b9b397926822cef066ebaccc5c2
Author: Nick Schermer 
Date:   Mon Oct 5 18:12:14 2009 +0200

Use Git in the build files and drop unneeded po files.

Borrowed some code from xdt 4.7.

 HACKING |   25 +-
 autogen.sh  |   61 ++-
 configure.in.in |   10 +-
 po/ChangeLog| 1361 ---
 po/LINGUAS  |3 -
 5 files changed, 55 insertions(+), 1405 deletions(-)

diff --git a/HACKING b/HACKING
index f898305..07f62ac 100644
--- a/HACKING
+++ b/HACKING
@@ -2,8 +2,8 @@ Bug tracking system
 ===
 
 To report bugs or file feature requests for xfce4-panel, please
-use the Xfce bugzilla at http://bugzilla.xfce.org/. The product
-is Xfce, component xfce4-panel.
+use the Xfce bugzilla at http://bugzilla.xfce.org/. The category
+is Xfce, product Xfce4-panel.
 Before reporting the bug, please search the bug tracker, to make
 sure it wasn't reported already before.
 
@@ -15,14 +15,14 @@ Please submit patches to the Xfce bug tracking system or 
use the
 xfce4-dev mailinglists.
 
 Please send a patch againts a recent version of xfce4-panel. Patches
-against the Subversion trunk branch are most preferable. You can always
-access the trunk branch from
+against the Git master branch are most preferable. You can always
+access the master branch from
 
-  http://svn.xfce.org/svn/xfce/xfce4-panel/trunk
+  http://git.xfce.org/xfce/xfce4-panel/
 
-or using an installed Subversion client
+or using an installed Git client
 
-  svn co http://svn.xfce.org/svn/xfce/xfce4-panel/trunk xfce4-panel
+  git clone git://git.xfce.org/xfce/xfce4-panel
 
 
 Coding Style
@@ -64,19 +64,12 @@ Coding Style
 ChangeLogs
 ==
 
-I use the svn2cl package to create the changelog from the SVN log messages.
-
-  - Website: http://ch.tudelft.nl/~arthur/svn2cl/ . 
-  - Current version: 0.8. 
-  - Command line: svn2cl.sh --linelen=74 --break-before-msg.
-
-Note: I don't care about linelen, but with this parameter the changes with
-  previous ChangeLog were smallest.
+We use the logs produced by git.
 
 
 Misc
 
-- If you have SVN access it is ok to commit trivial changes directly, but 
+- If you have Git access it is ok to commit trivial changes directly, but 
   please send a patch to the mailing list for discussion for any non-trivial
   or non-obvious changes.
 - As an exception to the rule above, if you are managing an Xfce release, feel 
diff --git a/autogen.sh b/autogen.sh
index a4f358e..16c0331 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 #
-# $Id: autogen.sh 25025 2007-02-24 09:54:07Z jasper $
-#
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2009
 # The Xfce development team. All rights reserved.
 #
 # Written for Xfce by Benedikt Meurer .
@@ -18,29 +16,52 @@ EOF
   exit 1
 }
 
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
-  cat >&2 &1; then
+  AWK=$a
+  break
+fi
+  done
+else
+  if ! type $AWK >/dev/null 2>/dev/null; then
+unset AWK
+  fi
+fi
+if test -z "$AWK"; then
+  echo "autogen.sh: The 'awk' program (one of $awk_tests) is" >&2
+  echo "required, but cannot be found." >&2
   exit 1
-}
+fi
 
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
+# substitute revision
 if test -d .git/svn; then
- revision=`git svn find-rev trunk 2>/dev/null ||
-   git svn find-rev origin/trunk 2>/dev/null ||
-   git svn find-rev HEAD 2>/dev/null ||
-   git svn find-rev master 2>/dev/null`
-else
- revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",
-$2}'`
+revision=`git svn find-rev trunk 2>/dev/null ||
+  git svn find-rev origin/trunk 2>/dev/null ||
+  git svn find-rev HEAD 2>/dev/null ||
+  git svn find-rev master 2>/dev/null`
+elif test -d .git; then
+revision=`git rev-parse --short HEAD`
+elif test -d .svn; then
+revision=`LC_ALL=C svn info $0 | $AWK '/^Revision: / {printf "%05d\n", 
$2}'`
+fi
+if test "x$revision" = "x"; then
+revision="UNKNOWN"
 fi
+
+# substitute the linguas
+linguas=`cd "po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; 
ORS=" " } { print $1 }'`
+if test "x$linguas" = "x"; then
+echo "autogen.sh: No po files were found, aborting." >&2
+exit 1
+fi
+
+# create configure.in
 sed -e "s/@LINGUAS@/${linguas}/g" \
 -e "s/@REVISION@/${revision}/g" \
-   < "configure.in.in" > "configure.in"
+< "configure.in.in" > "configure.in"
 
 xdt-autogen $@
 
diff --git a/configure.in.in b/configure.in.in
index 9e82081..f3d3ed8 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -15,14 +15,14 @@ m4_define([xfce4_panel_version_major], [4])
 m4_define([xfce4_panel_version_minor], [6])
 m4_define([xfce4_panel_version_micro], [1])
 m4_defi

[Xfce4-commits] Use g_markup_printf_escaped in the launcher tooltip (bug #5507).

[Nick Schermer]

Updating branch refs/heads/master
 to b168abc19af269cb94b3bb30791f2cda86b13c9f (commit)
   from 6dfb989da915fc4f83fffb39982dfe7f89399c8d (commit)

commit b168abc19af269cb94b3bb30791f2cda86b13c9f
Author: Nick Schermer 
Date:   Mon Oct 5 18:02:32 2009 +0200

Use g_markup_printf_escaped in the launcher tooltip (bug #5507).

 plugins/launcher/launcher.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 492c1ca..3dfd327 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -254,7 +254,7 @@ launcher_utility_query_tooltip (GtkWidget *widget,
 {
 if (entry->comment)
 {
-string = g_strdup_printf ("%s\n%s", entry->name, 
entry->comment);
+string = g_markup_printf_escaped ("%s\n%s", entry->name, 
entry->comment);
 gtk_tooltip_set_markup (tooltip, string);
 g_free (string);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Add Japanese translation

[Transifex]

Updating branch refs/heads/master
 to a884f2cfa13334a7ade6be2ea9982ed46612b184 (commit)
   from 8feea61d5346f2b476c5b8946a0995c8bf04e996 (commit)

commit a884f2cfa13334a7ade6be2ea9982ed46612b184
Author: Masato Hashimoto 
Date:   Mon Oct 5 15:52:30 2009 +

l10n: Add Japanese translation

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

 po/{id.po => ja.po} |  347 --
 1 files changed, 167 insertions(+), 180 deletions(-)

diff --git a/po/id.po b/po/ja.po
similarity index 68%
copy from po/id.po
copy to po/ja.po
index ad51e70..dc14708 100644
--- a/po/id.po
+++ b/po/ja.po
@@ -1,23 +1,26 @@
-# Indonesian translations for parole package.
+# Japanese translations for parole package
+# parole パッケージに対する英訳.
 # Copyright (C) 2009 THE parole'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the parole package.
-# Andhika Padmawan , 2009.
+#  , 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: parole\n"
+"Project-Id-Version: parole 0.1.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-04 16:25+\n"
-"PO-Revision-Date: 2009-08-27 04:28+0700\n"
-"Last-Translator: Andhika Padmawan \n"
-"Language-Team: Indonesian \n"
+"POT-Creation-Date: 2009-10-06 00:43+0900\n"
+"PO-Revision-Date: 2009-10-06 00:40+0900\n"
+"Last-Translator: Masato Hashimoto \n"
+"Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Japanese\n"
 
 #: ../data/interfaces/parole.ui.h:1
 msgid "16:9 (Widescreen)"
-msgstr "16:9 (Layar Lebar)"
+msgstr "16:9 (ワイドスクリーン)"
 
 #: ../data/interfaces/parole.ui.h:2
 msgid "20:9 (DVB)"
@@ -29,179 +32,179 @@ msgstr "4:3 (TV)"
 
 #: ../data/interfaces/parole.ui.h:4
 msgid "Aspect Ratio"
-msgstr "Rasio Aspek"
+msgstr "アスペクト比"
 
 #: ../data/interfaces/parole.ui.h:5
 msgid "Auto"
-msgstr "Otomatis"
+msgstr "自動"
 
 #: ../data/interfaces/parole.ui.h:6
 msgid "Chapter Menu"
-msgstr "Menu Bab"
+msgstr "チャプターメニュー"
 
 #: ../data/interfaces/parole.ui.h:7
 msgid "DVD Menu"
-msgstr "Menu DVD"
+msgstr "DVD メニュー"
 
 #: ../data/interfaces/parole.ui.h:8
 msgid "Media player"
-msgstr "Pemutar media"
+msgstr "メディアプレーヤー"
 
 #: ../data/interfaces/parole.ui.h:9
 msgid "Mute"
-msgstr "Diam"
+msgstr "ミュート"
 
 #: ../data/interfaces/parole.ui.h:10 ../parole/parole-player.c:1047
 #: ../parole/parole-disc-menu.c:113
 msgid "Next Chapter"
-msgstr "Bab Berikutnya"
+msgstr "次のチャプター"
 
 #: ../data/interfaces/parole.ui.h:11
 msgid "None"
-msgstr "Tak Ada"
+msgstr "なし"
 
 #: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
 #: ../parole/parole-player.c:234 ../parole/parole-about.c:51
 #: ../plugins/window-title/window-title.c:40
 msgid "Parole Media Player"
-msgstr "Pemutar Media Parole"
+msgstr "Parole Media Player"
 
 #: ../data/interfaces/parole.ui.h:13
 msgid "Plugins"
-msgstr "Plugin"
+msgstr "プラグイン"
 
 #: ../data/interfaces/parole.ui.h:14 ../parole/parole-player.c:1059
 #: ../parole/parole-disc-menu.c:114
 msgid "Previous Chapter"
-msgstr "Bab Sebelumnya"
+msgstr "前のチャプター"
 
 #: ../data/interfaces/parole.ui.h:15
 msgid "Repeat"
-msgstr "Ulangi"
+msgstr "繰り返し"
 
 #: ../data/interfaces/parole.ui.h:16
 msgid "Select Track"
-msgstr "Pilih Jalur"
+msgstr "トラックの選択"
 
 #: ../data/interfaces/parole.ui.h:17
 msgid "Shuffle"
-msgstr "Acak"
+msgstr "シャッフル"
 
 #: ../data/interfaces/parole.ui.h:18
 msgid "Sound"
-msgstr "Suara"
+msgstr "サウンド"
 
 #: ../data/interfaces/parole.ui.h:19
 msgid "Square"
-msgstr "Kotak"
+msgstr "スクエア"
 
 #: ../data/interfaces/parole.ui.h:20
 msgid "Volume Down"
-msgstr "Volume Turun"
+msgstr "ボリュームを上げる"
 
 #: ../data/interfaces/parole.ui.h:21
 msgid "Volume Up"
-msgstr "Volume Naik"
+msgstr "ボリュームを下げる"
 
 #: ../data/interfaces/parole.ui.h:22
 msgid "_Edit"
-msgstr "_Sunting"
+msgstr "編集(_E)"
 
 #: ../data/interfaces/parole.ui.h:23
 msgid "_Help"
-msgstr "Ba_ntuan"
+msgstr "ヘルプ(_H)"
 
 #: ../data/interfaces/parole.ui.h:24
 msgid "_Media"
-msgstr "_Media"
+msgstr "メディア(_M)"
 
 #: ../data/interfaces/parole.ui.h:25
 msgid "_View"
-msgstr "_Tampilan"
+msgstr "表示(_V)"
 
 #: ../data/interfaces/plugins.ui.h:1
 msgid "Author:"
-msgstr "Penulis:"
+msgstr "作者:"
 
 #: ../data/interfaces/plugins.ui.h:2
 msgid "Description:"
-msgstr "Deskripsi:"
+msgstr "説明:"
 
 #: ../data/interfaces/plugins.ui.h:3
 msgid "Site:"
-msgstr "Situs:"
+msgstr "サイト:"
 
 #: ../data/interfaces/plugins.ui.h:4
 msgid "Parole Plugins Preferences"
-msgstr "Pengaturan Plugin Parole"
+msgstr "Parole プラグイン設定"
 
 #: ../data/interfaces/parole-settings.ui.h:1
 msgid "Audio"
-msgstr 

[Xfce4-commits] Use new contruct function names in the wrapper too.

[Nick Schermer]

Updating branch refs/heads/devel
 to ec12ba5fbd3bfd3df017b44e3d76457319de8c99 (commit)
   from 582a62fcb6bee2df6e58113fe1f69cc4df574563 (commit)

commit ec12ba5fbd3bfd3df017b44e3d76457319de8c99
Author: Nick Schermer 
Date:   Sat Oct 3 15:37:31 2009 +0200

Use new contruct function names in the wrapper too.

 wrapper/wrapper-module.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wrapper/wrapper-module.c b/wrapper/wrapper-module.c
index 8a4513d..a221c7c 100644
--- a/wrapper/wrapper-module.c
+++ b/wrapper/wrapper-module.c
@@ -136,7 +136,7 @@ wrapper_module_new_provider (WrapperModule  *module,
   g_type_module_use (G_TYPE_MODULE (module));
 
   /* try to link the contruct or init function */
-  if (g_module_symbol (module->library, "__xpp_init",
+  if (g_module_symbol (module->library, "xfce_panel_module_init",
   (gpointer) &init_func) && init_func != NULL)
 {
   /* initialize the plugin */
@@ -150,7 +150,7 @@ wrapper_module_new_provider (WrapperModule  *module,
  "comment", comment,
  "arguments", arguments, NULL);
 }
-  else if (g_module_symbol (module->library, "__xpp_construct",
+  else if (g_module_symbol (module->library, "xfce_panel_module_construct",
(gpointer) &construct_func) && construct_func != NULL)
 {
   /* create a new panel plugin */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Use g_markup_printf_escaped when making markup strings.

[Nick Schermer]

Updating branch refs/heads/devel
 to 187d36a086f5b34b3ad5229af8b99965f5bbff66 (commit)
   from ec12ba5fbd3bfd3df017b44e3d76457319de8c99 (commit)

commit 187d36a086f5b34b3ad5229af8b99965f5bbff66
Author: Nick Schermer 
Date:   Mon Oct 5 17:45:36 2009 +0200

Use g_markup_printf_escaped when making markup strings.

 panel/panel-item-dialog.c  |4 +++-
 plugins/launcher/launcher-dialog.c |4 ++--
 plugins/launcher/launcher.c|2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/panel/panel-item-dialog.c b/panel/panel-item-dialog.c
index 4c5145f..88b0fb1 100644
--- a/panel/panel-item-dialog.c
+++ b/panel/panel-item-dialog.c
@@ -698,7 +698,9 @@ panel_item_dialog_text_renderer (GtkTreeViewColumn *column,
   comment = panel_module_get_comment (module);
 
   /* create the markup string */
-  markup = g_strdup_printf ("%s\n%s", name, comment ? comment : "");
+  if (exo_str_is_empty (comment))
+comment = "";
+  markup = g_markup_printf_escaped ("%s\n%s", name, comment);
 
   /* release module */
   g_object_unref (G_OBJECT (module));
diff --git a/plugins/launcher/launcher-dialog.c 
b/plugins/launcher/launcher-dialog.c
index 71cf15c..ca7e7f7 100644
--- a/plugins/launcher/launcher-dialog.c
+++ b/plugins/launcher/launcher-dialog.c
@@ -643,9 +643,9 @@ launcher_dialog_items_set_item (GtkTreeModel   *model,
   comment = garcon_menu_item_get_comment (item);
 
   if (!exo_str_is_empty (comment))
-markup = g_strdup_printf ("%s\n%s", name, comment);
+markup = g_markup_printf_escaped ("%s\n%s", name, comment);
   else
-markup = g_strdup_printf ("%s", name);
+markup = g_markup_printf_escaped ("%s", name);
 
   gtk_list_store_set (GTK_LIST_STORE (model), iter,
   COL_ICON, garcon_menu_item_get_icon_name (item),
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 548f9a0..8530cd8 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -1636,7 +1636,7 @@ launcher_plugin_item_query_tooltip (GtkWidget  
*widget,
   comment = garcon_menu_item_get_comment (item);
   if (!exo_str_is_empty (comment))
 {
-  markup = g_strdup_printf ("%s\n%s", name, comment);
+  markup = g_markup_printf_escaped ("%s\n%s", name, comment);
   gtk_tooltip_set_markup (tooltip, markup);
   g_free (markup);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

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

[Ali Abdallah]

Updating branch refs/heads/master
 to 402a8ca6388b5ec24e434e0354942be5e37caf45 (commit)
   from 469e35d1e79c7898b8aaf2b7d345fd49cfd1ed8d (commit)

commit 402a8ca6388b5ec24e434e0354942be5e37caf45
Merge: 469e35d1e79c7898b8aaf2b7d345fd49cfd1ed8d 
c947e5a26e08c560c3e1ad77fb36424065cc2ec8
Author: Ali Abdallah 
Date:   Mon Oct 5 16:42:24 2009 +

Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-power-manager

commit c947e5a26e08c560c3e1ad77fb36424065cc2ec8
Author: Denis Koryavov 
Date:   Fri Oct 2 08:32:53 2009 +

l10n: Updates to Russian (ru) translation

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

commit f06b674c4d93431679b7bd51f31a79aa109dc129
Author: Leandro Regueiro 
Date:   Thu Oct 1 15:19:59 2009 +

l10n: Updates to Galician (gl) translation

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

 po/gl.po |  393 --
 po/ru.po |  222 +--
 2 files changed, 284 insertions(+), 331 deletions(-)

diff --git a/po/gl.po b/po/gl.po
index ea993af..12085e1 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-27 09:02+\n"
-"PO-Revision-Date: 2009-04-28 18:01+0100\n"
+"POT-Creation-Date: 2009-07-27 08:46+0200\n"
+"PO-Revision-Date: 2009-08-19 16:02+0100\n"
 "Last-Translator: Leandro Regueiro \n"
 "Language-Team: Galician \n"
 "MIME-Version: 1.0\n"
@@ -40,82 +40,83 @@ msgid "Monitor"
 msgstr "Monitor"
 
 #: ../data/interfaces/xfpm-settings.ui.h:6
-#, fuzzy
 msgid "Actions"
-msgstr "Accións"
+msgstr "Accións"
 
 #: ../data/interfaces/xfpm-settings.ui.h:7
-#, fuzzy
-msgid "CPU frequency control"
-msgstr "Monitor de escala de frecuencia da CPU"
-
-#: ../data/interfaces/xfpm-settings.ui.h:8
 msgid "Consider the computer on low power at:"
 msgstr "Considerar que a batería case está descargada cando:"
 
+#: ../data/interfaces/xfpm-settings.ui.h:8
+msgid "Enable CPU frequency control"
+msgstr "Activar o control de frecuencia da CPU"
+
+#: ../data/interfaces/xfpm-settings.ui.h:9
+msgid "Enable monitor power management control"
+msgstr "Activar o control de xestión de enerxía do monitor"
+
+#: ../data/interfaces/xfpm-settings.ui.h:10
+msgid "Enable notification"
+msgstr "Activar as notificacións"
+
 #. 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
+#: ../data/interfaces/xfpm-settings.ui.h:11
+#: ../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
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: ../data/interfaces/xfpm-settings.ui.h:10
+#: ../data/interfaces/xfpm-settings.ui.h:12
 msgid "Lock screen when going for suspend/hibernate"
 msgstr "Bloquear a pantalla ó suspender/hibernar"
 
-#: ../data/interfaces/xfpm-settings.ui.h:11
-#, fuzzy
+#: ../data/interfaces/xfpm-settings.ui.h:13
 msgid "Monitor"
-msgstr "Monitor"
+msgstr "Monitor"
 
-#: ../data/interfaces/xfpm-settings.ui.h:12
-#, fuzzy
-msgid "Monitor power management control"
-msgstr "Activar o control de xestión de enerxía do monitor"
-
-#: ../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
+#: ../data/interfaces/xfpm-settings.ui.h:14
+#: ../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
 msgid "Nothing"
 msgstr "Nada"
 
-#: ../data/interfaces/xfpm-settings.ui.h:14
+#: ../data/interfaces/xfpm-settings.ui.h:15
 msgid "Power manager settings"
 msgstr "Configuración do xestor de enerxía"
 
-#: ../data/interfaces/xfpm-settings.ui.h:15
+#: ../data/interfaces/xfpm-settings.ui.h:16
 msgid "Prefer power savings over performance"
 msgstr "Primar o aforro de enerxía sobre o rendemento"
 
-#: ../data/interfaces/xfpm-settings.ui.h:16
+#: ../data/interfaces/xfpm-settings.ui.h:17
 msgid "Put display to sleep when computer is inactive for:"
 msgstr "Suspender a pantalla cando o ordenador leve inactivo:"
 
-#: ../data/interfaces/xfpm-settings.ui.h:17
+#: ../data/interfaces/xfpm-settings.ui.h:18
 #, fuzzy
 msgid "Put the computer to sleep when inactive for:"
 msgstr "Pór o computador en _modo de baixo consumo cando leve inactivo:"
 
-#: ../data/interfaces/xfpm-settings.ui.h:18
+#: ../data/interfaces/xfpm-set

[Xfce4-commits] Because on some systems we might not have the brightness keys mapped so brightness changes are not reflected to xfpm when keys are pressed, save the actual

[Ali Abdallah]

Updating branch refs/heads/master
 to 469e35d1e79c7898b8aaf2b7d345fd49cfd1ed8d (commit)
   from e701f3498aa8e47f832c41e59fec0afe0b645475 (commit)

commit 469e35d1e79c7898b8aaf2b7d345fd49cfd1ed8d
Author: Ali Abdallah 
Date:   Mon Oct 5 16:40:50 2009 +

Because on some systems we might not have the brightness keys mapped
so brightness changes are not reflected to xfpm when keys are pressed,
save the actual brightness before dimming the screen on idle to restore it
afterword. (bug #5811).

 src/xfpm-brightness-hal.c |   43 ++-
 1 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/xfpm-brightness-hal.c b/src/xfpm-brightness-hal.c
index 75a36b1..23f4929 100644
--- a/src/xfpm-brightness-hal.c
+++ b/src/xfpm-brightness-hal.c
@@ -168,6 +168,19 @@ xfpm_brightness_hal_get_device (XfpmBrightnessHal *brg, 
const gchar *udi)
 g_object_unref (device);
 }
 
+static void
+xfpm_brightness_hal_read_hal_level (XfpmBrightnessHal *brg)
+{
+GError *error = NULL;
+
+brg->priv->hw_level = xfpm_brightness_hal_get_level (brg, &error);
+   
+if ( error )
+{
+   g_warning ("Error getting brightness level: %s\n", error->message);
+   g_error_free (error);
+}
+}
 
 static gboolean
 xfpm_brightness_hal_setup (XfpmBrightnessHal *brg)
@@ -188,7 +201,8 @@ xfpm_brightness_hal_setup (XfpmBrightnessHal *brg)
 xfpm_brightness_hal_get_device (brg, udi[0]);
 xfpm_brightness_hal_set_proxy (brg, udi[0]);
 
-brg->priv->hw_level = xfpm_brightness_hal_get_level (brg, NULL);
+xfpm_brightness_hal_read_hal_level (brg);
+
 TRACE ("Current hw level =%d\n", brg->priv->hw_level);
 
 hal_manager_free_string_array (udi);
@@ -198,7 +212,6 @@ xfpm_brightness_hal_setup (XfpmBrightnessHal *brg)
 static void
 xfpm_brightness_hal_up (XfpmBrightnessHal *brg)
 {
-GError *error = NULL;
 gboolean show_popup;
 gboolean enable_brightness;
 
@@ -217,14 +230,7 @@ xfpm_brightness_hal_up (XfpmBrightnessHal *brg)
 }
 
 signal:
-brg->priv->hw_level = xfpm_brightness_hal_get_level (brg, &error);
-   
-if ( error )
-{
-   g_warning ("Error getting brightness level: %s\n", error->message);
-   g_error_free (error);
-   return;
-}
+xfpm_brightness_hal_read_hal_level (brg);
 
 if ( show_popup )
g_signal_emit (G_OBJECT (brg), signals [BRIGHTNESS_UP], 0, 
brg->priv->hw_level);
@@ -233,9 +239,7 @@ signal:
 static void
 xfpm_brightness_hal_down (XfpmBrightnessHal *brg)
 {
-GError *error = NULL;
-gboolean show_popup;
-gboolean enable_brightness;
+gboolean show_popup, enable_brightness;
 
 g_object_get (G_OBJECT (brg->priv->conf),
  ENABLE_BRIGHTNESS_CONTROL, &enable_brightness,
@@ -252,14 +256,7 @@ xfpm_brightness_hal_down (XfpmBrightnessHal *brg)
 }
 
 signal:
-brg->priv->hw_level = xfpm_brightness_hal_get_level (brg, &error);
-
-if ( error )
-{
-   g_warning ("Error getting brightness level: %s\n", error->message);
-   g_error_free (error);
-   return;
-}
+xfpm_brightness_hal_read_hal_level (brg);
 
 if ( show_popup )
g_signal_emit (G_OBJECT (brg), signals [BRIGHTNESS_UP], 0, 
brg->priv->hw_level);
@@ -319,6 +316,8 @@ xfpm_brightness_timeout_on_ac (XfpmBrightnessHal *brg)
 
 level = xfpm_brightness_hal_get_level (brg, &error);
 
+brg->priv->hw_level = level;
+
 if ( error )
 {
g_warning ("Error getting brightness level: %s\n", error->message);
@@ -344,6 +343,8 @@ xfpm_brightness_timeout_on_battery (XfpmBrightnessHal *brg)
 
 level = xfpm_brightness_hal_get_level (brg, &error);
 
+brg->priv->hw_level = level;
+
 if ( error )
 {
g_warning ("Error getting brightness level: %s\n", error->message);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

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

[Transifex]

Updating branch refs/heads/master
 to ff3f3031e5cf8a3ef302a70aa3af5c4f7b901811 (commit)
   from f2957c1f66b82c111f2df571a75a37f17eb6f3ce (commit)

commit ff3f3031e5cf8a3ef302a70aa3af5c4f7b901811
Author: Masato Hashimoto 
Date:   Mon Oct 5 14:26:26 2009 +

l10n: Updates to Japanese (ja) translation

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

 po/ja.po |  281 --
 1 files changed, 145 insertions(+), 136 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index d7e9b09..6df4a69 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gigolo 0.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-10 22:54+0900\n"
-"PO-Revision-Date: 2009-06-13 20:21+0900\n"
+"POT-Creation-Date: 2009-10-05 23:09+0900\n"
+"PO-Revision-Date: 2009-10-05 23:10+0900\n"
 "Last-Translator: Masato Hashimoto \n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -37,210 +37,210 @@ msgstr "バージョン情報を表示する"
 msgid "- a simple frontend to easily connect to remote filesystems"
 msgstr "- 
リモートファイルシステムに簡単に接続するシンプルなフロントエンド"
 
-#: ../src/common.c:73
+#: ../src/common.c:77
 msgid "Unix Device"
 msgstr "Unix デバイス"
 
-#: ../src/common.c:75
+#: ../src/common.c:79
 msgid "Windows Share"
 msgstr "Windows 共有"
 
-#: ../src/common.c:77
+#: ../src/common.c:81
 msgid "FTP"
 msgstr "FTP"
 
-#: ../src/common.c:79
+#: ../src/common.c:83
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/common.c:81
+#: ../src/common.c:85
 msgid "SSH"
 msgstr "SSH"
 
-#: ../src/common.c:83
+#: ../src/common.c:87
 msgid "Obex"
 msgstr "Obex"
 
-#: ../src/common.c:85
+#: ../src/common.c:89
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../src/common.c:87
+#: ../src/common.c:91
 msgid "WebDAV (secure)"
 msgstr "WebDAV (セキュア)"
 
-#: ../src/common.c:89
-#: ../src/window.c:1394
+#: ../src/common.c:93
+#: ../src/window.c:1351
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../src/common.c:91
+#: ../src/common.c:95
 msgid "Archive"
 msgstr "アーカイブ"
 
-#: ../src/common.c:93
+#: ../src/common.c:97
 msgid "Photos"
 msgstr "写真"
 
-#: ../src/common.c:95
+#: ../src/common.c:99
 msgid "Custom Location"
 msgstr "個別に指定した場所"
 
-#: ../src/window.c:280
+#: ../src/window.c:253
 #, c-format
 msgid "Connecting to \"%s\""
 msgstr "接続しています: \"%s\""
 
-#: ../src/window.c:448
+#: ../src/window.c:421
 #: ../gigolo.desktop.in.h:1
 msgid "A simple frontend to easily connect to remote filesystems"
 msgstr 
"リモートファイルシステムに簡単に接続するシンプルなフロントエンド"
 
-#: ../src/window.c:449
+#: ../src/window.c:422
 msgid "Copyright 2008-2009 Enrico Tröger"
 msgstr "Copyright 2008-2009 Enrico Tröger"
 
-#: ../src/window.c:452
+#: ../src/window.c:425
 msgid "translator-credits"
 msgstr "Masato Hashimoto "
 
-#: ../src/window.c:484
+#: ../src/window.c:457
 msgid "Gigolo can use the following protocols provided by GVfs:"
 msgstr "Gigolo は GVFS 
により以下のプロトコルを使用することができます:"
 
-#: ../src/window.c:713
-#: ../src/bookmarkeditdialog.c:189
-#: ../src/bookmarkeditdialog.c:208
-#: ../src/bookmarkeditdialog.c:221
-#: ../src/bookmarkeditdialog.c:232
-#: ../src/bookmarkeditdialog.c:243
+#: ../src/window.c:670
+#: ../src/bookmarkeditdialog.c:210
+#: ../src/bookmarkeditdialog.c:229
+#: ../src/bookmarkeditdialog.c:242
+#: ../src/bookmarkeditdialog.c:253
+#: ../src/bookmarkeditdialog.c:264
 msgid "Error"
 msgstr "エラー"
 
-#: ../src/window.c:1180
+#: ../src/window.c:1137
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../src/window.c:1181
+#: ../src/window.c:1138
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../src/window.c:1182
+#: ../src/window.c:1139
 msgid "_Actions"
 msgstr "アクション(_A)"
 
-#: ../src/window.c:1183
+#: ../src/window.c:1140
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../src/window.c:1184
+#: ../src/window.c:1141
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../src/window.c:1188
-#: ../src/browsenetworkpanel.c:439
-#: ../src/browsenetworkpanel.c:481
+#: ../src/window.c:1145
+#: ../src/browsenetworkpanel.c:453
+#: ../src/browsenetworkpanel.c:497
 msgid "Create _Bookmark"
 msgstr "ブックマークの作成(_B)"
 
-#: ../src/window.c:1190
+#: ../src/window.c:1147
 msgid "_Edit Bookmarks"
 msgstr "ブックマークの編集(_E)"
 
-#: ../src/window.c:1191
+#: ../src/window.c:1148
 msgid "Open the bookmark manager to add, edit or delete bookmarks"
 msgstr 
"ブックマークマネージャを開き、ブックマークの追加、編集、または削除を行います"
 
-#: ../src/window.c:1195
+#: ../src/window.c:1152
 msgid "Disconnect the selected resource"
 msgstr "選択されたリソースとの接続を切ります"
 
-#: ../src/window.c:1197
+#: ../src/window.c:1154
 msgid "Open the selected resource with a file manager"
 msgstr 
"

[Xfce4-commits] Chain constructed up to parent classes. Need to remember this.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to e3995be157cf9c161f09ba24e07ac8ef92ca04ec (commit)
   from b5d3d3e7c7578883a6be766a6ec7cdda18b294c5 (commit)

commit e3995be157cf9c161f09ba24e07ac8ef92ca04ec
Author: Jannis Pohlmann 
Date:   Mon Oct 5 16:19:21 2009 +0200

Chain constructed up to parent classes. Need to remember this.

 tumbler/tumbler-abstract-thumbnailer.c |4 
 tumblerd/tumbler-cache-service.c   |4 
 tumblerd/tumbler-service.c |4 
 tumblerd/tumbler-specialized-thumbnailer.c |4 
 4 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/tumbler/tumbler-abstract-thumbnailer.c 
b/tumbler/tumbler-abstract-thumbnailer.c
index 4b3087a..36b0e05 100644
--- a/tumbler/tumbler-abstract-thumbnailer.c
+++ b/tumbler/tumbler-abstract-thumbnailer.c
@@ -132,6 +132,10 @@ tumbler_abstract_thumbnailer_constructed (GObject *object)
   g_return_if_fail (thumbnailer->priv->uri_schemes != NULL);
   g_return_if_fail (thumbnailer->priv->hash_keys == NULL);
 
+  /* chain up to parent classes */
+  if (G_OBJECT_CLASS (tumbler_abstract_thumbnailer_parent_class)->constructed 
!= NULL)
+(G_OBJECT_CLASS (tumbler_abstract_thumbnailer_parent_class)->constructed) 
(object);
+
   /* determine the size of both arrays */
   num_uri_schemes = g_strv_length (thumbnailer->priv->uri_schemes);
   num_mime_types = g_strv_length (thumbnailer->priv->mime_types);
diff --git a/tumblerd/tumbler-cache-service.c b/tumblerd/tumbler-cache-service.c
index 61a7d6b..ffdfcb5 100644
--- a/tumblerd/tumbler-cache-service.c
+++ b/tumblerd/tumbler-cache-service.c
@@ -160,6 +160,10 @@ tumbler_cache_service_constructed (GObject *object)
   GList  *lp;
   GList  *providers;
 
+  /* chain up to parent classes */
+  if (G_OBJECT_CLASS (tumbler_cache_service_parent_class)->constructed != NULL)
+(G_OBJECT_CLASS (tumbler_cache_service_parent_class)->constructed) 
(object);
+
   factory = tumbler_provider_factory_get_default ();
   providers = tumbler_provider_factory_get_providers (factory, 
   
TUMBLER_TYPE_CACHE_PROVIDER);
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index 5f475cc..794e5d9 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -207,6 +207,10 @@ tumbler_service_constructed (GObject *object)
 {
   TumblerService *service = TUMBLER_SERVICE (object);
 
+  /* chain up to parent classes */
+  if (G_OBJECT_CLASS (tumbler_service_parent_class)->constructed != NULL)
+(G_OBJECT_CLASS (tumbler_service_parent_class)->constructed) (object);
+
 #if 0
   service->scheduler = tumbler_naive_scheduler_new ();
 #else
diff --git a/tumblerd/tumbler-specialized-thumbnailer.c 
b/tumblerd/tumbler-specialized-thumbnailer.c
index 02960ae..b353fc2 100644
--- a/tumblerd/tumbler-specialized-thumbnailer.c
+++ b/tumblerd/tumbler-specialized-thumbnailer.c
@@ -182,6 +182,10 @@ tumbler_specialized_thumbnailer_constructed (GObject 
*object)
 
   g_return_if_fail (TUMBLER_SPECIALIZED_THUMBNAILER (thumbnailer));
 
+  /* chain up to parent classes */
+  if (G_OBJECT_CLASS 
(tumbler_specialized_thumbnailer_parent_class)->constructed != NULL)
+(G_OBJECT_CLASS 
(tumbler_specialized_thumbnailer_parent_class)->constructed) (object);
+
   bus_path = g_strdup_printf ("/%s", thumbnailer->name);
   bus_path = g_strdelimit (bus_path, ".", '/');
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

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

[Transifex]

Updating branch refs/heads/master
 to b56274945f49d7b35036661afa1de07936fa9666 (commit)
   from d21a44c6dacb9c8d69cf27240cceecb602f4dd4b (commit)

commit b56274945f49d7b35036661afa1de07936fa9666
Author: Masato Hashimoto 
Date:   Mon Oct 5 14:08:12 2009 +

l10n: Updates to Japanese (ja) translation

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

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

diff --git a/po/ja.po b/po/ja.po
index 0f8e18a..5e445ee 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: xfce4-fsguard-plugin 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-14 22:39+0200\n"
-"PO-Revision-Date: 2008-12-09 15:39+0900\n"
+"PO-Revision-Date: 2009-10-05 23:07+0900\n"
 "Last-Translator: Masato Hashimoto \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
@@ -22,9 +22,10 @@ msgstr ""
 
 #: ../panel-plugin/fsguard.c:244
 msgid "Unable to find an appropriate application to open the mount point"
-msgstr ""
+msgstr 
"マウントポイントを開く適切なアプリケーションが見つかりません"
 
-#: ../panel-plugin/fsguard.c:281 ../panel-plugin/fsguard.c:282
+#: ../panel-plugin/fsguard.c:281
+#: ../panel-plugin/fsguard.c:282
 #, c-format
 msgid "%.2f GB"
 msgstr "%.2f GB"
@@ -39,7 +40,8 @@ msgstr "%3$s (%4$s) には %2$s 中 %1$s 
の空き容量があります"
 msgid "%s/%s space left on %s"
 msgstr "%3$s には %2$s 中 %1$s の空き容量があります"
 
-#: ../panel-plugin/fsguard.c:288 ../panel-plugin/fsguard.c:289
+#: ../panel-plugin/fsguard.c:288
+#: ../panel-plugin/fsguard.c:289
 #, c-format
 msgid "%.0f MB"
 msgstr "%.0f MB"
@@ -61,7 +63,8 @@ msgstr "%2$s は残り %1$s しかありません!"
 
 #. }}}
 #. vim600: set foldmethod=marker: foldmarker={{{,}}}
-#: ../panel-plugin/fsguard.c:572 ../panel-plugin/fsguard.desktop.in.in.h:1
+#: ../panel-plugin/fsguard.c:572
+#: ../panel-plugin/fsguard.desktop.in.in.h:1
 msgid "Free Space Checker"
 msgstr "空き容量チェッカ"
 
@@ -74,14 +77,12 @@ msgid "Mount point"
 msgstr "マウントポイント"
 
 #: ../panel-plugin/fsguard.c:596
-#, fuzzy
 msgid "Warning limit (%)"
-msgstr "警告を出す上限値 (MB)"
+msgstr "警告を出す上限値 (%)"
 
 #: ../panel-plugin/fsguard.c:601
-#, fuzzy
 msgid "Urgent limit (%)"
-msgstr "注意を促す上限値 (MB)"
+msgstr "緊急措置を促す上限値 (%)"
 
 #: ../panel-plugin/fsguard.c:621
 msgid "User Interface"
@@ -109,3 +110,4 @@ msgstr "ディスクの空き容量を見張ります。"
 
 #~ msgid "File manager"
 #~ msgstr "ファイルマネージャ"
+
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

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

[Transifex]

Updating branch refs/heads/master
 to 92213d95e91215dce57ae65168883eac71227437 (commit)
   from 239518c8857472148b929a5bea7028ffb7a68d82 (commit)

commit 92213d95e91215dce57ae65168883eac71227437
Author: Masato Hashimoto 
Date:   Mon Oct 5 14:03:43 2009 +

l10n: Updates to Japanese (ja) translation

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

 po/ja.po |   36 +++-
 1 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 9e1ad8f..05979c2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,42 +7,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-cpufreq-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-09 15:30+0900\n"
-"PO-Revision-Date: 2008-12-05 22:20+0900\n"
+"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"PO-Revision-Date: 2009-10-05 23:03+0900\n"
 "Last-Translator: Masato Hashimoto \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:75
+#: ../panel-plugin/xfce4-cpufreq-plugin.c:72
 #, c-format
 msgid "%d cpu available"
 msgstr "%d CPU が有効"
 
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:77
+#: ../panel-plugin/xfce4-cpufreq-plugin.c:74
 msgid "Frequency: "
 msgstr "周波数:"
 
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:84
+#: ../panel-plugin/xfce4-cpufreq-plugin.c:79
 msgid "Governor: "
 msgstr "ガバナ:"
 
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:258
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:280
+#: ../panel-plugin/xfce4-cpufreq-plugin.c:249
+#: ../panel-plugin/xfce4-cpufreq-plugin.c:274
 msgid "Could not create widgets !"
 msgstr "ウィジェットが作成できませんでした !"
 
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:277
-msgid ""
-"Your system is not configured correctly to support cpu frequency scaling !"
-msgstr ""
-"あなたのシステムは CPU 
周波数調整をサポートするための設定が正しく行われていま"
-"せん !"
-
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:287
-msgid "Your system is not supported yet !"
-msgstr "あなたのシステムはまだサポートされていません !"
+#: ../panel-plugin/xfce4-cpufreq-plugin.c:271
+msgid "Could not initialize linux backend !"
+msgstr "Linux バックエンドを初期化できませんでした !"
 
 #: ../panel-plugin/xfce4-cpufreq-plugin.desktop.in.in.h:1
 msgid "CPU Frequency Monitor"
@@ -51,3 +44,12 @@ msgstr "CPU 周波数モニタ"
 #: ../panel-plugin/xfce4-cpufreq-plugin.desktop.in.in.h:2
 msgid "Shows the cpu frequency and governours"
 msgstr "CPU 周波数とガバナを表示します"
+
+#~ msgid ""
+#~ "Your system is not configured correctly to support cpu frequency scaling !"
+#~ msgstr ""
+#~ "あなたのシステムは CPU 
周波数調整をサポートするための設定が正しく行われて"
+#~ "いません !"
+#~ msgid "Your system is not supported yet !"
+#~ msgstr "あなたのシステムはまだサポートされていません 
!"
+
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

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

[Transifex]

Updating branch refs/heads/master
 to a065ee500c552d3f3bb19d9771116aa314f916ce (commit)
   from 39c95a280a1b3c1bde89c01ded722571b6361b0c (commit)

commit a065ee500c552d3f3bb19d9771116aa314f916ce
Author: Masato Hashimoto 
Date:   Mon Oct 5 14:02:15 2009 +

l10n: Updates to Japanese (ja) translation

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

 po/ja.po |  156 ++---
 1 files changed, 117 insertions(+), 39 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index d9fab06..c6e56f6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-diskperf-plugin 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-09 15:31+0900\n"
-"PO-Revision-Date: 2008-12-09 15:23+0900\n"
+"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"PO-Revision-Date: 2009-10-05 23:02+0900\n"
 "Last-Translator: Masato Hashimoto \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
@@ -17,118 +17,125 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../panel-plugin/config_gui.c:103
+#: ../panel-plugin/config_gui.c:108
+msgid "About..."
+msgstr "情報..."
+
+#: ../panel-plugin/config_gui.c:123
+msgid "Disk Performance"
+msgstr "ディスクパフォーマンス"
+
+#: ../panel-plugin/config_gui.c:136
 msgid "Device"
 msgstr "デバイス"
 
-#: ../panel-plugin/config_gui.c:117
+#: ../panel-plugin/config_gui.c:150
 msgid "Input the device name, then press "
 msgstr "デバイス名を入力してください"
 
-#: ../panel-plugin/config_gui.c:120
+#: ../panel-plugin/config_gui.c:153
 msgid "/dev/hda1"
 msgstr "/dev/hda1"
 
-#: ../panel-plugin/config_gui.c:138
+#: ../panel-plugin/config_gui.c:171
 msgid "Data collection period"
 msgstr "データを収集する時間間隔を入力してください"
 
-#: ../panel-plugin/config_gui.c:141
+#: ../panel-plugin/config_gui.c:174
 msgid "Update interval (s) "
 msgstr "更新間隔 (秒)"
 
-#: ../panel-plugin/config_gui.c:149
+#: ../panel-plugin/config_gui.c:182
 msgid "Label"
 msgstr "ラベル"
 
-#: ../panel-plugin/config_gui.c:154
+#: ../panel-plugin/config_gui.c:187
 msgid "Tick to display label"
 msgstr 
"ラベルを表示する場合はチェックマークをつけてください"
 
-#: ../panel-plugin/config_gui.c:163
+#: ../panel-plugin/config_gui.c:196
 msgid "Input the label, then press "
 msgstr "ラベルを入力してください"
 
-#: ../panel-plugin/config_gui.c:165
+#: ../panel-plugin/config_gui.c:198
 msgid "hda1"
 msgstr "hda1"
 
-#: ../panel-plugin/config_gui.c:175
+#: ../panel-plugin/config_gui.c:208
 msgid "Monitor"
 msgstr "モニタ "
 
-#: ../panel-plugin/config_gui.c:180
+#: ../panel-plugin/config_gui.c:213
 msgid "I/O transfer"
 msgstr "I/O 転送"
 
-#: ../panel-plugin/config_gui.c:183
+#: ../panel-plugin/config_gui.c:216
 msgid "MB transferred / second"
 msgstr "毎秒の転送量をモニタリングします"
 
-#: ../panel-plugin/config_gui.c:189
+#: ../panel-plugin/config_gui.c:222
 msgid "Busy time"
 msgstr "使用率"
 
-#: ../panel-plugin/config_gui.c:193
+#: ../panel-plugin/config_gui.c:226
 msgid "Percentage of time the device is busy"
 msgstr "デバイスを使用していた時間の割合 (%) 
をモニタリングします"
 
-#: ../panel-plugin/config_gui.c:204
+#: ../panel-plugin/config_gui.c:237
 msgid "Max. I/O rate (MB/s) "
 msgstr "最大 I/O レート (MB/s) "
 
-#: ../panel-plugin/config_gui.c:215
+#: ../panel-plugin/config_gui.c:248
 msgid "Input the maximum I/O transfer rate of the device, then press "
 msgstr "デバイスの最大 I/O 転送レートを入力してください"
 
-#: ../panel-plugin/config_gui.c:218
+#: ../panel-plugin/config_gui.c:251
 msgid "35"
 msgstr "35"
 
-#: ../panel-plugin/config_gui.c:225
+#: ../panel-plugin/config_gui.c:258
 msgid "Combine Read/Write data"
 msgstr "読み込み/書き込みデータを合わせて表示する"
 
-#: ../panel-plugin/config_gui.c:230
+#: ../panel-plugin/config_gui.c:263
 msgid "Combine Read/Write data into one single monitor?"
-msgstr ""
-"読み込みデータと書き込みデータを合わせて表示する場合はチェックマークをつけて"
-"ください"
+msgstr 
"読み込みデータと書き込みデータを合わせて表示する場合はチェックマークをつけてください"
 
-#: ../panel-plugin/config_gui.c:237
+#: ../panel-plugin/config_gui.c:270
 msgid "Bar color "
 msgstr "バーの色"
 
-#: ../panel-plugin/config_gui.c:252 ../panel-plugin/config_gui.c:318
-#: ../panel-plugin/config_gui.c:327
+#: ../panel-plugin/config_gui.c:284
+#: ../panel-plugin/config_gui.c:349
+#: ../panel-plugin/config_gui.c:357
 msgid "Press to change color"
 msgstr "色を変える時はここを押してください"
 
-#: ../panel-plugin/config_gui.c:258
+#: ../panel-plugin/config_gui.c:290
 msgid "Read bar color "
 msgstr "読み込みバーの色 "
 
-#: ../panel-plugin/confi

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

[Transifex]

Updating branch refs/heads/master
 to bca2758f686ec711c553fcaba73e7e8aafcd3962 (commit)
   from dc1fc48120fe1cabbd66e464c318cfbb7ec0bc11 (commit)

commit bca2758f686ec711c553fcaba73e7e8aafcd3962
Author: Masato Hashimoto 
Date:   Mon Oct 5 14:00:45 2009 +

l10n: Updates to Japanese (ja) translation

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

 po/ja.po |  117 +
 1 files changed, 48 insertions(+), 69 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 130e69d..f6ef336 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mount-plugin 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-23 23:19+0900\n"
-"PO-Revision-Date: 2009-03-23 23:19+0900\n"
+"POT-Creation-Date: 2009-01-16 12:37-0500\n"
+"PO-Revision-Date: 2009-10-05 23:00+0900\n"
 "Last-Translator: Masato Hashimoto \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
@@ -83,145 +83,125 @@ msgstr "マウントポイント : %s\n"
 msgid "not mounted\n"
 msgstr "マウントされていません\n"
 
-#: ../panel-plugin/devices.c:245 ../panel-plugin/devices.c:294
+#: ../panel-plugin/devices.c:245
+#: ../panel-plugin/devices.c:294
 msgid "Mount Plugin: Error executing command."
 msgstr "マウントプラグイン: 
コマンドの実行中にエラーが発生しました。"
 
-#: ../panel-plugin/mount-plugin.c:57
+#: ../panel-plugin/mount-plugin.c:54
 #, c-format
 msgid "The device \"%s\" should be removable safely now."
 msgstr "デバイス \"%s\" を取り外す用意が整いました。"
 
-#: ../panel-plugin/mount-plugin.c:60
-#, c-format
-msgid "An error occurred. The device \"%s\" should not be removed!"
-msgstr "エラーが発生しました。デバイス \"%s\" 
を取り外してはいけません!"
+#: ../panel-plugin/mount-plugin.c:57
+msgid "An error occurred. The device should not be removed!"
+msgstr 
"エラーが発生しました。デバイスを取り外してはいけません!"
 
-#: ../panel-plugin/mount-plugin.c:252
+#: ../panel-plugin/mount-plugin.c:249
 msgid "not mounted"
 msgstr "マウントされていません"
 
-#: ../panel-plugin/mount-plugin.c:560
+#: ../panel-plugin/mount-plugin.c:557
 msgid "devices"
 msgstr "デバイス"
 
-#: ../panel-plugin/mount-plugin.c:727
+#: ../panel-plugin/mount-plugin.c:724
 msgid "Mount Plugin"
 msgstr "マウントプラグイン"
 
-#: ../panel-plugin/mount-plugin.c:783
-msgid ""
-"This is only useful and recommended if you specify \"sync\" as part of the "
-"\"unmount\" command string."
-msgstr ""
-"このオプションは \"unmount\" コマンド文字列に \"sync\" 
を入れている場合にお勧"
-"めします。"
+#: ../panel-plugin/mount-plugin.c:780
+msgid "This is only useful and recommended if you specify \"sync\" as part of 
the \"unmount\" command string."
+msgstr "このオプションは \"unmount\" コマンド文字列に \"sync\" 
を入れている場合にお勧めします。"
 
-#: ../panel-plugin/mount-plugin.c:788
+#: ../panel-plugin/mount-plugin.c:785
 msgid "Show _message after unmount"
 msgstr "マウント解除後にメッセージを表示する(_M)"
 
-#: ../panel-plugin/mount-plugin.c:800
+#: ../panel-plugin/mount-plugin.c:797
 msgid "You can specify a distinct icon to be displayed in the panel."
 msgstr 
"パネルに表示するために、異なったアイコンを指定できます。"
 
-#: ../panel-plugin/mount-plugin.c:807
+#: ../panel-plugin/mount-plugin.c:804
 msgid "Icon:"
 msgstr "アイコン:"
 
-#: ../panel-plugin/mount-plugin.c:811
+#: ../panel-plugin/mount-plugin.c:808
 msgid "Select an image"
 msgstr "イメージの選択"
 
-#: ../panel-plugin/mount-plugin.c:818
+#: ../panel-plugin/mount-plugin.c:815
 msgid "_General"
 msgstr "全般(_G)"
 
-#: ../panel-plugin/mount-plugin.c:833
+#: ../panel-plugin/mount-plugin.c:830
 #, c-format
 msgid ""
-"This command will be executed after mounting the device with the mount point "
-"of the device as argument.\n"
+"This command will be executed after mounting the device with the mount point 
of the device as argument.\n"
 "If you are unsure what to insert, try \"thunar %m\".\n"
 "'%d' can be used to specify the device, '%m' for the mountpoint."
 msgstr ""
-"このコマンドは、引数にあるデバイスのマウントポイントにデバイスがマウントされ"
-"た後に実行されます。\n"
+"このコマンドは、引数にあるデバイスのマウントポイントにデバイスがマウントされた後に実行されます。\n"
 "何を入力するか分からないのでしたら、\"thunar %m\" 
を試してみて下さい。\n"
 "'%d' はデバイスを、'%m' 
はマウントポイントを指定するために使用します。"
 
-#: ../panel-plugin/mount-plugin.c:843
+#: ../panel-plugin/mount-plugin.c:840
 msgid "_Execute after mounting:"
 msgstr "マウント後に実行(_E):"
 
-#: ../panel-plugin/

[Xfce4-commits] Register marshallers for specialized thumbnailer signals.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to b5d3d3e7c7578883a6be766a6ec7cdda18b294c5 (commit)
   from 88bd699be2ce252010a93cb2e327d0395b2aaab6 (commit)

commit b5d3d3e7c7578883a6be766a6ec7cdda18b294c5
Author: Jannis Pohlmann 
Date:   Mon Oct 5 15:31:13 2009 +0200

Register marshallers for specialized thumbnailer signals.

 tumbler/tumbler-marshal.list   |1 +
 tumblerd/tumbler-specialized-thumbnailer.c |   12 
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/tumbler/tumbler-marshal.list b/tumbler/tumbler-marshal.list
index 0d17170..f5f6213 100644
--- a/tumbler/tumbler-marshal.list
+++ b/tumbler/tumbler-marshal.list
@@ -1,2 +1,3 @@
 VOID:STRING,INT,STRING
 VOID:UINT,POINTER,INT,STRING
+VOID:STRING,INT,STRING
diff --git a/tumblerd/tumbler-specialized-thumbnailer.c 
b/tumblerd/tumbler-specialized-thumbnailer.c
index f4734d9..02960ae 100644
--- a/tumblerd/tumbler-specialized-thumbnailer.c
+++ b/tumblerd/tumbler-specialized-thumbnailer.c
@@ -192,6 +192,18 @@ tumbler_specialized_thumbnailer_constructed (GObject 
*object)
 
   g_free (bus_path);
 
+  dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 
+ G_TYPE_STRING,
+ G_TYPE_INVALID);
+  
+  dbus_g_object_register_marshaller (tumbler_marshal_VOID__STRING_INT_STRING,
+ G_TYPE_NONE,
+ G_TYPE_STRING,
+ G_TYPE_INT,
+ G_TYPE_STRING,
+ G_TYPE_INVALID);
+
   dbus_g_proxy_add_signal (thumbnailer->proxy, "Ready", 
G_TYPE_STRING, G_TYPE_INVALID);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Derive TumblerSpecializedThumbnailer from TumblerAbstractThumbnailer.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 88bd699be2ce252010a93cb2e327d0395b2aaab6 (commit)
   from 0b556c1738ddcf4737c680061750b5c340b4a0bc (commit)

commit 88bd699be2ce252010a93cb2e327d0395b2aaab6
Author: Jannis Pohlmann 
Date:   Mon Oct 5 15:14:17 2009 +0200

Derive TumblerSpecializedThumbnailer from TumblerAbstractThumbnailer.

The abstract thumbnailer already manages the URI schemes, MIME hints and
hash keys arrays for us, so we don't have to do this ourselves.

 tumblerd/tumbler-specialized-thumbnailer.c |   38 ---
 1 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/tumblerd/tumbler-specialized-thumbnailer.c 
b/tumblerd/tumbler-specialized-thumbnailer.c
index 36d7f51..f4734d9 100644
--- a/tumblerd/tumbler-specialized-thumbnailer.c
+++ b/tumblerd/tumbler-specialized-thumbnailer.c
@@ -76,12 +76,12 @@ static void tumbler_specialized_thumbnailer_proxy_destroyed 
(DBusGProxy
 
 struct _TumblerSpecializedThumbnailerClass
 {
-  GObjectClass __parent__;
+  TumblerAbstractThumbnailerClass __parent__;
 };
 
 struct _TumblerSpecializedThumbnailer
 {
-  GObject __parent__;
+  TumblerAbstractThumbnailer __parent__;
 
   DBusGConnection *connection;
   DBusGProxy  *proxy;
@@ -90,17 +90,13 @@ struct _TumblerSpecializedThumbnailer
   guint64  modified;
 
   gchar   *name;
-
-  GStrvuri_schemes;
-  GStrvhash_keys;
-  GStrvmime_types;
 };
 
 
 
 G_DEFINE_TYPE_WITH_CODE (TumblerSpecializedThumbnailer, 
  tumbler_specialized_thumbnailer,
- G_TYPE_OBJECT,
+ TUMBLER_TYPE_ABSTRACT_THUMBNAILER,
  G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_THUMBNAILER,
 
tumbler_specialized_thumbnailer_iface_init));
 
@@ -117,10 +113,6 @@ tumbler_specialized_thumbnailer_class_init 
(TumblerSpecializedThumbnailerClass *
   gobject_class->get_property = tumbler_specialized_thumbnailer_get_property;
   gobject_class->set_property = tumbler_specialized_thumbnailer_set_property;
 
-  g_object_class_override_property (gobject_class, PROP_MIME_TYPES, 
"mime-types");
-  g_object_class_override_property (gobject_class, PROP_URI_SCHEMES, 
"uri-schemes");
-  g_object_class_override_property (gobject_class, PROP_HASH_KEYS, 
"hash-keys");
-
   g_object_class_install_property (gobject_class,
PROP_NAME,
g_param_spec_string ("name",
@@ -178,7 +170,6 @@ tumbler_specialized_thumbnailer_iface_init 
(TumblerThumbnailerIface *iface)
 static void
 tumbler_specialized_thumbnailer_init (TumblerSpecializedThumbnailer 
*thumbnailer)
 {
-  thumbnailer->mime_types = NULL;
 }
 
 
@@ -195,9 +186,9 @@ tumbler_specialized_thumbnailer_constructed (GObject 
*object)
   bus_path = g_strdelimit (bus_path, ".", '/');
 
   thumbnailer->proxy = dbus_g_proxy_new_for_name (thumbnailer->connection,
-thumbnailer->name,
-bus_path,
-
"org.xfce.thumbnailer.Thumbnailer");
+  thumbnailer->name,
+  bus_path,
+  
"org.xfce.thumbnailer.Thumbnailer");
 
   g_free (bus_path);
 
@@ -229,10 +220,6 @@ tumbler_specialized_thumbnailer_finalize (GObject *object)
 
   g_free (thumbnailer->name);
 
-  g_strfreev (thumbnailer->hash_keys);
-  g_strfreev (thumbnailer->mime_types);
-  g_strfreev (thumbnailer->uri_schemes);
-
   dbus_g_proxy_disconnect_signal (thumbnailer->proxy, "Ready",
   G_CALLBACK 
(tumbler_specialized_thumbnailer_proxy_ready),
   thumbnailer);
@@ -260,12 +247,6 @@ tumbler_specialized_thumbnailer_get_property (GObject
*object,
 
   switch (prop_id)
 {
-case PROP_MIME_TYPES:
-  g_value_set_pointer (value, g_strdupv (thumbnailer->mime_types));
-  break;
-case PROP_URI_SCHEMES:
-  g_value_set_pointer (value, g_strdupv (thumbnailer->uri_schemes));
-  break;
 case PROP_CONNECTION:
   g_value_set_pointer (value, dbus_g_connection_ref 
(thumbnailer->connection));
   break;
@@ -299,13 +280,6 @@ tumbler_specialized_thumbnailer_set_property (GObject  
*object,
 
   switch (prop_id)
 {
-case PROP_MIME_TYPES:
-  if (g_value_get_pointer (value) != NULL)
-thumbnailer->mime_types = g_strdupv (g_value_get_pointer (value));
-  break;
-case PROP_URI_SCHEMES:
-  thumbnailer->uri_schemes = g_strdupv (g_value_get_pointer (value));
-  break;
 case PROP_CONNECTION:
   thumbnailer->connection = dbus_g_connection_ref (g_value_get_pointer 
(value));
   break;
___
Xfce4-commits mailing

[Xfce4-commits] Fix reference counting leak spotted by Philip Van Hoof.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 0b556c1738ddcf4737c680061750b5c340b4a0bc (commit)
   from fd8d82d61bf59129583dc2dab7edae54be214f31 (commit)

commit 0b556c1738ddcf4737c680061750b5c340b4a0bc
Author: Jannis Pohlmann 
Date:   Mon Oct 5 15:13:34 2009 +0200

Fix reference counting leak spotted by Philip Van Hoof.

 tumblerd/tumbler-registry.c |4 
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c
index b35b8a7..57562ff 100644
--- a/tumblerd/tumbler-registry.c
+++ b/tumblerd/tumbler-registry.c
@@ -444,10 +444,6 @@ tumbler_registry_get_thumbnailer_array (TumblerRegistry 
*registry,
   /* see if we can find a thumbnailer to handle this URI/MIME type pair */
   thumbnailers[n] = tumbler_registry_lookup (registry, hash_key);
 
-  /* if there is one, take a reference on it */
-  if (thumbnailers[n] != NULL)
-g_object_ref (thumbnailers[n]);
-
   /* free strings */
   g_free (hash_key);
   g_free (scheme);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] 4.7.4.7 claried window headers and menu names. Also made alarm window selectable.

[Juha Kautto]

Updating branch refs/heads/master
 to ffd1677e2cd932759bea065a120484b42ffda664 (commit)
   from 1b1ae3db8ff86378f647ef174a62161a36d2de10 (commit)

commit ffd1677e2cd932759bea065a120484b42ffda664
Author: Juha Kautto 
Date:   Mon Oct 5 15:50:41 2009 +0300

4.7.4.7 claried window headers and menu names. Also made alarm window 
selectable.

Modified desktop files to have same style and more data. Instead of only 
Orage
they now say Orage Calendar.
Made text and header of alarm window selectable so that cut/paste works now.

 configure.in.in|2 +-
 globaltime/globaltime.desktop.in   |4 ++--
 globaltime/gt_prefs.c  |4 ++--
 panel-plugin/oc_config.c   |4 ++--
 panel-plugin/xfce4-orageclock-plugin.c |5 -
 plugin/xfce-xfcalendar-settings.desktop.in |2 +-
 src/reminder.c |2 ++
 xfcalendar.desktop.in  |2 +-
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 9fe9134..3862f08 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto 
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.7.4.7-test])
+m4_define([orage_version], [4.7.4.8-test])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/globaltime/globaltime.desktop.in b/globaltime/globaltime.desktop.in
index 27942ee..a42d480 100644
--- a/globaltime/globaltime.desktop.in
+++ b/globaltime/globaltime.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8
-_Name=Globaltime
+_Name=Orage Globaltime
 _Comment=Show clocks from different countries
 Exec=globaltime
 Icon=xfce4-clock
@@ -9,4 +9,4 @@ StartupNotify=true
 Terminal=false
 Type=Application
 Categories=X-XFCE;Office;Clock;GTK;Application;Utility;
-_GenericName=Clock
+_GenericName=Globaltime
diff --git a/globaltime/gt_prefs.c b/globaltime/gt_prefs.c
index 166c846..b9b3cf2 100644
--- a/globaltime/gt_prefs.c
+++ b/globaltime/gt_prefs.c
@@ -585,7 +585,7 @@ gboolean clock_parameters(GtkWidget *widget, clock_struct 
*clockp)
 modify_clock->clock = clockp;
 clockp->modify_data = modify_clock;
 modify_clock->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-window_name = g_strconcat(_("Modify Clock "), clockp->name->str, NULL);
+window_name = g_strconcat(_("Globaltime preferences "), clockp->name->str, 
NULL);
 gtk_window_set_title(GTK_WINDOW(modify_clock->window), window_name);
 g_free(window_name);
 g_signal_connect(G_OBJECT(modify_clock->window) , "destroy"
@@ -1057,7 +1057,7 @@ gboolean default_preferences(GtkWidget *widget)
 modify_default = g_new0(modify_struct, 1);
 modify_default->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 gtk_window_set_title(GTK_WINDOW (modify_default->window)
-, _("Modify Globaltime Preferences"));
+, _("Globaltime Preferences"));
 g_signal_connect(G_OBJECT(modify_default->window) , "destroy"
 , G_CALLBACK(release_preferences_window), modify_default);

 
diff --git a/panel-plugin/oc_config.c b/panel-plugin/oc_config.c
index 38da945..d6a74cb 100644
--- a/panel-plugin/oc_config.c
+++ b/panel-plugin/oc_config.c
@@ -135,7 +135,7 @@ static void oc_show3(GtkToggleButton *cb, Clock *clock)
 static void oc_hib_timing_toggled(GtkToggleButton *cb, Clock *clock)
 {
 clock->hib_timing = gtk_toggle_button_get_active(cb);
-oc_hib_timing_set(clock);
+/* oc_hib_timing_set(clock); */
 }
 
 static gboolean oc_line_changed(GtkWidget *entry, GdkEventKey *key
@@ -404,7 +404,7 @@ void oc_properties_dialog(XfcePanelPlugin *plugin, Clock 
*clock)
 clock->interval = 200; /* 0,2 sec, so that we can show quick feedback
 * on the panel */
 oc_start_timer(clock);
-dlg = gtk_dialog_new_with_buttons(_("Properties"), 
+dlg = gtk_dialog_new_with_buttons(_("Orage clock Preferences"), 
 GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(plugin))),
 GTK_DIALOG_DESTROY_WITH_PARENT |
 GTK_DIALOG_NO_SEPARATOR,
diff --git a/panel-plugin/xfce4-orageclock-plugin.c 
b/panel-plugin/xfce4-orageclock-plugin.c
index de6b684..4ca643f 100644
--- a/panel-plugin/xfce4-orageclock-plugin.c
+++ b/panel-plugin/xfce4-orageclock-plugin.c
@@ -548,7 +548,6 @@ void oc_write_rc_file(XfcePanelPlugin *plugin, Clock *clock)
 }
 
 /* Create widgets and connect to signals */
-
 Clock *orage_oc_new(XfcePanelPlugin *plugin)
 {
 Clock *clock = g_new0(Clock, 1);
@@ -616,10 +615,6 @@ void oc_show_frame_set(Clock *clock)
 , clock->show_frame ? GTK_SHADOW_IN : GTK_SHADOW_NONE);
 }
 
-void oc_hib_timing_set(Clock *clock)
-{
-}
-
 void oc_fg_set(Clock *clock)
 {
 GdkColor *fg = NULL;
diff --git a/plugin/xfce-xfcalendar-settings.desktop.