[Xfce4-commits] thunar-vfs:master l10n: Updates to Chinese (China) (zh_CN) translation
Updating branch refs/heads/master to 51be4aa7025f0fd53e0c41df3aeaeff3a68c36bb (commit) from bcb47f34199b19217830f5da814ef2310d4b901e (commit) commit 51be4aa7025f0fd53e0c41df3aeaeff3a68c36bb Author: Xu Meihong mhun...@gmail.com Date: Mon Dec 21 08:25:43 2009 + l10n: Updates to Chinese (China) (zh_CN) translation Transmitted-via: Transifex (translations.xfce.org) po/zh_CN.po | 26 +- 1 files changed, 5 insertions(+), 21 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index b8183ed..cd3e7f3 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,10 +10,10 @@ msgid msgstr Project-Id-Version: Thunar 0.9.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-18 21:01+0100\n -PO-Revision-Date: 2009-06-15 14:45+0200\n +POT-Creation-Date: 2009-12-18 20:02+\n +PO-Revision-Date: 2009-12-21 16:27+0800\n Last-Translator: Hunt Xu hun...@live.cn\n -Language-Team: Chinese xfce-i...@xfce.org\n +Language-Team: Chinese (simplified) xfce-i...@xfce.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n @@ -21,50 +21,42 @@ msgstr #: ../thunar-vfs/exo-mount-point.c:218 ../thunar-vfs/exo-mount-point.c:247 #: ../thunar-vfs/exo-mount-point.c:435 -#, fuzzy, c-format +#, c-format msgid Failed to open file \%s\: %s -msgstr 无法打开文件 \%s\ +msgstr 无法打开文件 \%s\: %s #. base directory not readable #: ../thunar-vfs/thunar-vfs-deep-count-job.c:233 -#, c-format msgid Failed to read folder contents msgstr 无法读取文件夹内容 #: ../thunar-vfs/thunar-vfs-exec.c:590 -#, c-format msgid Unknown error msgstr 未知错误 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is. #: ../thunar-vfs/thunar-vfs-info.c:390 -#, c-format msgid No Exec field specified msgstr Exec 栏并未指定 #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is. #: ../thunar-vfs/thunar-vfs-info.c:409 -#, c-format msgid No URL field specified msgstr URL 栏并未指定 #: ../thunar-vfs/thunar-vfs-info.c:414 ../thunar-vfs/thunar-vfs-private.c:384 -#, c-format msgid Invalid desktop file msgstr 无效的桌面文件 #: ../thunar-vfs/thunar-vfs-info.c:422 -#, c-format msgid Failed to parse file msgstr 无法解析文件 #: ../thunar-vfs/thunar-vfs-info.c:503 -#, c-format msgid Invalid file name msgstr 无效的文件名 #: ../thunar-vfs/thunar-vfs-info.c:510 -#, c-format msgid Only local files may be renamed msgstr 只有本地文件可以被重命名 @@ -202,12 +194,10 @@ msgid Failed to create symbolic link \%s\ msgstr 创建符号链接“%s”失败 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:550 -#, c-format msgid Special files cannot be copied msgstr 特殊文件无法被复制 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:630 -#, c-format msgid Symbolic links are not supported msgstr 不支持符号链接 @@ -247,7 +237,6 @@ msgstr 回收站 #. we don't support moving files within the trash #: ../thunar-vfs/thunar-vfs-io-trash.c:1318 #: ../thunar-vfs/thunar-vfs-io-trash.c:1432 -#, c-format msgid Cannot move or copy files within the trash msgstr 无法把文件移动或复制到回收站 @@ -325,23 +314,19 @@ msgid The URI \%s\ is invalid msgstr 统一资源标志(URI) “%s” 是无效的 #: ../thunar-vfs/thunar-vfs-path.c:800 -#, c-format msgid Path too long to fit into buffer msgstr 路径太长，无法放入缓冲区 #: ../thunar-vfs/thunar-vfs-path.c:903 -#, c-format msgid URI too long to fit into buffer msgstr 统一资源标志(URI)太长，无法放入缓冲区 #: ../thunar-vfs/thunar-vfs-private.c:233 -#, c-format msgid Operation not supported msgstr 不支持此操作 #. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396) #: ../thunar-vfs/thunar-vfs-private.c:335 -#, c-format msgid Invalidly escaped characters msgstr 无效的转义字符 @@ -359,7 +344,6 @@ msgid Collecting files... msgstr 正在搜集文件... #: ../thunar-vfs/thunar-vfs-util.c:251 -#, c-format msgid Invalid path msgstr 无效的路径 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:jeromeg/settings-editor Don't even allow the user to try to reset locked properties.
Updating branch refs/heads/jeromeg/settings-editor
to 566979f1bcc8a9f67d13e059ce502d17ea7202ee (commit)
from 5deee894b1b1d5316b5b7f9ded5ad46dbde60ee0 (commit)
commit 566979f1bcc8a9f67d13e059ce502d17ea7202ee
Author: Jérôme Guelfucci jero...@xfce.org
Date: Mon Dec 21 09:56:29 2009 +0100
Don't even allow the user to try to reset locked properties.
xfce4-settings-editor/main_window.c | 19 +--
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/xfce4-settings-editor/main_window.c
b/xfce4-settings-editor/main_window.c
index 446e9a8..38a04bf 100644
--- a/xfce4-settings-editor/main_window.c
+++ b/xfce4-settings-editor/main_window.c
@@ -60,7 +60,7 @@ load_properties (XfconfChannel *channel, GtkTreeStore *store,
GtkTreeView *treev
static void
cb_channel_treeview_selection_changed (GtkTreeSelection *selection, gpointer
user_data);
static void
-cb_property_treeview_selection_changed (GtkTreeSelection *selection, GtkWidget
*edit_button);
+cb_property_treeview_selection_changed (GtkTreeSelection *selection,
GtkBuilder *builder);
static void
cb_property_treeview_row_activated (GtkTreeView *tree_view, GtkTreePath *path,
GtkTreeViewColumn *column, gpointer user_data);
@@ -148,7 +148,7 @@ xfce4_settings_editor_main_window_new(void)
g_signal_connect (G_OBJECT (selection), changed, G_CALLBACK
(cb_channel_treeview_selection_changed), NULL);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW
(property_treeview));
-g_signal_connect (G_OBJECT (selection), changed, G_CALLBACK
(cb_property_treeview_selection_changed), property_edit_button);
+g_signal_connect (G_OBJECT (selection), changed, G_CALLBACK
(cb_property_treeview_selection_changed), builder);
/* Connect signal-handlers to toolbar buttons */
@@ -442,11 +442,14 @@ cb_channel_treeview_selection_changed (GtkTreeSelection
*selection, gpointer use
}
static void
-cb_property_treeview_selection_changed (GtkTreeSelection *selection, GtkWidget
*edit_button)
+cb_property_treeview_selection_changed (GtkTreeSelection *selection,
GtkBuilder *builder)
{
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreeIter p_iter;
+gboolean locked;
+GObject *property_edit_button;
+GObject *property_revert_button;
GValue value = {0, };
gchar *prop_name = NULL;
gchar *temp = NULL;
@@ -482,9 +485,13 @@ cb_property_treeview_selection_changed (GtkTreeSelection
*selection, GtkWidget *
current_property = prop_name;
-/* Set the state of the edit button */
-gtk_widget_set_sensitive (edit_button,
- !xfconf_channel_is_property_locked
(current_channel, current_property));
+/* Set the state of the edit and reset buttons */
+property_edit_button = gtk_builder_get_object (builder,
property_edit_button);
+property_revert_button = gtk_builder_get_object (builder,
property_revert_button);
+locked = xfconf_channel_is_property_locked (current_channel,
current_property);
+
+gtk_widget_set_sensitive (GTK_WIDGET (property_edit_button), !locked);
+gtk_widget_set_sensitive (GTK_WIDGET (property_revert_button), !locked);
}
static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:jeromeg/settings-editor Set the state of the edit and reset buttons in all cases.
Updating branch refs/heads/jeromeg/settings-editor
to cc2ac5a32a591d1aa3e7d613ed0fadbe647d546a (commit)
from 566979f1bcc8a9f67d13e059ce502d17ea7202ee (commit)
commit cc2ac5a32a591d1aa3e7d613ed0fadbe647d546a
Author: Jérôme Guelfucci jero...@xfce.org
Date: Mon Dec 21 10:04:52 2009 +0100
Set the state of the edit and reset buttons in all cases.
We set the default state to insensitive, set it to sensitive when an
editable property is selected. If the property is locked or if a new
channel is selected, we set the buttons to be insensitive.
xfce4-settings-editor/main_window.c | 31 +--
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/xfce4-settings-editor/main_window.c
b/xfce4-settings-editor/main_window.c
index 38a04bf..cb065f6 100644
--- a/xfce4-settings-editor/main_window.c
+++ b/xfce4-settings-editor/main_window.c
@@ -58,7 +58,7 @@ static void
load_properties (XfconfChannel *channel, GtkTreeStore *store, GtkTreeView
*treeview);
static void
-cb_channel_treeview_selection_changed (GtkTreeSelection *selection, gpointer
user_data);
+cb_channel_treeview_selection_changed (GtkTreeSelection *selection, GtkBuilder
*builder);
static void
cb_property_treeview_selection_changed (GtkTreeSelection *selection,
GtkBuilder *builder);
static void
@@ -108,6 +108,9 @@ xfce4_settings_editor_main_window_new(void)
property_new_button = gtk_builder_get_object (builder,
property_new_button);
property_revert_button = gtk_builder_get_object (builder,
property_revert_button);
+gtk_widget_set_sensitive (GTK_WIDGET (property_edit_button), FALSE);
+gtk_widget_set_sensitive (GTK_WIDGET (property_revert_button), FALSE);
+
/*
* Channel List
*/
@@ -145,7 +148,7 @@ xfce4_settings_editor_main_window_new(void)
/* selection handling */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (channel_treeview));
-g_signal_connect (G_OBJECT (selection), changed, G_CALLBACK
(cb_channel_treeview_selection_changed), NULL);
+g_signal_connect (G_OBJECT (selection), changed, G_CALLBACK
(cb_channel_treeview_selection_changed), builder);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW
(property_treeview));
g_signal_connect (G_OBJECT (selection), changed, G_CALLBACK
(cb_property_treeview_selection_changed), builder);
@@ -408,21 +411,28 @@ cb_property_treeview_row_activated (GtkTreeView
*tree_view, GtkTreePath *path, G
}
static void
-cb_channel_treeview_selection_changed (GtkTreeSelection *selection, gpointer
user_data)
+cb_channel_treeview_selection_changed (GtkTreeSelection *selection, GtkBuilder
*builder)
{
GtkTreeModel *model;
GtkTreeIter iter;
XfconfChannel *channel;
GObject *property_treeview;
+GObject *property_edit_button;
+GObject *property_revert_button;
GtkTreeModel *tree_store = NULL;
GValue value = {0, };
+property_edit_button = gtk_builder_get_object (builder,
property_edit_button);
+property_revert_button = gtk_builder_get_object (builder,
property_revert_button);
+
if (current_channel)
{
g_object_unref (G_OBJECT(current_channel));
current_channel = NULL;
}
+
+
if (! gtk_tree_selection_get_selected (selection, model, iter))
return;
@@ -454,15 +464,26 @@ cb_property_treeview_selection_changed (GtkTreeSelection
*selection, GtkBuilder
gchar *prop_name = NULL;
gchar *temp = NULL;
+property_edit_button = gtk_builder_get_object (builder,
property_edit_button);
+property_revert_button = gtk_builder_get_object (builder,
property_revert_button);
+
if (current_property)
{
g_free (prop_name);
current_property = NULL;
}
+gtk_widget_set_sensitive (GTK_WIDGET (property_edit_button), FALSE);
+gtk_widget_set_sensitive (GTK_WIDGET (property_revert_button), FALSE);
+
/* return if no property is selected */
-if (! gtk_tree_selection_get_selected (selection, model, iter))
+if (!gtk_tree_selection_get_selected (selection, model, iter))
+{
+gtk_widget_set_sensitive (GTK_WIDGET (property_edit_button), FALSE);
+gtk_widget_set_sensitive (GTK_WIDGET (property_revert_button), FALSE);
+
return;
+}
/* create the complete property-name */
gtk_tree_model_get_value (model, iter, 0, value);
@@ -486,8 +507,6 @@ cb_property_treeview_selection_changed (GtkTreeSelection
*selection, GtkBuilder
current_property = prop_name;
/* Set the state of the edit and reset buttons */
-property_edit_button = gtk_builder_get_object (builder,
property_edit_button);
-property_revert_button = gtk_builder_get_object (builder,
property_revert_button);
locked = xfconf_channel_is_property_locked (current_channel,
current_property);
gtk_widget_set_sensitive (GTK_WIDGET (property_edit_button), !locked);
___
[Xfce4-commits] xfdesktop:master Add the new xml files to the dist.
Updating branch refs/heads/master to 718f3dc56f78020eef492fa26b180310e77ed25a (commit) from 8510ab27d3347602ebd230dfa9c0ad3a606b54fe (commit) commit 718f3dc56f78020eef492fa26b180310e77ed25a Author: Nick Schermer n...@xfce.org Date: Mon Dec 21 12:27:36 2009 +0100 Add the new xml files to the dist. settings/Makefile.am |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/settings/Makefile.am b/settings/Makefile.am index 06f16df..0d9e0af 100644 --- a/settings/Makefile.am +++ b/settings/Makefile.am @@ -51,9 +51,10 @@ SUFFIXES: .ui endif EXTRA_DIST = \ - xfdesktop-settings.glade \ + xfdesktop-settings-ui.xml \ + xfdesktop-settings-appearance-frame-ui.xml \ $(desktop_in_files) -CLEANFILES = \ -$(BUILT_SOURCES) \ -$(desktop_DATA) +CLEANFILES = \ + $(BUILT_SOURCES) \ + $(desktop_DATA) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.5.7.4 Fixed configure.in.in to work again with older autotools
Updating branch refs/heads/master
to 692c918d7fcfcc6d86dfd7da5ab7061a9ebe59d7 (commit)
from 614d4bfad3404fce868e99e67c402121883ae783 (commit)
commit 692c918d7fcfcc6d86dfd7da5ab7061a9ebe59d7
Author: Juha Kautto j...@xfce.org
Date: Mon Dec 21 15:06:57 2009 +0200
4.5.7.4 Fixed configure.in.in to work again with older autotools
Only recent autotools can use variables with AC_OUTPUT. Reverted back to
old version.
Removed reference to .git from autogen.sh.
Removed double notification from reminder.
autogen.sh |3 +--
configure.in.in | 22 +++---
src/reminder.c | 11 +--
3 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index b0bf71a..1cc3c2e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,9 +29,8 @@ EOF
# substitute revision and linguas
linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, $2}'`
+# revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf %05d\n, $2}'`
sed -e s/@LINGUAS@/${linguas}/g \
--e s/@REVISION@/${revision}/g \
configure.in.in configure.in
exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index cd3eadc..62150e7 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto j...@xfce.org
dnl
dnl Version information
-m4_define([orage_version], [4.7.5.3-git])
+m4_define([orage_version], [4.7.5.4-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
@@ -239,7 +239,7 @@ dnl
have_archive=no
AC_ARG_ENABLE([archive],
AC_HELP_STRING([--enable-archive], [use automatic archiving (defaut=yes)])
-AC_HELP_STRING([--disable-archive], [don't use automatic archiving]),
+AC_HELP_STRING([--disable-archive], [do not use automatic archiving]),
[], [enable_archive=yes])
if test x$enable_archive = xyes; then
AC_DEFINE([HAVE_ARCHIVE], [1], [Define to enable archiving])
@@ -251,9 +251,25 @@ dnl Check for debugging support
dnl BM_DEBUG_SUPPORT()
XDT_FEATURE_DEBUG
+dnl the intention was to use variable
+dnl $LIBICAL_DIRS
+dnl to control if libical is being compiled or not, but only very
+dnl recent autotools can have such variables in AC_OUTPUT.
+dnl Revertign back to full list until time is right for using it.
+dnl This causes some extra work at compile time, but should not cause
+dnl any issues to users.
+
AC_OUTPUT([
Makefile
-$LIBICAL_DIRS
+libical/Makefile
+libical/design-data/Makefile
+libical/doc/Makefile
+libical/scripts/Makefile
+libical/src/Makefile
+libical/src/libical/Makefile
+libical/src/libical/icalversion.h
+libical/src/libicalss/Makefile
+libical/zoneinfo/Makefile
xfcalendar.spec
icons/Makefile
icons/48x48/Makefile
diff --git a/src/reminder.c b/src/reminder.c
index 2a616dc..93bc6a1 100644
--- a/src/reminder.c
+++ b/src/reminder.c
@@ -738,11 +738,6 @@ static void create_orage_reminder(alarm_struct *alarm)
gtk_box_pack_end(GTK_BOX(vbReminder), e_hbox, FALSE, FALSE, 0);
ddmmhh_hbox-dialog = wReminder;
-#if GTK_CHECK_VERSION(2,16,0)
-e_label = gtk_label_new(_(Remind me again after the specified time:));
-gtk_box_pack_end(GTK_BOX(vbReminder), e_label, FALSE, FALSE, 5);
-#endif
-
/* ACTION AREA */
daaReminder = GTK_DIALOG(wReminder)-action_area;
gtk_dialog_set_has_separator(GTK_DIALOG(wReminder), FALSE);
@@ -774,7 +769,11 @@ static void create_orage_reminder(alarm_struct *alarm)
btRecreateReminder = gtk_button_new_from_stock(gtk-execute);
#if GTK_CHECK_VERSION(2,16,0)
gtk_widget_set_tooltip_text(btRecreateReminder
-, _(Remind me again after the specified time:));
+, _(Remind me again after the specified time));
+#else
+/* Note that this goes to the main area. Temporary for the version */
+e_label = gtk_label_new(_(Press Execute to remind me again after the
specified time:));
+gtk_box_pack_end(GTK_BOX(vbReminder), e_label, FALSE, FALSE, 5);
#endif
gtk_dialog_add_action_widget(GTK_DIALOG(wReminder)
, btRecreateReminder, GTK_RESPONSE_OK);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:jeromeg/settings-editor No need to check for locked property in reset function.
Updating branch refs/heads/jeromeg/settings-editor
to 20c905367bd298fd02144101c76ee8a88b7058e7 (commit)
from cc2ac5a32a591d1aa3e7d613ed0fadbe647d546a (commit)
commit 20c905367bd298fd02144101c76ee8a88b7058e7
Author: Jérôme Guelfucci jero...@xfce.org
Date: Mon Dec 21 11:34:50 2009 +0100
No need to check for locked property in reset function.
xfce4-settings-editor/main_window.c | 40 --
1 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/xfce4-settings-editor/main_window.c
b/xfce4-settings-editor/main_window.c
index cb065f6..d293067 100644
--- a/xfce4-settings-editor/main_window.c
+++ b/xfce4-settings-editor/main_window.c
@@ -686,33 +686,21 @@ cb_property_revert_button_clicked (GtkButton *button,
gpointer user_data)
GObject *property_treeview;
GtkTreeModel *tree_store = NULL;
-if (xfconf_channel_is_property_locked (current_channel, current_property))
-{
-dialog = gtk_message_dialog_new_with_markup (
- GTK_WINDOW (gtk_builder_get_object
(builder, main_window)),
- 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
- _(Property \b%s/b\ cannot be reset
because it is locked),
- current_property);
-gtk_dialog_run (GTK_DIALOG(dialog));
-gtk_widget_destroy (dialog);
-}
-else
+dialog = gtk_message_dialog_new_with_markup (
+ GTK_WINDOW (gtk_builder_get_object (builder,
main_window)),
+ 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO,
+ _(Are you sure you want to reset property
\b%s/b\?),
+ current_property);
+
+if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_YES)
{
-dialog = gtk_message_dialog_new_with_markup (
- GTK_WINDOW (gtk_builder_get_object
(builder, main_window)),
- 0, GTK_MESSAGE_WARNING,
GTK_BUTTONS_YES_NO,
- _(Are you sure you want to reset
property \b%s/b\?),
- current_property);
-if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_YES)
-{
-property_treeview = gtk_builder_get_object (builder,
property_treeview);
-tree_store = gtk_tree_view_get_model (GTK_TREE_VIEW
(property_treeview));
-gtk_widget_hide (dialog);
-xfconf_channel_reset_property (current_channel, current_property,
FALSE);
-gtk_tree_store_clear (GTK_TREE_STORE(tree_store));
-load_properties (current_channel, GTK_TREE_STORE (tree_store),
GTK_TREE_VIEW (property_treeview));
-}
-gtk_widget_destroy (dialog);
+property_treeview = gtk_builder_get_object (builder,
property_treeview);
+tree_store = gtk_tree_view_get_model (GTK_TREE_VIEW
(property_treeview));
+gtk_widget_hide (dialog);
+xfconf_channel_reset_property (current_channel, current_property,
FALSE);
+gtk_tree_store_clear (GTK_TREE_STORE(tree_store));
+load_properties (current_channel, GTK_TREE_STORE (tree_store),
GTK_TREE_VIEW (property_treeview));
}
+gtk_widget_destroy (dialog);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:jeromeg/settings-editor Remember the size and layout of the editor window.
Updating branch refs/heads/jeromeg/settings-editor
to e1ddb79f30fbe1ee07a7b80315dd489218199552 (commit)
from 20c905367bd298fd02144101c76ee8a88b7058e7 (commit)
commit e1ddb79f30fbe1ee07a7b80315dd489218199552
Author: Jérôme Guelfucci jero...@xfce.org
Date: Mon Dec 21 14:29:27 2009 +0100
Remember the size and layout of the editor window.
xfce4-settings-editor/main.c |2 -
xfce4-settings-editor/main_window.c | 40 +
xfce4-settings-editor/xfce4-settings-editor.glade |5 +--
3 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/xfce4-settings-editor/main.c b/xfce4-settings-editor/main.c
index c1971d0..8c6dcab 100644
--- a/xfce4-settings-editor/main.c
+++ b/xfce4-settings-editor/main.c
@@ -100,8 +100,6 @@ main(gint argc, gchar **argv)
gtk_dialog_run (dialog);
-gtk_widget_destroy (GTK_WIDGET (dialog));
-
/* shutdown xfconf */
xfconf_shutdown ();
diff --git a/xfce4-settings-editor/main_window.c
b/xfce4-settings-editor/main_window.c
index d293067..f201186 100644
--- a/xfce4-settings-editor/main_window.c
+++ b/xfce4-settings-editor/main_window.c
@@ -36,6 +36,10 @@
#include xfce4-settings-editor_ui.h
#include main_window.h
+#define WINDOW_WIDTH 600
+#define WINDOW_HEIGHT 380
+#define HPANED_POSITION 200
+
static GtkBuilder *builder = NULL;
static XfconfChannel *current_channel = NULL;
static gchar *current_property = NULL;
@@ -70,15 +74,20 @@ static void
cb_property_edit_button_clicked (GtkButton *button, gpointer user_data);
static void
cb_property_revert_button_clicked (GtkButton *button, gpointer user_data);
+static void
+xfce_settings_editor_dialog_response (GtkWidget *dialog, gint response,
gpointer user_data);
GtkDialog *
xfce4_settings_editor_main_window_new(void)
{
+gint width, height, position;
GObject *dialog;
GObject *channel_treeview;
GObject *property_treeview;
+GObject *hpaned;
+XfconfChannel *channel;
GtkListStore *channel_list_store;
GtkTreeStore *property_tree_store;
GtkCellRenderer *renderer;
@@ -101,6 +110,19 @@ xfce4_settings_editor_main_window_new(void)
{
dialog = gtk_builder_get_object (builder, main_dialog);
}
+
+hpaned = gtk_builder_get_object (builder, hpaned2);
+
+/* Set the default size of the window */
+channel = xfconf_channel_get (xfce4-settings-editor);
+width = xfconf_channel_get_int (channel, /window-width, WINDOW_WIDTH);
+height = xfconf_channel_get_int (channel, /window-height, WINDOW_HEIGHT);
+position = xfconf_channel_get_int (channel, /hpaned-position,
HPANED_POSITION);
+gtk_window_set_default_size (GTK_WINDOW (dialog), width, height);
+gtk_paned_set_position (GTK_PANED (hpaned), position);
+
+g_signal_connect (dialog, response, G_CALLBACK
(xfce_settings_editor_dialog_response), NULL);
+
channel_treeview = gtk_builder_get_object (builder, channel_treeview);
property_treeview = gtk_builder_get_object (builder, property_treeview);
@@ -704,3 +726,21 @@ cb_property_revert_button_clicked (GtkButton *button,
gpointer user_data)
gtk_widget_destroy (dialog);
}
+
+static void
+xfce_settings_editor_dialog_response (GtkWidget *dialog, gint response,
gpointer user_data)
+{
+XfconfChannel *channel;
+gint width, height;
+GObject *hpaned;
+
+hpaned = gtk_builder_get_object (builder, hpaned2);
+
+channel = xfconf_channel_get (xfce4-settings-editor);
+gtk_window_get_size (GTK_WINDOW (dialog), width, height);
+xfconf_channel_set_int (channel, /window-width, width);
+xfconf_channel_set_int (channel, /window-height, height);
+xfconf_channel_set_int (channel, /hpaned-position,
gtk_paned_get_position (GTK_PANED (hpaned)));
+
+gtk_widget_destroy (dialog);
+}
diff --git a/xfce4-settings-editor/xfce4-settings-editor.glade
b/xfce4-settings-editor/xfce4-settings-editor.glade
index 46763db..a552131 100644
--- a/xfce4-settings-editor/xfce4-settings-editor.glade
+++ b/xfce4-settings-editor/xfce4-settings-editor.glade
@@ -244,8 +244,6 @@
/action-widgets
/object
object class=XfceTitledDialog id=main_dialog
-property name=width_request600/property
-property name=height_request380/property
property name=title translatable=yesSettings Editor/property
property name=icon_namepreferences-system/property
property name=type_hintnormal/property
@@ -265,7 +263,6 @@
object class=GtkHPaned id=hpaned2
property name=visibleTrue/property
property name=can_focusTrue/property
-property name=position200/property
property name=position_setTrue/property
child
object class=GtkScrolledWindow id=scrolledwindow3
@@ -406,7 +403,7 @@
/object
/child
action-widgets
- action-widget response=0button1/action-widget
+ action-widget
[Xfce4-commits] xfdesktop:master Add missing file to POTFILES.skip.
Updating branch refs/heads/master to dac9f4d258f5b5738175586e6167c56d5d26a671 (commit) from 718f3dc56f78020eef492fa26b180310e77ed25a (commit) commit dac9f4d258f5b5738175586e6167c56d5d26a671 Author: Nick Schermer n...@xfce.org Date: Mon Dec 21 16:10:39 2009 +0100 Add missing file to POTFILES.skip. The file does not contain translatable strings that are useful for the interface (only gobject property names). po/POTFILES.skip |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 142e14b..b303d89 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -2,3 +2,4 @@ # but shouldn't be included to POT file. src/xfdesktop-clipboard-manager.c +modules/menu/xfdesktop-app-menu-item.c ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Fix two typos from replacing g_file_test with g_access in sokoke
Updating branch refs/heads/master
to 4e25f72768ef5dcebbefccf7281e358dc2c1543b (commit)
from 8f0d632ef5c95f81f5c02078e6969ff4b28273a5 (commit)
commit 4e25f72768ef5dcebbefccf7281e358dc2c1543b
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Dec 21 16:17:35 2009 +0100
Fix two typos from replacing g_file_test with g_access in sokoke
midori/sokoke.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/midori/sokoke.c b/midori/sokoke.c
index d6377ac..b734cde 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -1287,7 +1287,7 @@ sokoke_find_config_filename (const gchar* folder,
while ((config_dir = config_dirs[i++]))
{
gchar* path = g_build_filename (config_dir, PACKAGE_NAME, folder,
filename, NULL);
-if (g_access (filename, F_OK) == 0)
+if (g_access (path, F_OK) == 0)
return path;
g_free (path);
}
@@ -1313,7 +1313,7 @@ sokoke_find_data_filename (const gchar* filename)
while ((data_dir = data_dirs[i++]))
{
gchar* path = g_build_filename (data_dir, filename, NULL);
-if (g_access (filename, F_OK) == 0)
+if (g_access (path, F_OK) == 0)
return path;
g_free (path);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Add -d, --diagnostic-dialog command line switch
Updating branch refs/heads/master
to 8f0d632ef5c95f81f5c02078e6969ff4b28273a5 (commit)
from 84109ceb73a258971162d1e96ca01732c9f607e3 (commit)
commit 8f0d632ef5c95f81f5c02078e6969ff4b28273a5
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Dec 21 16:15:41 2009 +0100
Add -d, --diagnostic-dialog command line switch
midori/main.c | 26 ++
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index b05a314..99d9e65 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1217,15 +1217,11 @@ midori_create_diagnostic_dialog (MidoriWebSettings*
settings,
dialog = gtk_message_dialog_new (
NULL, 0, GTK_MESSAGE_WARNING,
-#if HAVE_HILDON
-#if HILDON_CHECK_VERSION (2, 2, 0)
+#ifdef HAVE_HILDON_2_2
GTK_BUTTONS_NONE,
#else
GTK_BUTTONS_OK,
#endif
-#else
-GTK_BUTTONS_OK,
-#endif
_(Midori seems to have crashed the last time it was opened.
If this happened repeatedly, try one of the following options
to solve the problem.));
@@ -1259,8 +1255,7 @@ midori_create_diagnostic_dialog (MidoriWebSettings*
settings,
gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 4);
gtk_widget_show_all (box);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)-vbox), box);
-#if HAVE_HILDON
-#if HILDON_CHECK_VERSION (2, 2, 0)
+#ifdef HAVE_HILDON_2_2
box = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)-vbox), box, TRUE, FALSE,
4);
button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT |
HILDON_SIZE_HALFSCREEN_WIDTH);
@@ -1271,7 +1266,6 @@ midori_create_diagnostic_dialog (MidoriWebSettings*
settings,
gtk_box_pack_start (GTK_BOX (box), button, TRUE, FALSE, 4);
gtk_widget_show_all (box);
#endif
-#endif
if (1)
{
/* GtkLabel can't wrap the text properly. Until some day
@@ -1614,6 +1608,7 @@ main (intargc,
{
gchar* webapp;
gchar* config;
+gboolean diagnostic_dialog;
gboolean run;
gchar* snapshot;
gboolean execute;
@@ -1630,6 +1625,8 @@ main (intargc,
{ config, 'c', 0, G_OPTION_ARG_FILENAME, config,
N_(Use FOLDER as configuration folder), N_(FOLDER) },
#endif
+ { diagnostic-dialog, 'd', 0, G_OPTION_ARG_NONE, diagnostic_dialog,
+ N_(Show a diagnostic dialog), NULL },
{ run, 'r', 0, G_OPTION_ARG_NONE, run,
N_(Run the specified filename as javascript), NULL },
#if WEBKIT_CHECK_VERSION (1, 1, 6)
@@ -2095,15 +2092,20 @@ main (intargc,
/* We test for the presence of a dummy file which is created once
and deleted during normal runtime, but persists in case of a crash. */
katze_assign (config_file, build_config_filename (running));
-if (katze_object_get_boolean (settings, show-crash-dialog)
- g_access (config_file, F_OK) == 0)
+if (g_access (config_file, F_OK) == 0)
+{
+if (katze_object_get_boolean (settings, show-crash-dialog))
+diagnostic_dialog = TRUE;
+}
+else
+g_file_set_contents (config_file, RUNNING, -1, NULL);
+
+if (diagnostic_dialog)
{
GtkWidget* dialog = midori_create_diagnostic_dialog (settings,
_session);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
-else
-g_file_set_contents (config_file, RUNNING, -1, NULL);
g_signal_connect (app, quit, G_CALLBACK (midori_app_quit_cb), NULL);
g_object_set (app, settings, settings,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Fix crasher in sokoke_hostname_from_uri and add additional tests
Updating branch refs/heads/master
to d0e72f5d33e21a584c3708e31e61df29d5d68bda (commit)
from 4e25f72768ef5dcebbefccf7281e358dc2c1543b (commit)
commit d0e72f5d33e21a584c3708e31e61df29d5d68bda
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Dec 21 18:22:57 2009 +0100
Fix crasher in sokoke_hostname_from_uri and add additional tests
midori/sokoke.c |7 +--
tests/magic-uri.c |2 ++
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/midori/sokoke.c b/midori/sokoke.c
index b734cde..643848c 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -380,12 +380,7 @@ sokoke_hostname_from_uri (const gchar* uri,
if (hostname[1] == '/')
hostname += 2;
if ((*path = g_utf8_strchr (hostname, -1, '/')))
-{
-gulong offset = g_utf8_pointer_to_offset (hostname, *path);
-gchar* buffer = g_malloc0 (offset + 1);
-g_utf8_strncpy (buffer, hostname, offset);
-hostname = buffer;
-}
+hostname = g_strndup (hostname, *path - hostname);
else
hostname = g_strdup (hostname);
}
diff --git a/tests/magic-uri.c b/tests/magic-uri.c
index 826ae89..a4e58c9 100644
--- a/tests/magic-uri.c
+++ b/tests/magic-uri.c
@@ -211,6 +211,8 @@ magic_uri_format (void)
http://digilife.bz/wiki/index.php?Pythonの開発手順; },
{ http://die-welt.net/~evgeni/LenovoBatteryLinux/;, NULL },
{ http://wiki.c3sl.ufpr.br/multiseat/index.php/Xephyr_Solution;, NULL },
+ { http://şøñđëřżēıċħęŋđőmæîņĭśŧşũþėŗ.de/char.jpg;, NULL },
+ { http://www.ⓖⓝⓞⓜⓔ.org/;, http://www.gnome.org/; },
};
guint i;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master l10n: Updates to Portuguese (pt) translation
Updating branch refs/heads/master to de638ca4ded3006ba1b9c703651a0f7676eec966 (commit) from e9ef5831c5a127454a18c187218a0d27374c07db (commit) commit de638ca4ded3006ba1b9c703651a0f7676eec966 Author: Sergio Marques smarque...@gmail.com Date: Mon Dec 21 17:47:41 2009 + l10n: Updates to Portuguese (pt) translation Transmitted-via: Transifex (translations.xfce.org) po/pt.po | 59 +++ 1 files changed, 27 insertions(+), 32 deletions(-) diff --git a/po/pt.po b/po/pt.po index 668ac1f..a05723d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5,10 +5,10 @@ # msgid msgstr -Project-Id-Version: tumbler\n +Project-Id-Version: tumbler 0.1.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-08 23:18+0100\n -PO-Revision-Date: 2009-12-01 02:23-\n +POT-Creation-Date: 2009-12-20 10:58+\n +PO-Revision-Date: 2009-12-21 17:48-\n Last-Translator: Sergio Marques smarque...@gmail.com\n Language-Team: \n MIME-Version: 1.0\n @@ -18,7 +18,6 @@ msgstr X-Poedit-Country: PORTUGAL\n #: ../tumblerd/tumbler-cache-service.c:383 -#, c-format msgid Another thumbnail cache service is already running msgstr Outro serviço de miniaturas em cache já está em execução @@ -29,51 +28,49 @@ msgid No thumbnailer available for \%s\ msgstr Não existem miniaturas disponíveis para \%s\ #: ../tumblerd/tumbler-service.c:591 -#, c-format msgid Another generic thumbnailer is already running msgstr Outro serviço genérico de miniaturas já está em execução #: ../tumblerd/tumbler-specialized-thumbnailer.c:461 -#, fuzzy msgid Failed to call the specialized thumbnailer: timeout -msgstr Falha ao carregar as miniaturas especializadas no registo: %s +msgstr Falha ao invocar a miniatura: tempo de espera excedido #: ../tumblerd/tumbler-specialized-thumbnailer.c:470 -#, fuzzy, c-format +#, c-format msgid Failed to call the specialized thumbnailer: %s -msgstr Falha ao carregar as miniaturas especializadas no registo: %s +msgstr Falha ao invocar a miniatura: %s -#: ../tumblerd/tumbler-manager.c:467 ../tumblerd/tumbler-manager.c:873 -#, fuzzy, c-format +#: ../tumblerd/tumbler-manager.c:467 +#: ../tumblerd/tumbler-manager.c:873 +#, c-format msgid Failed to load the file \%s\: %s -msgstr Falha ao carregar o plugin \%s\: %s +msgstr Falha ao carregar o ficheiro \%s\: %s -#: ../tumblerd/tumbler-manager.c:485 ../tumblerd/tumbler-manager.c:499 +#: ../tumblerd/tumbler-manager.c:485 +#: ../tumblerd/tumbler-manager.c:499 #: ../tumblerd/tumbler-manager.c:513 #, c-format msgid Malformed section \%s\ in file \%s\: %s -msgstr +msgstr Secção inválida \%s\ no ficheiro \%s\: %s #: ../tumblerd/tumbler-manager.c:526 #, c-format -msgid -Malformed section \%s\ in file \%s\: Mismatch between section name and -UriScheme/MimeType -msgstr +msgid Malformed section \%s\ in file \%s\: Mismatch between section name and UriScheme/MimeType +msgstr Secção inválida \%s\ no ficheiro \%s\: Diferenças entre o nome da secção e o esquema Uri/Tipo mime -#: ../tumblerd/tumbler-manager.c:886 ../tumblerd/tumbler-manager.c:900 +#: ../tumblerd/tumbler-manager.c:886 +#: ../tumblerd/tumbler-manager.c:900 #: ../tumblerd/tumbler-manager.c:914 #, c-format msgid Malformed file \%s\: %s -msgstr +msgstr Ficheiro inválido \%s\: %s #: ../tumblerd/tumbler-manager.c:940 #, c-format msgid Failed to determine last modified time of \%s\ -msgstr +msgstr Falha ao detectar a data de modificação de \%s\ #: ../tumblerd/tumbler-manager.c:1849 -#, c-format msgid Another thumbnailer manager is already running msgstr Outro gestor de miniaturas já está em execução @@ -117,17 +114,17 @@ msgstr PNG #: ../tumbler/tumbler-enum-types.c:71 msgid RGB Colorspace -msgstr +msgstr Espaço de cores RGB #: ../tumbler/tumbler-cache-plugin.c:145 -#, fuzzy, c-format +#, c-format msgid Cache plugin \%s\ lacks required symbols -msgstr O plugin \%s\ tem em falta os símbolos necessários. +msgstr O plugin \%s\ tem em falta os símbolos necessários #: ../tumbler/tumbler-cache-plugin.c:153 -#, fuzzy, c-format +#, c-format msgid Failed to load the cache plugin \%s\: %s -msgstr Falha ao carregar o plugin \%s\: %s +msgstr Falha ao carregar o plugin de cache \%s\: %s #: ../tumbler/tumbler-file-info.c:296 #, c-format @@ -164,7 +161,7 @@ msgstr Desligando o plugin Tumbler Pixbuf Thumbnailer #: ../plugins/font-thumbnailer/font-thumbnailer-plugin.c:62 msgid Initializing the Tumbler Font Thumbnailer plugin -msgstr inicializando o plugin Tumbler Font Thumbnailer +msgstr Inicializando o plugin Tumbler Font Thumbnailer #: ../plugins/font-thumbnailer/font-thumbnailer-plugin.c:79 msgid Shutting down the Tumbler Font Thumbnailer plugin @@ -202,9 +199,8 @@ msgstr Não foi possivel renderizar glyphs: %s #: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:753 #: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:791 -#, c-format msgid Thumbnail could not be inferred from file contents
[Xfce4-commits] xfce4-vala:xfce-dev Deleting branch xfce-dev
Deleting branch refs/heads/xfce-dev ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-vfs:master l10n: Updates to Portuguese (pt) translation
Updating branch refs/heads/master to ac2d7e6a0d4b4833db402b44b94138e7014fdfb4 (commit) from 51be4aa7025f0fd53e0c41df3aeaeff3a68c36bb (commit) commit ac2d7e6a0d4b4833db402b44b94138e7014fdfb4 Author: Sergio Marques smarque...@gmail.com Date: Mon Dec 21 18:36:02 2009 + l10n: Updates to Portuguese (pt) translation Transmitted-via: Transifex (translations.xfce.org) po/pt.po | 79 ++--- 1 files changed, 34 insertions(+), 45 deletions(-) diff --git a/po/pt.po b/po/pt.po index 5c285ab..8018bbb 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5,63 +5,59 @@ # msgid msgstr -Project-Id-Version: Thunar 0.9.0\n +Project-Id-Version: thunar-vfs\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-12-18 21:01+0100\n -PO-Revision-Date: 2009-04-12 17:14+0100\n -Last-Translator: Nuno Miguel nu...@netcabo.pt\n +POT-Creation-Date: 2009-12-18 20:02+\n +PO-Revision-Date: 2009-12-21 18:37-\n +Last-Translator: Sergio Marques smarque...@gmail.com\n Language-Team: xfce-i...@xfce.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n Plural-Forms: nplurals=2; plural=(n != 1);\n +X-Poedit-Language: Portuguese\n +X-Poedit-Country: PORTUGAL\n -#: ../thunar-vfs/exo-mount-point.c:218 ../thunar-vfs/exo-mount-point.c:247 +#: ../thunar-vfs/exo-mount-point.c:218 +#: ../thunar-vfs/exo-mount-point.c:247 #: ../thunar-vfs/exo-mount-point.c:435 -#, fuzzy, c-format +#, c-format msgid Failed to open file \%s\: %s -msgstr Falha ao abrir ficheiro \%s\ +msgstr Falha ao abrir o ficheiro \%s\: %s #. base directory not readable #: ../thunar-vfs/thunar-vfs-deep-count-job.c:233 -#, c-format msgid Failed to read folder contents msgstr Falha ao ler o conteúdo da pasta #: ../thunar-vfs/thunar-vfs-exec.c:590 -#, c-format msgid Unknown error msgstr Erro desconhecido #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is. #: ../thunar-vfs/thunar-vfs-info.c:390 -#, c-format msgid No Exec field specified msgstr Nenhum campo Exec especificado #. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is. #: ../thunar-vfs/thunar-vfs-info.c:409 -#, c-format msgid No URL field specified msgstr Nenhum campo URL especificado -#: ../thunar-vfs/thunar-vfs-info.c:414 ../thunar-vfs/thunar-vfs-private.c:384 -#, c-format +#: ../thunar-vfs/thunar-vfs-info.c:414 +#: ../thunar-vfs/thunar-vfs-private.c:384 msgid Invalid desktop file msgstr Ficheiro de ambiente de trabalho inválido #: ../thunar-vfs/thunar-vfs-info.c:422 -#, c-format msgid Failed to parse file -msgstr Falhou ao interpretar o ficheiro +msgstr Falhou ao analisar o ficheiro #: ../thunar-vfs/thunar-vfs-info.c:503 -#, c-format msgid Invalid file name msgstr Nome de ficheiro inválido #: ../thunar-vfs/thunar-vfs-info.c:510 -#, c-format msgid Only local files may be renamed msgstr Apenas ficheiros locais podem ser renomeados @@ -74,17 +70,17 @@ msgstr Preparando... #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:542 #, c-format msgid Failed to change permissions of \%s\ -msgstr Falhou ao trocar permissões de \%s\ +msgstr Falha ao mudar as permissões de \%s\ #: ../thunar-vfs/thunar-vfs-io-jobs.c:355 #, c-format msgid Failed to change file owner of \%s\ -msgstr Falhou ao trocar o dono de \%s\ +msgstr Falha ao mudar o dono de \%s\ #: ../thunar-vfs/thunar-vfs-io-jobs.c:356 #, c-format msgid Failed to change file group of \%s\ -msgstr Falhou ao trocar o grupo de \%s\ +msgstr Falha ao mudar o grupo de \%s\ #: ../thunar-vfs/thunar-vfs-io-jobs.c:448 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:190 @@ -95,37 +91,37 @@ msgstr O ficheiro \%s\ já existe #: ../thunar-vfs/thunar-vfs-io-jobs.c:466 #, c-format msgid Failed to create empty file \%s\ -msgstr Falhou ao criar ficheiro vazio \%s\ +msgstr Falha ao criar o ficheiro vazio \%s\ #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:165 #, c-format msgid Failed to open \%s\ for reading -msgstr Falhou ao abrir \%s\ para leitura +msgstr Falha ao abrir \%s\ para leitura #. use the generic error message #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:196 #: ../thunar-vfs/thunar-vfs-io-trash.c:805 #, c-format msgid Failed to open \%s\ for writing -msgstr Falhou ao abrir \%s\ para escrita +msgstr Falha ao abrir \%s\ para escrita #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:223 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:291 #, c-format msgid Failed to write data to \%s\ -msgstr Falhou ao escrever dados em \%s\ +msgstr Falha ao escrever dados em \%s\ #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:239 #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:307 #: ../thunar-vfs/thunar-vfs-io-ops.c:496 #, c-format msgid Failed to remove \%s\ -msgstr Falhou ao apagar \%s\ +msgstr Falha ao remover \%s\ #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:274 #, c-format msgid Failed to read data from \%s\ -msgstr Falha ao ler dados de
[Xfce4-commits] libxfce4util:master Remove LINGUAS and ChangeLog.
Updating branch refs/heads/master to 3b8449fdd0bd66cf33a64e5693f39c1ee2fff352 (commit) from ddfa8e390cfa7856bf60de0645e285a7e14ffd76 (commit) commit 3b8449fdd0bd66cf33a64e5693f39c1ee2fff352 Author: Nick Schermer n...@xfce.org Date: Mon Dec 21 22:35:07 2009 +0100 Remove LINGUAS and ChangeLog. po/ChangeLog | 410 -- po/LINGUAS |2 - 2 files changed, 0 insertions(+), 412 deletions(-) diff --git a/po/ChangeLog b/po/ChangeLog deleted file mode 100644 index 5edb789..000 --- a/po/ChangeLog +++ /dev/null @@ -1,410 +0,0 @@ -2009-08-08 Mike Massonnet mmasson...@xfce.org - - * gl.po: Galician translation update (Leandro Regueiro) - -2009-07-25 Gabor Kelemen kelem...@gnome.hu - - * hu.po: Translation updated. - -2009-07-09 Mike Massonnet mmasson...@xfce.org - - * ast.po: Asturian translation added (Marcos). - -2009-06-15 Mike Massonnet mmasson...@xfce.org - - * zh_CN.po: Simplified Chinese update (Hunt Xu) - -2009-06-13 Gabor Kelemen kelem...@gnome.hu - - * hu.po: Translation added - * LINGUAS: hu added - -2009-05-29 Mike Massonnet mmasson...@xfce.org - - * ur_PK.po: Urdu Pakistan translation update (Muhammad Ali Makki) - * ur.po: Urdu translation update (Muhammad Ali Makki) - -2009-05-11 Mike Massonnet mmasson...@xfce.org - - * lv.po: Latvian translation update (Rihards Prieditis) - -2009-04-20 Mike Massonnet mmasson...@xfce.org - - * tl_PH.po: Add Tagalog translation (Ian Besina) - -2009-04-16 Mike Massonnet mmasson...@xfce.org - - * gl.po: Galician translation update (Leandro Regueiro) - -2009-03-29 Maximilian Schleiss maximil...@xfce.org - - * es.po: Spanish translation update (Abel Martín) - -2009-03-29 Maximilian Schleiss maximil...@xfce.org - - * es.po: Spanish translation update (Abel Martín) - -2009-03-19 Masato Hashimoto cabezon.hashim...@gmail.com - - * ja.po: Japanese translation update (Masato Hashimoto) - -2009-03-14 Maximilian Schleiss maximil...@xfce.org - - * gl.po: Galician translation update (Leandro Regueiro) - -2009-03-05 Mike Massonnet mmasson...@xfce.org - - * pt.po: Renamed pt_PT.po to pt.po (bug #4574) - * nb.po: Renamed nb_NO.po to nb.po (bug #4574) - -2009-03-03 Maximilian Schleiss maximil...@xfce.org - - * sl.po; lINGUAS: Slovenian translation added (Alan Pepelko) - -2009-03-01 Maximilian Schleiss maximil...@xfce.org - - * es.po: Spanish translation update (Abel Martín) - * pl.po: Polish translation update (Piotr Sokół) - -2009-02-22 Mike Massonnet mmasson...@xfce.org - - * ja.po: Update Japanese translation (Masato Hashimoto) - * ro.po: Update Romanian translation (Mișu Moldovan) - -2009-02-20 Maximilian Schleiss maximil...@xfce.org - - * gl.po: Galician translation update (Leandro Regueiro) - * pt_PT.po: European Portuguese translation update (Nuno Miguel) - * zh_CN, LINGUAS: Simplified Chinese translation added (Chris K. Zhang) - -2009-02-13 Og Maciel ogmac...@gnome.org - - * pt_BR.po: Updated Brazilian Portuguese translation. - * POTFILES.in: Added missing entries. - -2009-02-09 Alexander Toresson eu...@xfce.org - - * sv.po: Swedish translation update (Daniel Nylander) - -2009-02-07 Maximilian Schleiss maximil...@xfce.org - - * de.po: German translation update (Enrico Tröger) - * id.po: Indonesian translation update (Andhika Padmawan) - -2009-02-03 Maximilian Schleiss maximil...@xfce.org - - * en_GB.po: British English translation update (Jeff Bailes) - * es.po: Spanish translation update (Abel Martín) - -2009-01-31 Eren Türkay erentur...@xfce.org - - * tr.po: Turkish translation update (Gökmen Görgen, Samed Beyribey) - -2009-01-26 Maximilian Schleiss maximil...@xfce.org - - * ca.po: Catalan translation update (Carles Muñoz Gorriz) - * fr.po: French translation update - * uk.po: Ukrainian translation udpate (Dmitry Nikitin) - -2009-01-25 Og Maciel ogmac...@gnome.org - - * pt_BR.po: Updated Brazilian Portuguese translation. - -2009-01-25 Jari Rahkonen jari.rahko...@pp1.inet.fi - - * fi.po: Update Finnish translation. - -2009-01-24 Per Kongstad p...@xfce.org - - * da.po: Danish translation update 4.5.93 (Per Kongstad) - -2009-01-23 Michal Várady miko.v...@gmail.com - - * cs.po: Czech translation updated - -2009-01-22 Per Kongstad p...@xfce.org - - * da.po: Danish translation update (Per Kongstad) - -2009-01-18 Maximilian Schleiss maximil...@xfce.org - - * ja.po: Japanese translation update (Masato Hashimoto) - -2009-01-18 Alexander Toresson eu...@xfce.org - - * sv.po: Swedish translation update (Daniel Nylander) - -2009-01-11 Maximilian Schleiss maximil...@xfce.org - - * es.po: Spanish translation update (Abel Martín) - -2009-01-11 Lars Nielsen l...@mit-web.dk - - * da.po: Danish translation
[Xfce4-commits] midori:master Declare fd_recv early at the top of socket.c
Updating branch refs/heads/master
to 613979a57906693099948f61c7ee295680a410df (commit)
from d0e72f5d33e21a584c3708e31e61df29d5d68bda (commit)
commit 613979a57906693099948f61c7ee295680a410df
Author: Alexander Butenko a.bute...@gmail.com
Date: Mon Dec 21 23:22:04 2009 +0100
Declare fd_recv early at the top of socket.c
midori/socket.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/midori/socket.c b/midori/socket.c
index a572993..2971834 100644
--- a/midori/socket.c
+++ b/midori/socket.c
@@ -142,6 +142,11 @@ GSourceFuncs sock_watch_funcs = {
NULL
};
+gint fd_recv (gintfd,
+gchar *buf,
+gintlen,
+gintflags);
+
#ifdef G_OS_WIN32
static SockInfo *sock_find_from_fd (gint fd);
#endif
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Don't use g_access, use the return value of g_file_get_contents
Updating branch refs/heads/master to dc288dd3c35136e9c301919f52b1249eb8629b8d (commit) from 613979a57906693099948f61c7ee295680a410df (commit) commit dc288dd3c35136e9c301919f52b1249eb8629b8d Author: Alexander Butenko a.bute...@gmail.com Date: Mon Dec 21 23:24:27 2009 +0100 Don't use g_access, use the return value of g_file_get_contents extensions/formhistory.c | 10 -- 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/extensions/formhistory.c b/extensions/formhistory.c index 334237e..fbf0577 100644 --- a/extensions/formhistory.c +++ b/extensions/formhistory.c @@ -37,16 +37,14 @@ formhistory_prepare_js () gchar* file; gchar* data_path = g_build_filename (MDATADIR, PACKAGE_NAME, res, NULL); - file = g_build_filename (data_path,/autosuggestcontrol.js,NULL); - if (g_access (file, F_OK) != 0) + file = g_build_filename (data_path, G_DIR_SEPARATOR_S, autosuggestcontrol.js,NULL); + if (!g_file_get_contents (file, autosuggest, NULL, NULL)) return FALSE; - g_file_get_contents (file, autosuggest, NULL, NULL); g_strchomp (autosuggest); - file = g_build_filename (data_path,/autosuggestcontrol.css,NULL); - if (g_access (file, F_OK) != 0) + file = g_build_filename (data_path, G_DIR_SEPARATOR_S, autosuggestcontrol.css,NULL); + if(!g_file_get_contents (file, style, NULL, NULL)) return FALSE; - g_file_get_contents (file, style, NULL, NULL); g_strchomp (style); i = 0; while (style[i]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Only monitor actually existing user script/ style folders
Updating branch refs/heads/master
to eddb3ef55773d20865cf6d5c67232ab9b499517d (commit)
from dc288dd3c35136e9c301919f52b1249eb8629b8d (commit)
commit eddb3ef55773d20865cf6d5c67232ab9b499517d
Author: Alexander Butenko a.bute...@gmail.com
Date: Mon Dec 21 23:36:22 2009 +0100
Only monitor actually existing user script/ style folders
panels/midori-addons.c | 15 +--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/panels/midori-addons.c b/panels/midori-addons.c
index efeec63..091e590 100644
--- a/panels/midori-addons.c
+++ b/panels/midori-addons.c
@@ -22,9 +22,14 @@
#include webkit/webkit.h
#include JavaScriptCore/JavaScript.h
#include glib/gi18n.h
+#include glib/gstdio.h
#include string.h
#include gio/gio.h
+#if HAVE_UNISTD_H
+#include unistd.h
+#endif
+
struct _MidoriAddons
{
GtkVBox parent_instance;
@@ -212,14 +217,20 @@ _addons_get_directories (MidoriAddons* addons)
{
path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
PACKAGE_NAME, folders[i], NULL);
-directories = g_slist_prepend (directories, path);
+if (g_access (path, X_OK) == 0)
+directories = g_slist_prepend (directories, path);
+else
+g_free (path);
datadirs = g_get_system_data_dirs ();
while (*datadirs)
{
path = g_build_path (G_DIR_SEPARATOR_S, *datadirs,
PACKAGE_NAME, folders[i], NULL);
-directories = g_slist_prepend (directories, path);
+if (g_access (path, X_OK) == 0)
+directories = g_slist_prepend (directories, path);
+else
+g_free (path);
datadirs++;
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master No need to g_access when checking cached file, fopen is enough
Updating branch refs/heads/master
to 61266c26ecda1d5e61dc93b080339f04b2febcae (commit)
from eddb3ef55773d20865cf6d5c67232ab9b499517d (commit)
commit 61266c26ecda1d5e61dc93b080339f04b2febcae
Author: Alexander Butenko a.bute...@gmail.com
Date: Mon Dec 21 23:48:51 2009 +0100
No need to g_access when checking cached file, fopen is enough
extensions/web-cache.c | 18 +++---
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/extensions/web-cache.c b/extensions/web-cache.c
index 7a07e8a..7a43bec 100644
--- a/extensions/web-cache.c
+++ b/extensions/web-cache.c
@@ -92,12 +92,6 @@ web_cache_get_headers (gchar* filename)
return NULL;
dsc_filename = g_strdup_printf (%s.dsc, filename);
-if (g_access (dsc_filename, R_OK) != 0)
-{
-g_free (dsc_filename);
-return NULL;
-}
-
headers = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify)g_free,
(GDestroyNotify)g_free);
@@ -107,10 +101,12 @@ web_cache_get_headers (gchar* filename)
gchar line[128];
while (fgets (line, 128, file))
{
+gchar** data;
+
if (line == NULL)
continue;
+
g_strchomp (line);
-gchar** data;
data = g_strsplit (line, :, 2);
if (data[0] data[1])
g_hash_table_insert (headers, g_strdup (data[0]),
@@ -118,12 +114,12 @@ web_cache_get_headers (gchar* filename)
g_strfreev (data);
}
fclose (file);
+g_free (dsc_filename);
+return headers;
}
-else
-g_hash_table_destroy (headers);
-
+g_hash_table_destroy (headers);
g_free (dsc_filename);
-return headers;
+return NULL;
}
static gboolean
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Don't test file existence in adblock, katze_mkdir and check download status
Updating branch refs/heads/master
to 1c424106f10f7bf8783bc3e4889654b43d5509b6 (commit)
from 61266c26ecda1d5e61dc93b080339f04b2febcae (commit)
commit 1c424106f10f7bf8783bc3e4889654b43d5509b6
Author: Alexander Butenko a.bute...@gmail.com
Date: Mon Dec 21 23:57:31 2009 +0100
Don't test file existence in adblock, katze_mkdir and check download status
It is enough to see if g_fopen fails, thus we don't need g_access
to test file existence additionally.
katze_mkdir_with_parents is optimized for existing folders.
We need to check the status, to see if file downloads are finished.
For Windows, we need to use g_strndup instead of strndup.
extensions/adblock.c | 47 +--
1 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/extensions/adblock.c b/extensions/adblock.c
index 18bd1b0..f1c36c2 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -34,7 +34,7 @@ static gchar* blockcss = NULL;
static gchar* blockcssprivate = NULL;
static gchar* blockscript = NULL;
-static void
+static gboolean
adblock_parse_file (gchar* path);
static gchar*
@@ -90,8 +90,9 @@ adblock_download_notify_status_cb (WebKitDownload* download,
GParamSpec* pspec,
gchar* path)
{
-if (g_access (path, F_OK) != 0)
- return;
+if (webkit_download_get_status (download) !=
WEBKIT_DOWNLOAD_STATUS_FINISHED)
+return;
+
adblock_parse_file (path);
g_free (path);
/* g_object_unref (download); */
@@ -104,13 +105,14 @@ adblock_reload_rules (MidoriExtension* extension)
gchar* folder;
guint i = 0;
filters = midori_extension_get_string_list (extension, filters, NULL);
-folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME,
- adblock, NULL);
-g_mkdir_with_parents (folder, 0700);
if (!filters)
return;
+folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME,
+ adblock, NULL);
+katze_mkdir_with_parents (folder, 0700);
+
adblock_init_db ();
while (filters[i++] != NULL)
@@ -118,7 +120,7 @@ adblock_reload_rules (MidoriExtension* extension)
gchar* filename = g_compute_checksum_for_string (G_CHECKSUM_MD5,
filters[i - 1], -1);
gchar* path = g_build_filename (folder, filename, NULL);
-if (g_access (path, F_OK) != 0)
+if (!adblock_parse_file (path))
{
WebKitNetworkRequest* request;
WebKitDownload* download;
@@ -133,10 +135,7 @@ adblock_reload_rules (MidoriExtension* extension)
webkit_download_start (download);
}
else
-{
-adblock_parse_file (path);
g_free (path);
-}
g_free (filename);
}
katze_assign (blockscript, adblock_build_js (blockcss, blockcssprivate));
@@ -573,24 +572,23 @@ adblock_is_matched_by_key (const gchar* opts,
const gchar* req_uri,
const gchar* page_uri)
{
-int pos = 0;
-gchar *sig = NULL;
-GRegex* regex;
gchar* uri;
+gint len;
+int pos = 0;
uri = adblock_fixup_regexp ((gchar*)req_uri);
-
-int len = strlen (uri);
-for (pos = len - SIGNATURE_SIZE; pos = 0; pos--) {
-sig = strndup (uri+pos, SIGNATURE_SIZE);
-regex = g_hash_table_lookup (keys, sig);
+len = strlen (uri);
+for (pos = len - SIGNATURE_SIZE; pos = 0; pos--)
+{
+gchar* sig = g_strndup (uri + pos, SIGNATURE_SIZE);
+GRegex* regex = g_hash_table_lookup (keys, sig);
if (regex)
{
if (g_regex_match_full (regex, req_uri, -1, 0, 0, NULL, NULL))
{
g_free (uri);
g_free (sig);
-if (opts adblock_check_filter_options (regex, opts,
req_uri, page_uri) == TRUE)
+if (opts adblock_check_filter_options (regex, opts,
req_uri, page_uri))
return FALSE;
else
{
@@ -1001,23 +999,20 @@ adblock_parse_line (gchar* line)
return adblock_add_url_pattern (%s, uri, line);
}
-static void
+static gboolean
adblock_parse_file (gchar* path)
{
FILE* file;
gchar line[500];
-gchar *out;
if ((file = g_fopen (path, r)))
{
while (fgets (line, 500, file))
-{
-out = adblock_parse_line (line);
-if (out)
-g_free (out);
-}
+g_free (adblock_parse_line (line));
fclose (file);
+return TRUE;
}
+return FALSE;
}
static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Initialize diagnostic_dialog to FALSE by default
Updating branch refs/heads/master to cec6b310445c70b4c6fbe1d5b8fc268252d71e80 (commit) from 9ab1040e5fb61a6d1a5597f3c6aca725f885cfe5 (commit) commit cec6b310445c70b4c6fbe1d5b8fc268252d71e80 Author: Christian Dywan christ...@twotoasts.de Date: Tue Dec 22 01:07:01 2009 +0100 Initialize diagnostic_dialog to FALSE by default midori/main.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/midori/main.c b/midori/main.c index 99d9e65..fdd5edf 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1697,6 +1697,7 @@ main (intargc, /* Parse cli options */ webapp = NULL; config = NULL; +diagnostic_dialog = FALSE; run = FALSE; snapshot = NULL; execute = FALSE; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Don't use titles for adblock styles, WebKit only loads one with a title
Updating branch refs/heads/master
to 9ab1040e5fb61a6d1a5597f3c6aca725f885cfe5 (commit)
from 1c424106f10f7bf8783bc3e4889654b43d5509b6 (commit)
commit 9ab1040e5fb61a6d1a5597f3c6aca725f885cfe5
Author: Alexander Butenko a.bute...@gmail.com
Date: Tue Dec 22 01:05:54 2009 +0100
Don't use titles for adblock styles, WebKit only loads one with a title
extensions/formhistory.c |6 --
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index fbf0577..6ae124e 100644
--- a/extensions/formhistory.c
+++ b/extensions/formhistory.c
@@ -58,15 +58,9 @@ formhistory_prepare_js ()
%s
window.addEventListener ('DOMContentLoaded',
function () {
- var styles = document.getElementsByTagName('style');
- for (i=0; istyles.length; i++) {
- if (styles[i].getAttribute('title') == 'formhistory')
- return;
- }
initSuggestions ();
var mystyle = document.createElement('style');
mystyle.setAttribute('type', 'text/css');
- mystyle.setAttribute('title', 'formhistory');
mystyle.appendChild(document.createTextNode('%s'));
var head = document.getElementsByTagName('head')[0];
if (head) head.appendChild(mystyle);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
