[Xfce4-commits] xfce4-xkb-plugin:master Remove global tree_path variable and plug its leaking.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to d50677feae43bfbbf73164632f82c72dd5bddb13 (commit)
   from 0c62d39ae74560e7e50daba4ab57edc1832d5ad2 (commit)

commit d50677feae43bfbbf73164632f82c72dd5bddb13
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 08:04:10 2011 +0200

Remove global tree_path variable and plug its leaking.

 panel-plugin/xfce4-xkb-plugin.h|1 -
 panel-plugin/xkb-settings-dialog.c |5 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/xfce4-xkb-plugin.h b/panel-plugin/xfce4-xkb-plugin.h
index 9091d37..bf81b63 100644
--- a/panel-plugin/xfce4-xkb-plugin.h
+++ b/panel-plugin/xfce4-xkb-plugin.h
@@ -83,7 +83,6 @@ typedef struct
 GtkTreeIter iter, child;
 GtkTreeModel *model;
 GtkTreeSelection *selection;
-GtkTreePath *tree_path;
 
 /*
  * NOTE: The t_xkb-button_size field is due to xfce panel 4.4.1
diff --git a/panel-plugin/xkb-settings-dialog.c 
b/panel-plugin/xkb-settings-dialog.c
index 28ee9d4..211527b 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -812,6 +812,7 @@ xkb_settings_layout_dialog_run (void)
 
 if (response == GTK_RESPONSE_OK)
 {
+GtkTreePath *tree_path;
 gchar *id;
 gchar *result;
 
@@ -821,7 +822,6 @@ xkb_settings_layout_dialog_run (void)
 return NULL;
 gtk_tree_model_get (model, iter, AVAIL_LAYOUT_TREE_COL_ID, id, -1);
 
-/* TODO: tree_path must be leaked here... */
 tree_path = gtk_tree_model_get_path (model, iter);
 if (gtk_tree_path_get_depth (tree_path) == 1)
 result = g_strconcat(id, ,, NULL);
@@ -832,12 +832,14 @@ xkb_settings_layout_dialog_run (void)
 if (!gtk_tree_path_up(tree_path))
 {
 g_free (id);
+gtk_tree_path_free (tree_path);
 return NULL;
 }
 
 if (!gtk_tree_model_get_iter(model, iter, tree_path))
 {
 g_free (id);
+gtk_tree_path_free (tree_path);
 return NULL;
 }
 
@@ -848,6 +850,7 @@ xkb_settings_layout_dialog_run (void)
 
 gtk_widget_destroy (dialog);
 g_free (id);
+gtk_tree_path_free (tree_path);
 
 return result;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Don't leak tree path when editing a layout.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to fabca18a1aea90347d67a967d0ef56769ea32de7 (commit)
   from ed1c3cd9bcd9998a8b3037bc4040449859b55f2a (commit)

commit fabca18a1aea90347d67a967d0ef56769ea32de7
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 08:17:11 2011 +0200

Don't leak tree path when editing a layout.

 panel-plugin/xkb-settings-dialog.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/panel-plugin/xkb-settings-dialog.c 
b/panel-plugin/xkb-settings-dialog.c
index 0dfbcca..fe4bcc4 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -342,6 +342,7 @@ xkb_settings_edit_layout_btn_show (GtkTreeView *tree_view,
 gtk_tree_view_get_cursor (GTK_TREE_VIEW (tree_view), p, c);
 gtk_widget_set_sensitive (xkb-edit_layout_btn,
 (p != NULL  !xkb-settings-never_modify_config));
+gtk_tree_path_free (p);
 }
 
 static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Remove global selection variable.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to ed1c3cd9bcd9998a8b3037bc4040449859b55f2a (commit)
   from c03240c1d505f5546baf5ed2fe187bb664e74014 (commit)

commit ed1c3cd9bcd9998a8b3037bc4040449859b55f2a
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 08:16:48 2011 +0200

Remove global selection variable.

 panel-plugin/xfce4-xkb-plugin.h|1 -
 panel-plugin/xkb-settings-dialog.c |3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/panel-plugin/xfce4-xkb-plugin.h b/panel-plugin/xfce4-xkb-plugin.h
index ad8528c..eb5c339 100644
--- a/panel-plugin/xfce4-xkb-plugin.h
+++ b/panel-plugin/xfce4-xkb-plugin.h
@@ -81,7 +81,6 @@ typedef struct
 } t_xkb;
 
 GtkTreeIter iter, child;
-GtkTreeSelection *selection;
 
 /*
  * NOTE: The t_xkb-button_size field is due to xfce panel 4.4.1
diff --git a/panel-plugin/xkb-settings-dialog.c 
b/panel-plugin/xkb-settings-dialog.c
index eb95085..0dfbcca 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -356,6 +356,7 @@ xkb_settings_edit_layout (GtkWidget *widget, t_xkb *xkb)
 c = xkb_settings_layout_dialog_run ();
 if (c != NULL)
 {
+GtkTreeSelection *selection;
 gchar **strings;
 
 selection = gtk_tree_view_get_selection (GTK_TREE_VIEW 
(xkb-layout_tree_view));
@@ -402,6 +403,7 @@ xkb_settings_add_layout (GtkWidget *widget, t_xkb *xkb)
 static void
 xkb_settings_rm_layout (GtkWidget *widget, t_xkb *xkb)
 {
+GtkTreeSelection *selection;
 GtkTreeModel *model;
 gboolean is_default;
 
@@ -822,6 +824,7 @@ xkb_settings_layout_dialog_run (void)
 
 if (response == GTK_RESPONSE_OK)
 {
+GtkTreeSelection *selection;
 GtkTreeModel *model;
 GtkTreePath *tree_path;
 gchar *id;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Remove global child variable.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to d76749ac7bbe95b1de8d1d44550419605407dce9 (commit)
   from fabca18a1aea90347d67a967d0ef56769ea32de7 (commit)

commit d76749ac7bbe95b1de8d1d44550419605407dce9
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 08:28:29 2011 +0200

Remove global child variable.

 panel-plugin/xfce4-xkb-plugin.h|2 +-
 panel-plugin/xkb-settings-dialog.c |1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/panel-plugin/xfce4-xkb-plugin.h b/panel-plugin/xfce4-xkb-plugin.h
index eb5c339..4dc2042 100644
--- a/panel-plugin/xfce4-xkb-plugin.h
+++ b/panel-plugin/xfce4-xkb-plugin.h
@@ -80,7 +80,7 @@ typedef struct
 GtkWidget *edit_layout_btn;
 } t_xkb;
 
-GtkTreeIter iter, child;
+GtkTreeIter iter;
 
 /*
  * NOTE: The t_xkb-button_size field is due to xfce panel 4.4.1
diff --git a/panel-plugin/xkb-settings-dialog.c 
b/panel-plugin/xkb-settings-dialog.c
index fe4bcc4..0b14278 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -737,6 +737,7 @@ xkb_settings_add_variant_to_available_layouts_tree 
(XklConfigRegistry * config_r
 XklConfigItem * 
config_item,
 GtkTreeStore *treestore)
 {
+  GtkTreeIter child;
   char *utf_variant_name = xci_desc_to_utf8 (config_item);
 
   gtk_tree_store_append (treestore, child, iter);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Partially remove iter global variable.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to e98c35763c7edc295765ccbf710e276fc56d51f5 (commit)
   from d76749ac7bbe95b1de8d1d44550419605407dce9 (commit)

commit e98c35763c7edc295765ccbf710e276fc56d51f5
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 08:42:50 2011 +0200

Partially remove iter global variable.

We still keep one global variable for creating the layout/variant
dialog, but it's only used in two functions.

 panel-plugin/xfce4-xkb-plugin.h|2 --
 panel-plugin/xkb-settings-dialog.c |   23 +++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/panel-plugin/xfce4-xkb-plugin.h b/panel-plugin/xfce4-xkb-plugin.h
index 4dc2042..12aed1f 100644
--- a/panel-plugin/xfce4-xkb-plugin.h
+++ b/panel-plugin/xfce4-xkb-plugin.h
@@ -80,8 +80,6 @@ typedef struct
 GtkWidget *edit_layout_btn;
 } t_xkb;
 
-GtkTreeIter iter;
-
 /*
  * NOTE: The t_xkb-button_size field is due to xfce panel 4.4.1
  * prior versions, allowing a plugin to resize the whole panel.
diff --git a/panel-plugin/xkb-settings-dialog.c 
b/panel-plugin/xkb-settings-dialog.c
index 0b14278..e56626e 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -39,6 +39,7 @@
 #include xkb-settings-dialog.h
 #include xkb-util.h
 
+GtkTreeIter current_iter;
 GtkWidget *settings_dialog;
 GtkWidget *default_layout_menu;
 
@@ -106,6 +107,7 @@ xci_desc_to_utf8 (XklConfigItem * ci)
 static void
 xkb_settings_fill_layout_tree_model_with_config (t_xkb *xkb)
 {
+GtkTreeIter iter;
 gint layout_nb = 0;
 
 t_xkb_kbd_config *config = xkb-settings-kbd_config;
@@ -133,6 +135,7 @@ xkb_settings_add_toggle_options_to_list (XklConfigRegistry 
* config_registry,
  XklConfigItem * config_item,
  t_xkb *xkb)
 {
+GtkTreeIter iter;
 char *utf_option_name;
 
 /* add a possibility to set no toggle layout combination */
@@ -158,6 +161,7 @@ xkb_settings_add_compose_key_position_options_to_list 
(XklConfigRegistry * confi
  XklConfigItem * 
config_item,
  t_xkb *xkb)
 {
+GtkTreeIter iter;
 char *utf_option_name;
 
 /* add a possibility to set no position for the compose key */
@@ -183,6 +187,7 @@ xkb_settings_add_kbd_model_to_list (XklConfigRegistry * 
config_registry,
 XklConfigItem * config_item,
 t_xkb *xkb)
 {
+GtkTreeIter iter;
 char *utf_model_name = xci_desc_to_utf8 (config_item);
 gtk_list_store_append (xkb-combo_store, iter);
 gtk_list_store_set (xkb-combo_store, iter,
@@ -195,6 +200,7 @@ static void
 xkb_settings_set_toggle_option_combo_default_value (t_xkb *xkb)
 {
 GtkTreeModel *model;
+GtkTreeIter iter;
 gchar *id;
 
 t_xkb_kbd_config *config = xkb-settings-kbd_config;
@@ -238,6 +244,7 @@ static void
 xkb_settings_set_compose_key_position_combo_default_value (t_xkb *xkb)
 {
 GtkTreeModel *model;
+GtkTreeIter iter;
 gchar *id;
 
 t_xkb_kbd_config *config = xkb-settings-kbd_config;
@@ -281,6 +288,7 @@ static void
 xkb_settings_set_kbd_combo_default_value (t_xkb *xkb)
 {
 GtkTreeModel *model;
+GtkTreeIter iter;
 gchar *id;
 t_xkb_kbd_config *config = xkb-settings-kbd_config;
 
@@ -313,6 +321,7 @@ static gint
 xkb_settings_get_group_count (t_xkb *xkb)
 {
 GtkTreeModel *model;
+GtkTreeIter iter;
 gint count = 1;
 
 model = gtk_tree_view_get_model (GTK_TREE_VIEW (xkb-layout_tree_view));
@@ -358,6 +367,7 @@ xkb_settings_edit_layout (GtkWidget *widget, t_xkb *xkb)
 if (c != NULL)
 {
 GtkTreeSelection *selection;
+GtkTreeIter iter;
 gchar **strings;
 
 selection = gtk_tree_view_get_selection (GTK_TREE_VIEW 
(xkb-layout_tree_view));
@@ -375,7 +385,6 @@ xkb_settings_edit_layout (GtkWidget *widget, t_xkb *xkb)
 }
 g_free(c);
 xkb_settings_edit_layout_btn_show (GTK_TREE_VIEW (xkb-layout_tree_view), 
xkb);
-
 }
 
 static void
@@ -385,7 +394,9 @@ xkb_settings_add_layout (GtkWidget *widget, t_xkb *xkb)
 c = xkb_settings_layout_dialog_run();
 if (c != NULL)
 {
+GtkTreeIter iter;
 gchar **strings;
+
 strings = g_strsplit_set(c, ,, 0);
 gtk_list_store_append (xkb-layout_store, iter);
 gtk_list_store_set (xkb-layout_store, iter,
@@ -406,6 +417,7 @@ xkb_settings_rm_layout (GtkWidget *widget, t_xkb *xkb)
 {
 GtkTreeSelection *selection;
 GtkTreeModel *model;
+GtkTreeIter iter;
 gboolean is_default;
 
 model = gtk_tree_view_get_model (GTK_TREE_VIEW (xkb-layout_tree_view));
@@ -437,6 +449,7 @@ xkb_settings_default_layout_toggled (GtkCellRendererToggle 
*renderer,
 /* warning, super dumb code - set all layout toggle values to
false, then set the toggled one to true */
 GtkTreeModel

[Xfce4-commits] xfce4-xkb-plugin:master Remove global model variable.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to c03240c1d505f5546baf5ed2fe187bb664e74014 (commit)
   from d50677feae43bfbbf73164632f82c72dd5bddb13 (commit)

commit c03240c1d505f5546baf5ed2fe187bb664e74014
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 08:13:25 2011 +0200

Remove global model variable.

 panel-plugin/xfce4-xkb-plugin.h|1 -
 panel-plugin/xkb-settings-dialog.c |   13 +
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/panel-plugin/xfce4-xkb-plugin.h b/panel-plugin/xfce4-xkb-plugin.h
index bf81b63..ad8528c 100644
--- a/panel-plugin/xfce4-xkb-plugin.h
+++ b/panel-plugin/xfce4-xkb-plugin.h
@@ -81,7 +81,6 @@ typedef struct
 } t_xkb;
 
 GtkTreeIter iter, child;
-GtkTreeModel *model;
 GtkTreeSelection *selection;
 
 /*
diff --git a/panel-plugin/xkb-settings-dialog.c 
b/panel-plugin/xkb-settings-dialog.c
index 211527b..eb95085 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -194,6 +194,7 @@ xkb_settings_add_kbd_model_to_list (XklConfigRegistry * 
config_registry,
 static void
 xkb_settings_set_toggle_option_combo_default_value (t_xkb *xkb)
 {
+GtkTreeModel *model;
 gchar *id;
 
 t_xkb_kbd_config *config = xkb-settings-kbd_config;
@@ -236,6 +237,7 @@ xkb_settings_set_toggle_option_combo_default_value (t_xkb 
*xkb)
 static void
 xkb_settings_set_compose_key_position_combo_default_value (t_xkb *xkb)
 {
+GtkTreeModel *model;
 gchar *id;
 
 t_xkb_kbd_config *config = xkb-settings-kbd_config;
@@ -278,6 +280,7 @@ xkb_settings_set_compose_key_position_combo_default_value 
(t_xkb *xkb)
 static void
 xkb_settings_set_kbd_combo_default_value (t_xkb *xkb)
 {
+GtkTreeModel *model;
 gchar *id;
 t_xkb_kbd_config *config = xkb-settings-kbd_config;
 
@@ -309,6 +312,7 @@ xkb_settings_set_kbd_combo_default_value (t_xkb *xkb)
 static gint
 xkb_settings_get_group_count (t_xkb *xkb)
 {
+GtkTreeModel *model;
 gint count = 1;
 
 model = gtk_tree_view_get_model (GTK_TREE_VIEW (xkb-layout_tree_view));
@@ -343,9 +347,12 @@ xkb_settings_edit_layout_btn_show (GtkTreeView *tree_view,
 static void
 xkb_settings_edit_layout (GtkWidget *widget, t_xkb *xkb)
 {
+GtkTreeModel *model;
 gchar *c;
 gboolean is_default;
 
+model = gtk_tree_view_get_model (GTK_TREE_VIEW (xkb-layout_tree_view));
+
 c = xkb_settings_layout_dialog_run ();
 if (c != NULL)
 {
@@ -395,8 +402,10 @@ xkb_settings_add_layout (GtkWidget *widget, t_xkb *xkb)
 static void
 xkb_settings_rm_layout (GtkWidget *widget, t_xkb *xkb)
 {
+GtkTreeModel *model;
 gboolean is_default;
 
+model = gtk_tree_view_get_model (GTK_TREE_VIEW (xkb-layout_tree_view));
 selection = gtk_tree_view_get_selection (
 GTK_TREE_VIEW (xkb-layout_tree_view));
 if (gtk_tree_selection_get_selected (selection, model, iter))
@@ -424,6 +433,7 @@ xkb_settings_default_layout_toggled (GtkCellRendererToggle 
*renderer,
 {
 /* warning, super dumb code - set all layout toggle values to
false, then set the toggled one to true */
+GtkTreeModel *model;
 
 model = gtk_tree_view_get_model (GTK_TREE_VIEW (xkb-layout_tree_view));
 gtk_tree_model_get_iter_first (model, iter);
@@ -812,11 +822,13 @@ xkb_settings_layout_dialog_run (void)
 
 if (response == GTK_RESPONSE_OK)
 {
+GtkTreeModel *model;
 GtkTreePath *tree_path;
 gchar *id;
 gchar *result;
 
 selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
+model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
 
 if (!gtk_tree_selection_get_selected (selection, model, iter))
 return NULL;
@@ -862,6 +874,7 @@ xkb_settings_layout_dialog_run (void)
 static void
 xkb_settings_update_from_ui (t_xkb *xkb)
 {
+GtkTreeModel *model;
 gchar *layouts, *variants, *kbdmodel, *toggle_option,
   *compose_key_position;
 t_xkb_kbd_config *kbd_config = xkb-settings-kbd_config;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Don't leak config_item.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to e678e90a8f4ffeeea492042916aeed1f5387a63a (commit)
   from e98c35763c7edc295765ccbf710e276fc56d51f5 (commit)

commit e678e90a8f4ffeeea492042916aeed1f5387a63a
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 09:18:08 2011 +0200

Don't leak config_item.

 panel-plugin/xkb-config.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 353ad8a..adf8927 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -125,12 +125,11 @@ xkb_config_initialize (t_xkb_settings *settings,
 static void
 xkb_config_initialize_xkb_options (t_xkb_settings *settings)
 {
-gint i;
 XklConfigRegistry *registry;
 XklConfigItem *config_item;
 GHashTable *index_variants;
 gchar **group;
-gint val;
+gint val, i;
 gpointer pval;
 
 xkb_config_free ();
@@ -187,6 +186,7 @@ xkb_config_initialize_xkb_options (t_xkb_settings *settings)
 );
 }
 g_hash_table_destroy (index_variants);
+g_object_unref (config_item);
 }
 
 void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Set string function parameters which are not modified as const.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to 979a1a2bc2bce620d2b430582105c936f8d42f9a (commit)
   from e678e90a8f4ffeeea492042916aeed1f5387a63a (commit)

commit 979a1a2bc2bce620d2b430582105c936f8d42f9a
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 09:28:11 2011 +0200

Set string function parameters which are not modified as const.

 panel-plugin/xkb-cairo.c |4 ++--
 panel-plugin/xkb-cairo.h |6 +++---
 panel-plugin/xkb-callbacks.c |6 ++
 panel-plugin/xkb-config.c|4 ++--
 panel-plugin/xkb-config.h|   36 ++--
 panel-plugin/xkb-util.c  |   10 ++
 panel-plugin/xkb-util.h  |   10 +-
 7 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/panel-plugin/xkb-cairo.c b/panel-plugin/xkb-cairo.c
index e5f1df1..eeb18ac 100644
--- a/panel-plugin/xkb-cairo.c
+++ b/panel-plugin/xkb-cairo.c
@@ -64,7 +64,7 @@ gint font_sizes[113] = {
 
 void
 xkb_cairo_draw_flag (cairo_t *cr,
- gchar *group_name,
+ const gchar *group_name,
  gint panel_size,
  gint actual_width,
  gint actual_height,
@@ -143,7 +143,7 @@ xkb_cairo_draw_flag (cairo_t *cr,
 
 void
 xkb_cairo_draw_label (cairo_t *cr,
-  gchar *group_name,
+  const gchar *group_name,
   gint panel_size,
   gint actual_width,
   gint actual_height,
diff --git a/panel-plugin/xkb-cairo.h b/panel-plugin/xkb-cairo.h
index 6103a05..90c9996 100644
--- a/panel-plugin/xkb-cairo.h
+++ b/panel-plugin/xkb-cairo.h
@@ -4,7 +4,7 @@
  *
  * Parts of this program comes from the XfKC tool:
  * Copyright (C) 2006 Gauvain Pocentek gauvainpocen...@gmail.com
- * 
+ *
  * A part of this file comes from the gnome keyboard capplet (control-center):
  * Copyright (C) 2003 Sergey V. Oudaltsov s...@users.sourceforge.net
  *
@@ -35,7 +35,7 @@
 #include pango/pangocairo.h
 
 voidxkb_cairo_draw_flag (cairo_t *cr,
- gchar *flag_name,
+ const gchar *flag_name,
  gint panel_size,
  gint actual_width,
  gint actual_height,
@@ -45,7 +45,7 @@ voidxkb_cairo_draw_flag (cairo_t *cr,
  GdkColor fgcolor);
 
 voidxkb_cairo_draw_label(cairo_t *cr,
- gchar *group_name,
+ const gchar *group_name,
  gint panel_size,
  gint actual_width,
  gint actual_height,
diff --git a/panel-plugin/xkb-callbacks.c b/panel-plugin/xkb-callbacks.c
index 4e13eaf..e7eaeac 100644
--- a/panel-plugin/xkb-callbacks.c
+++ b/panel-plugin/xkb-callbacks.c
@@ -99,7 +99,7 @@ xkb_plugin_layout_image_exposed (GtkWidget *widget,
  GdkEventExpose *event,
  t_xkb *xkb)
 {
-gchar *group_name;
+const gchar *group_name;
 cairo_t *cr;
 GtkStyle *style;
 GdkColor fgcolor;
@@ -116,8 +116,6 @@ xkb_plugin_layout_image_exposed (GtkWidget *widget,
 
 if (xkb-display_type == DISPLAY_TYPE_IMAGE)
 {
-group_name = xkb_config_get_group_name (-1);
-
 xkb_cairo_draw_flag (cr, group_name,
 xfce_panel_plugin_get_size (xkb-plugin),
 actual_hsize, actual_vsize,
@@ -171,7 +169,7 @@ xkb_plugin_tooltip_image_exposed (GtkWidget *widget,
   GdkEventExpose *event,
   t_xkb *xkb)
 {
-gchar *group_name;
+const gchar *group_name;
 cairo_t *cr;
 /*GtkStyle *style;*/
 /*GdkColor fgcolor;*/
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index adf8927..da89b6b 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -465,7 +465,7 @@ xkb_config_get_group_count (void)
 return config-group_count;
 }
 
-gchar*
+const gchar*
 xkb_config_get_group_name (gint group)
 {
 g_assert (config != NULL);
@@ -479,7 +479,7 @@ xkb_config_get_group_name (gint group)
 return config-group_names[group];
 }
 
-gchar*
+const gchar*
 xkb_config_get_variant (gint group)
 {
 g_assert (config != NULL);
diff --git a/panel-plugin/xkb-config.h b/panel-plugin/xkb-config.h
index fb87184..3281471 100644
--- a/panel-plugin/xkb-config.h
+++ b/panel-plugin/xkb-config.h
@@ -62,28 +62,28 @@ typedef void(*XkbCallback)  (gint 
current_group,
  gboolean groups_changed,
  gpointer user_data);
 
-gbooleanxkb_config_initialize   (t_xkb_settings *settings,
-

[Xfce4-commits] xfce4-xkb-plugin:master Don't leak registry objects.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to 5b8e84bbc9c8035a0d328e4e009dd39bf88dad1f (commit)
   from 979a1a2bc2bce620d2b430582105c936f8d42f9a (commit)

commit 5b8e84bbc9c8035a0d328e4e009dd39bf88dad1f
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 10:39:02 2011 +0200

Don't leak registry objects.

 panel-plugin/xkb-config.c  |1 +
 panel-plugin/xkb-settings-dialog.c |3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index da89b6b..7712a12 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -147,6 +147,7 @@ xkb_config_initialize_xkb_options (t_xkb_settings *settings)
 
 registry = xkl_config_registry_get_instance (config-engine);
 xkl_config_registry_load (registry, FALSE);
+g_object_unref (registry);
 
 config_item = xkl_config_item_new ();
 
diff --git a/panel-plugin/xkb-settings-dialog.c 
b/panel-plugin/xkb-settings-dialog.c
index e56626e..b230fa9 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -715,6 +715,8 @@ xfce_xkb_configure (XfcePanelPlugin *plugin,
 
 g_signal_connect (renderer2, toggled, G_CALLBACK 
(xkb_settings_default_layout_toggled), xkb);
 
+g_object_unref (registry);
+
 gtk_widget_show (settings_dialog);
 }
 
@@ -807,6 +809,7 @@ xkb_settings_layout_dialog_run (void)
 
 xkl_config_registry_foreach_layout (registry, (ConfigItemProcessFunc)
 xkb_settings_add_layout_to_available_layouts_tree, treestore);
+g_object_unref (registry);
 
 renderer = gtk_cell_renderer_text_new ();
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Don't leak XklConfigRec.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to 6a25b3b1581fa62352f7bd5a0f79b121f8aecfa3 (commit)
   from 5b8e84bbc9c8035a0d328e4e009dd39bf88dad1f (commit)

commit 6a25b3b1581fa62352f7bd5a0f79b121f8aecfa3
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 10:40:18 2011 +0200

Don't leak XklConfigRec.

 panel-plugin/xkb-config.c |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 7712a12..0f0f2ca 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -238,11 +238,12 @@ xkb_config_finalize (void)
 {
 xkb_config_free ();
 
+xkl_engine_stop_listen (config-engine, XKLL_TRACK_KEYBOARD_STATE);
+g_object_unref (config-config_rec);
+
 g_free (config);
 
 gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
-
-xkl_engine_stop_listen (config-engine, XKLL_TRACK_KEYBOARD_STATE);
 }
 
 static gint
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Make sure we don't leak in weird situations.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to 34f4f9a83f0a485f61f3cfa7f1790e0d399e3f49 (commit)
   from 6a25b3b1581fa62352f7bd5a0f79b121f8aecfa3 (commit)

commit 34f4f9a83f0a485f61f3cfa7f1790e0d399e3f49
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 10:40:46 2011 +0200

Make sure we don't leak in weird situations.

 panel-plugin/xkb-config.c |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 0f0f2ca..f2f2e80 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -298,9 +298,14 @@ xkb_config_update_settings (t_xkb_settings *settings)
 if (settings-kbd_config == NULL || settings-never_modify_config)
 {
 xkl_config_rec_get_from_server (config-config_rec, config-engine);
-settings-kbd_config = g_new0 (t_xkb_kbd_config, 1);
+if (settings-kbd_config == NULL)
+settings-kbd_config = g_new0 (t_xkb_kbd_config, 1);
+
+g_free (settings-kbd_config-model);
 settings-kbd_config-model = g_strdup (config-config_rec-model);
+g_free (settings-kbd_config-layouts);
 settings-kbd_config-layouts = g_strjoinv (,, 
config-config_rec-layouts);
+g_free (settings-kbd_config-variants);
 settings-kbd_config-variants = g_strjoinv (,, 
config-config_rec-variants);
 }
 else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Clean whitespace.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to 24f66fa4d9dddbf8210b964a6a95c193792a87c0 (commit)
   from 51e472ba45341b6c312e4bc49a4d20e60858bac2 (commit)

commit 24f66fa4d9dddbf8210b964a6a95c193792a87c0
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 10:41:33 2011 +0200

Clean whitespace.

 panel-plugin/xkb-settings-dialog.c |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/panel-plugin/xkb-settings-dialog.c 
b/panel-plugin/xkb-settings-dialog.c
index b230fa9..0ee372d 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -493,7 +493,6 @@ xfce_xkb_configure (XfcePanelPlugin *plugin,
 GtkWidget *display_type_optmenu, *group_policy_combo;
 GtkWidget *vbox, *display_type_frame, *group_policy_frame, *bin;
 
-
 GtkCellRenderer *renderer, *renderer2;
 GtkWidget *vbox1, *vbox2, *hbox, *frame;
 XklConfigRegistry *registry;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Stupid typo, fix linked leak.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to 51e472ba45341b6c312e4bc49a4d20e60858bac2 (commit)
   from 34f4f9a83f0a485f61f3cfa7f1790e0d399e3f49 (commit)

commit 51e472ba45341b6c312e4bc49a4d20e60858bac2
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 10:41:12 2011 +0200

Stupid typo, fix linked leak.

 panel-plugin/xkb-config.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index f2f2e80..d952a3c 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -331,8 +331,8 @@ xkb_config_update_settings (t_xkb_settings *settings)
 if (settings-kbd_config-compose_key_position
  strlen (settings-kbd_config-compose_key_position)  0)
 {
-gchar *tmp = options;
-options = g_strconcat (options, ,, 
settings-kbd_config-compose_key_position, NULL);
+gchar *tmp = g_strdup (options);
+options = g_strconcat (tmp, ,, 
settings-kbd_config-compose_key_position, NULL);
 g_free (tmp);
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Don't leak dialog.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to a7b1e7f6b0ab29f4c360d484978234abb1fa0b42 (commit)
   from 24f66fa4d9dddbf8210b964a6a95c193792a87c0 (commit)

commit a7b1e7f6b0ab29f4c360d484978234abb1fa0b42
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 10:41:48 2011 +0200

Don't leak dialog.

 panel-plugin/xkb-settings-dialog.c |5 +
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/panel-plugin/xkb-settings-dialog.c 
b/panel-plugin/xkb-settings-dialog.c
index 0ee372d..6b15ce6 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -852,7 +852,10 @@ xkb_settings_layout_dialog_run (void)
 model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
 
 if (!gtk_tree_selection_get_selected (selection, model, iter))
+{
+gtk_widget_destroy (dialog);
 return NULL;
+}
 gtk_tree_model_get (model, iter, AVAIL_LAYOUT_TREE_COL_ID, id, -1);
 
 tree_path = gtk_tree_model_get_path (model, iter);
@@ -866,6 +869,7 @@ xkb_settings_layout_dialog_run (void)
 {
 g_free (id);
 gtk_tree_path_free (tree_path);
+gtk_widget_destroy (dialog);
 return NULL;
 }
 
@@ -873,6 +877,7 @@ xkb_settings_layout_dialog_run (void)
 {
 g_free (id);
 gtk_tree_path_free (tree_path);
+gtk_widget_destroy (dialog);
 return NULL;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:master l10n: Updated Chinese (China) (zh_CN) translation to 77%

2011-04-29 Thread Transifex 
Updating branch refs/heads/master
 to e3b139f61023f2db84a32b0876ecf69dd78abbd9 (commit)
   from 4a6aaf490a708d1e405a4123a8c778427733a490 (commit)

commit e3b139f61023f2db84a32b0876ecf69dd78abbd9
Author: Chipong L chipon...@yahoo.com
Date:   Fri Apr 29 11:19:37 2011 +0200

l10n: Updated Chinese (China) (zh_CN) translation to 77%

New status: 226 messages complete with 0 fuzzies and 67 untranslated.

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

 docs/manual/po/zh_CN.po |   14 +-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/docs/manual/po/zh_CN.po b/docs/manual/po/zh_CN.po
index d90d196..e556493 100644
--- a/docs/manual/po/zh_CN.po
+++ b/docs/manual/po/zh_CN.po
@@ -757,7 +757,7 @@ msgstr 
 
 #: Thunar.xml1004(para)
 msgid A complete example using the applicationpostr/application 
application is shown below:
-msgstr 
+msgstr 使用 applicationpostr/application 程序的完整示例如下：
 
 #: Thunar.xml1008(programlisting)
 #, no-wrap
@@ -775,6 +775,18 @@ msgid 
 Name=Flickr\n
 MimeType=image/jpeg;
 msgstr 
+\n
+# postr.desktop - Integrate postr into\n
+# the \Send To\ menu.\n
+[Desktop Entry]\n
+Type=Application\n
+Version=1.0\n
+Encoding=UTF-8\n
+TryExec=postr\n
+Exec=postr %F\n
+Icon=postr\n
+Name=Flickr\n
+MimeType=image/jpeg；
 
 #: Thunar.xml1021(para)
 msgid If you install this file to filename 
role=\directory\~/.local/share/Thunar/sendto//filename (create the folder 
if it does not exist yet), the guilabelSend To/guilabel menu for JPEG files 
will show the new entry guilabelFlickr/guilabel, which can be used to 
upload JPEG images to Flickr.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] garcon:master l10n: Updated Chinese (China) (zh_CN) translation to 100%

2011-04-29 Thread Transifex 
Updating branch refs/heads/master
 to 15d6320490357ec0be6c27f3ca6f84201f2779ca (commit)
   from 46daedb7cc6a70077122bbbca9c2c3428f17e25c (commit)

commit 15d6320490357ec0be6c27f3ca6f84201f2779ca
Author: Chipong L chipon...@yahoo.com
Date:   Fri Apr 29 12:02:33 2011 +0200

l10n: Updated Chinese (China) (zh_CN) translation to 100%

New status: 29 messages complete with 0 fuzzies and 0 untranslated.

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

 po/zh_CN.po |   28 ++--
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1190dd4..2a62b7b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,14 +8,14 @@ msgid 
 msgstr 
 Project-Id-Version: 0.1.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 14:36+0100\n
+POT-Creation-Date: 2011-04-28 04:05+\n
 PO-Revision-Date: 2010-11-23 22:57+0800\n
 Last-Translator: Hunt Xu hun...@live.cn\n
 Language-Team: Simplified Chinese i18n-x...@xfce.org\n
-Language: \n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: \n
 
 #: ../data/xfce/xfce-accessories.directory.in.h:1
 msgid Accessories
@@ -23,7 +23,7 @@ msgstr 附件
 
 #: ../data/xfce/xfce-accessories.directory.in.h:2
 msgid Common desktop tools and applications
-msgstr 常见的桌面工具和应用程序
+msgstr 常见桌面工具和应用程序
 
 #: ../data/xfce/xfce-development.directory.in.h:1
 msgid Development
@@ -47,7 +47,7 @@ msgstr 游戏
 
 #: ../data/xfce/xfce-games.directory.in.h:2
 msgid Games, puzzles, and other fun software
-msgstr 游戏，拼图，和其他有趣的软件
+msgstr 游戏、拼图和其他有趣的软件
 
 #: ../data/xfce/xfce-graphics.directory.in.h:1
 msgid Graphics
@@ -71,7 +71,7 @@ msgstr 网络
 
 #: ../data/xfce/xfce-network.directory.in.h:2
 msgid Network applications and utilities
-msgstr 网络应用程序和工具
+msgstr 网络程序和工具
 
 #: ../data/xfce/xfce-office.directory.in.h:1
 msgid Office
@@ -79,11 +79,11 @@ msgstr 办公
 
 #: ../data/xfce/xfce-office.directory.in.h:2
 msgid Office and productivity applications
-msgstr 办公与生产应用程序
+msgstr 办公与生产力程序
 
 #: ../data/xfce/xfce-other.directory.in.h:1
 msgid Applications that don't fit into other categories
-msgstr 未归入分类的其它应用程序
+msgstr 未归类的其它程序
 
 #: ../data/xfce/xfce-other.directory.in.h:2
 msgid Other
@@ -107,7 +107,7 @@ msgstr 屏幕保护程序
 
 #: ../data/xfce/xfce-settings.directory.in.h:1
 msgid Desktop and system settings applications
-msgstr 桌面与系统设置应用程序
+msgstr 桌面与系统设置程序
 
 #: ../data/xfce/xfce-settings.directory.in.h:2
 msgid Settings
@@ -124,20 +124,20 @@ msgstr 系统工具和实用程序
 #: ../garcon/garcon-menu.c:698
 #, c-format
 msgid File \%s\ not found
-msgstr 文件 \%s\ 未找到
+msgstr 未找到 \%s\ 文件
 
 #: ../garcon/garcon-menu-parser.c:278
 #, c-format
 msgid Could not load menu file data from %s: %s
-msgstr 无法从 %s 中读取菜单文件数据: %s
+msgstr 无法从 %s 中加载菜单文件数据: %s
 
 #: ../garcon/garcon-menu-parser.c:284
 #, c-format
 msgid Could not load menu file data from %s
-msgstr 无法从 %s 中读取菜单文件数据
+msgstr 无法从 %s 中加载菜单文件数据
 
 #~ msgid No suitable application menu file found
-#~ msgstr 没有找到对应的菜单文件
+#~ msgstr 没有找到对应的程序菜单文件
 
 #~ msgid XfceMenu: Display Menu Test
 #~ msgstr Xfce 菜单：测试目录显示
@@ -146,7 +146,7 @@ msgstr 无法从 %s 中读取菜单文件数据
 #~ msgstr 显示菜单(_S)
 
 #~ msgid Failed to locate the system menu
-#~ msgstr 找不到系统菜单
+#~ msgstr 载人系统菜单失败
 
 #~ msgid Failed to create the libxfce4menu item cache in %s.
-#~ msgstr 无法在 %s 建立 libxfce4menu 缓存区.
+#~ msgstr 无法在 %s 创建 libxfce4menu 对象缓存区.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master l10n: Updated Chinese (China) (zh_CN) translation to 100%

2011-04-29 Thread Transifex 
Updating branch refs/heads/master
 to 896035eee226774bc631b9a0ba50066e7f50e07b (commit)
   from 4ffd7417645bef38fd6792c1f83ade1b8f20dff3 (commit)

commit 896035eee226774bc631b9a0ba50066e7f50e07b
Author: Chipong L chipon...@yahoo.com
Date:   Fri Apr 29 12:04:31 2011 +0200

l10n: Updated Chinese (China) (zh_CN) translation to 100%

New status: 116 messages complete with 0 fuzzies and 0 untranslated.

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

 po/zh_CN.po |   80 +-
 1 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5a91638..dd13e86 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -19,13 +19,13 @@ msgstr 
 
 #: ../thunar-volman/main.c:59
 msgid The syfs path of the newly added device
-msgstr 新添加的设备的 sysf 路径
+msgstr 新添加设备的 sysf 路径
 
 #: ../thunar-volman/main.c:60
 #: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid Configure management of removable drives and media
-msgstr 配置可移动驱动器和介质管理
+msgstr 设置可移动驱动器和介质管理
 
 #: ../thunar-volman/main.c:61
 msgid Print version information and exit
@@ -43,17 +43,17 @@ msgstr 保留所有权利。
 #: ../thunar-volman/main.c:136
 #, c-format
 msgid Please report bugs to %s.
-msgstr 请报告 bug 至 %s。
+msgstr 请向 %s 报告漏洞与错误。
 
 #: ../thunar-volman/main.c:190
 #, c-format
 msgid There is no device with the sysfs path \%s\
-msgstr 没有 sysfs 路径为 \%s\ 的设备
+msgstr 没有 \%s\ sysfs 路径的设备
 
 #: ../thunar-volman/main.c:202
 #, c-format
 msgid Must specify the sysfs path of new devices with --device-added
-msgstr 必须使用 --device-added 来指定新设备的 sysfs 路径
+msgstr 必须用 --device-added 指定新设备的 sysfs 路径
 
 #. ...so we need to prompt what to do
 #: ../thunar-volman/tvm-block-device.c:204
@@ -62,11 +62,11 @@ msgstr 照片和音乐
 
 #: ../thunar-volman/tvm-block-device.c:205
 msgid Photos were found on your portable music player
-msgstr 在您的便携式音乐播放器里找到相片
+msgstr 在您的便携式音乐播放器里找到照片
 
 #: ../thunar-volman/tvm-block-device.c:206
 msgid Would you like to import the photos or manage the music?
-msgstr 您是想要导入相片还是管理音乐？
+msgstr 您要导入相片还是处理音乐？
 
 #: ../thunar-volman/tvm-block-device.c:208
 #: ../thunar-volman/tvm-block-device.c:277
@@ -77,7 +77,7 @@ msgstr 您是想要导入相片还是管理音乐？
 #: ../thunar-volman/tvm-run.c:192
 #: ../thunar-volman/tvm-run.c:203
 msgid Ig_nore
-msgstr 忽略(_N)
+msgstr 忽略(_n)
 
 #: ../thunar-volman/tvm-block-device.c:209
 #: ../thunar-volman/tvm-block-device.c:278
@@ -99,7 +99,7 @@ msgstr 检测到照片存储卡
 
 #: ../thunar-volman/tvm-block-device.c:275
 msgid There are photos on the card. Would you like to add these photos to 
your album?
-msgstr 存储卡中有照片。是否添加到相册？
+msgstr 存储卡中有照片。是否将照片添加到相册？
 
 #. prompt the user to execute the file
 #. prompt the user to execute this file
@@ -165,12 +165,12 @@ msgstr 卷已挂载
 #: ../thunar-volman/tvm-block-device.c:635
 #, c-format
 msgid The volume \%s\ was mounted automatically
-msgstr \%s\  卷已被自动挂载
+msgstr \%s\  卷已自动挂载
 
 #: ../thunar-volman/tvm-block-device.c:640
 #, c-format
 msgid The inserted volume was mounted automatically
-msgstr 插入卷已自动挂载
+msgstr 接入卷已自动挂载
 
 #: ../thunar-volman/tvm-block-device.c:694
 #, c-format
@@ -185,7 +185,7 @@ msgstr 无法挂载该设备
 #: ../thunar-volman/tvm-block-device.c:749
 #, c-format
 msgid Could not detect the volume corresponding to the device
-msgstr 无法检测到该卷所对应的设备
+msgstr 无法检测该卷对应的设备
 
 #: ../thunar-volman/tvm-block-device.c:824
 msgid Audio/Data CD
@@ -193,11 +193,11 @@ msgstr 音乐/数据 CD
 
 #: ../thunar-volman/tvm-block-device.c:825
 msgid The CD in the drive contains both music and files
-msgstr 驱动器中的 CD 同时包含音乐和文件。
+msgstr 驱动器中的 CD 既有音乐又有文件。
 
 #: ../thunar-volman/tvm-block-device.c:827
 msgid Would you like to listen to music or browse the files?
-msgstr 您是想要播放音乐还是浏览文件？
+msgstr 您要播放音乐还是浏览文件？
 
 #: ../thunar-volman/tvm-block-device.c:830
 msgid _Browse Files
@@ -210,7 +210,7 @@ msgstr 播放 CD(_P)
 #: ../thunar-volman/tvm-block-device.c:919
 #, c-format
 msgid Unknown block device type
-msgstr 未知的块设备类型
+msgstr 未知块设备类型
 
 #: ../thunar-volman/tvm-device.c:139
 #, c-format
@@ -227,7 +227,7 @@ msgstr 检测到键盘
 
 #: ../thunar-volman/tvm-input-device.c:76
 msgid A keyboard was detected
-msgstr 已检测一组键盘。
+msgstr 检测到一个键盘
 
 #: ../thunar-volman/tvm-input-device.c:86
 #: ../thunar-volman/tvm-input-device.c:100
@@ -264,15 +264,15 @@ msgstr 不支持的输入设备类型
 #: ../thunar-volman/tvm-run.c:171
 #, c-format
 msgid Autoburning of blank CDs and DVDs is disabled
-msgstr 自动刻录空白 CD 和 DVD 的功能被禁用
+msgstr 已禁用自动刻录空白 CD 和 DVD 的功能
 
 #: ../thunar-volman/tvm-run.c:189
 msgid Blank DVD inserted
-msgstr 空白 DVD 被插入
+msgstr 已添加空白 DVD
 
 #: ../thunar-volman/tvm-run.c:190
 msgid You have inserted a blank DVD.
-msgstr 您插入了一张空白 DVD。
+msgstr 您添加了一张空白 DVD。
 
 #: ../thunar-volman/tvm-run.c:191
 #: ../thunar-volman/tvm-run.c:202
@@ -285,11 +285,11 @@ msgstr 刻录 DVD (_D)
 
 #: ../thunar-volman/tvm-run.c:200
 msgid Blank CD inserted
-msgstr 空白 CD 被插入
+msgstr 已添加空白 CD
 
 #: ../thunar-volman/tvm-run.c:201
 msgid You

[Xfce4-commits] xfce4-xkb-plugin:master Plug two additionnal leaks.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to 536cfae6e0567ed1f3e8201f42207d53d6277bb5 (commit)
   from a7b1e7f6b0ab29f4c360d484978234abb1fa0b42 (commit)

commit 536cfae6e0567ed1f3e8201f42207d53d6277bb5
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 13:30:00 2011 +0200

Plug two additionnal leaks.

 panel-plugin/xfce4-xkb-plugin.c |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/panel-plugin/xfce4-xkb-plugin.c b/panel-plugin/xfce4-xkb-plugin.c
index 5392fcd..6ccc6d9 100644
--- a/panel-plugin/xfce4-xkb-plugin.c
+++ b/panel-plugin/xfce4-xkb-plugin.c
@@ -173,6 +173,7 @@ xkb_new (XfcePanelPlugin *plugin)
 {
 xkb_load_default (xkb);
 }
+g_free (filename);
 
 xkb-btn = gtk_button_new ();
 gtk_button_set_relief (GTK_BUTTON (xkb-btn), GTK_RELIEF_NONE);
@@ -396,6 +397,8 @@ xkb_initialize_menu (t_xkb *xkb)
 g_object_unref (G_OBJECT (pixbuf));
 
 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), 
image);
+
+g_object_unref (handle);
 }
 
 gtk_widget_show (menu_item);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] www:nick/gettext l10n: Updated Japanese (ja) translation to 90%

2011-04-29 Thread Transifex 
Updating branch refs/heads/nick/gettext
 to 0b5dc85b52ce4f5b7cab951ab9fd87a14ff2c9ee (commit)
   from 65619c86320b5014ff3ebf3533194f32d36dbfb3 (commit)

commit 0b5dc85b52ce4f5b7cab951ab9fd87a14ff2c9ee
Author: Masato Hashimoto hash...@xfce.org
Date:   Fri Apr 29 14:43:01 2011 +0200

l10n: Updated Japanese (ja) translation to 90%

New status: 602 messages complete with 0 fuzzies and 65 untranslated.

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

 lib/po/ja.po |   16 
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/po/ja.po b/lib/po/ja.po
index 5927977..54880e0 100644
--- a/lib/po/ja.po
+++ b/lib/po/ja.po
@@ -8,7 +8,7 @@ msgstr 
 Project-Id-Version: www.xfce.org\n
 Report-Msgid-Bugs-To: https://bugzilla.xfce.org\n;
 POT-Creation-Date: 2011-04-27 20:40+0900\n
-PO-Revision-Date: 2011-04-29 19:18+0900\n
+PO-Revision-Date: 2011-04-29 21:42+0900\n
 Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n
 Language-Team: Japanese\n
 Language: ja\n
@@ -1547,19 +1547,19 @@ msgstr ようこそ Xfce コミュニティへ。私たちのチームに参加
 
 #: getinvolved/index.php:9
 msgid Possible tasks include testing, bug reporting; writing code, developing 
artwork, documentation or translations; or spreading the word and helping out 
with promotion and marketing both on line and at tradeshows and conferences.
-msgstr 
参加可能な作業には、テスト、バグ報告、コーディング、アートワークの作成、ドキュメント作成、翻訳、あるいは、クチコミでの紹介や何らかのイベントやコミュニティでの宣伝の支援があります。
+msgstr 
参加可能な作業には、テスト、バグ報告、コーディング、アートワークの作成、ドキュメントの執筆、翻訳、あるいは、クチコミでの紹介や何らかのイベントやコミュニティでの宣伝の支援があります。
 
 #: getinvolved/index.php:12
 msgid Documentation
-msgstr ドキュメント作成
+msgstr ドキュメントの執筆
 
 #: getinvolved/index.php:14
 msgid There's lots of people using and testing Xfce. By providing useful and 
up-to-date documentation, you will make a big impact on helping people 
understand how to make the most of the Xfce Desktop Environement.
-msgstr 多くの人々が Xfce を使用し、テストしています。使いやすく、最新のドキュメントを提供することで、Xfce 
デスクトップ環境の使い方を理解する人々に大きな貢献ができるでしょう。※ここでのドキュメントは、英語のドキュメントを意味します。
+msgstr 多くの人々が Xfce を使用し、テストしています。使いやすく、最新のドキュメントを提供することで、Xfce 
デスクトップ環境の使い方を理解する人々に大きな貢献ができるでしょう。※ここでのドキュメントは、英語のドキュメントを指します。
 
 #: getinvolved/index.php:19
 msgid Are you fluent in multiple languages? By contributing your translations 
of text to the Xfce Desktop Environement, you will help Xfce be a better part 
of the global market and more accessible to the millions of potential users out 
there.
-msgstr あなたは複数の言語に堪能ですか? Xfce デスクトップ環境を翻訳することで、Xfce 
が世界に普及することや、世の中にいる無数の将来的なユーザがより近づきやすくすることになります。
+msgstr あなたは複数の言語に堪能ですか? Xfce デスクトップ環境を翻訳することで、Xfce 
が世界に普及させ、世の中にいる無数の将来的なユーザがより近づきやすくすることに貢献できます。
 
 #: getinvolved/index.php:22
 msgid Development
@@ -1567,7 +1567,7 @@ msgstr 開発
 
 #: getinvolved/index.php:24
 msgid By becoming a developer, you can make a big difference while enjoying a 
challenging and fun experience. You'll learn to be a better coder, you will get 
to implement new features and defeat daunting bugs, creating a stunning 
product, all the while collaborating with people from all around the world.
-msgstr 
開発者になることで、あなたは挑戦しがいのある経験を楽しみつつ、大きな変化が得られます。あなたは世界中の人々と協力し、より良いコードを書くことを学び、新機能の実装に取り組み、手ごわいバグをやっつけ、素晴らしいプロジェクトを立ち上げるでしょう。
+msgstr 
開発者になることで、あなたは挑戦しがいのある経験を楽しみつつ、大きな変化が得られます。あなたは世界中の人々と協力し、より良いコードを書くことを学び、新機能の実装に取り組み、手ごわいバグをやっつけ、素晴らしい製品を製作できるでしょう。
 
 #: getinvolved/index.php:27
 msgid Promotion
@@ -1575,7 +1575,7 @@ msgstr 普及の促進
 
 #: getinvolved/index.php:29
 msgid If you own a blog or website you can greatly help by spreading the word 
and encouraging new users to give Xfce a try. If you have a Identi.ca or 
Twitter account you can also help by reposting any a 
href=\http://identi.ca/xfce\;announcements/a we make to help us reach a 
larger audience.
-msgstr あなたがブログを開設していたりウェブサイトを運営しているなら、Xfce 
のことを紹介し、新しいユーザを増やすことに協力できます。Identi.ca や Twitter のアカウントをお持ちならば、私たちのa 
href=\\\http://identi.ca/xfce\\\;アナウンス/aをより多くの人々へ伝えることでも協力できます。
+msgstr あなたがブログを開設していたりウェブサイトを運営しているなら、Xfce 
のことを紹介し、新しいユーザを増やすことに貢献できます。Identi.ca や Twitter のアカウントをお持ちならば、私たちのa 
href=\http://identi.ca/xfce\;アナウンス/aをより多くの人々へ伝えることでも協力できます。
 
 #: getinvolved/index.php:32
 msgid Bug Reporting and testing
@@ -1583,7 +1583,7 @@ msgstr バグの報告とテスト
 
 #: getinvolved/index.php:34
 msgid One of the most useful tasks that we rely on the community for is 
testing and reporting of bugs. Since Xfce runs on various platform and in a lot 
of different setups, testing all changes in every possible situation is an 
impossible task. As such we kindly ask users to assist in testing, and 
reporting all bugs they may find, using our a 
href=\https://bugzilla.xfce.org\; class=\external\bug tracker/a.
-msgstr 私たちがコミュニティに対して最も期待している、価値ある作業の一つが、テストとバグの報告です。Xfce 
がいろいろなプラットフォームに、様々な手段でセットアップされ動作するようになり、すべての変更を考えうるすべてのシチュエーションでテストすることは不可能になりました。そのため、わたしたちはみなさんにテストとすべてのバグの報告で支援していただくことをお願いしています。バグの報告はa
 href=\https://bugzilla.xfce.org\; class=\external\バグトラッカー/aへお願いします。
+msgstr 私たちがコミュニティに対して最も期待している、価値ある作業の一つが、テストとバグの報告です。Xfce

[Xfce4-commits] xfce4-screenshooter:master Plug massive leak when cancelling in actions dialog.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to 21f850342ff6b54919b3cbd60696dfac09112034 (commit)
   from a2e2bdd92b27ba6b0e8f9296339bd026dd89ddd5 (commit)

commit 21f850342ff6b54919b3cbd60696dfac09112034
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 18:18:36 2011 +0200

Plug massive leak when cancelling in actions dialog.

The pixbuf was leaked which had a huge impact on the panel plugin...

 lib/screenshooter-actions.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lib/screenshooter-actions.c b/lib/screenshooter-actions.c
index 88d7600..0610f6f 100644
--- a/lib/screenshooter-actions.c
+++ b/lib/screenshooter-actions.c
@@ -74,6 +74,8 @@ gboolean screenshooter_action_idle (ScreenshotData *sd)
 {
   if (!sd-plugin)
 gtk_main_quit ();
+
+  g_object_unref (sd-screenshot);
   return FALSE;
 }
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Fix Xfce capitalization in README.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to aa5ab6dabf572dbb9a336d408997b9f2dcc2b2d9 (commit)
   from 536cfae6e0567ed1f3e8201f42207d53d6277bb5 (commit)

commit aa5ab6dabf572dbb9a336d408997b9f2dcc2b2d9
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 18:38:34 2011 +0200

Fix Xfce capitalization in README.

 README |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/README b/README
index 9a2bc02..ee9a37c 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-XFce4 XKB Layouts panel plugin.
+Xfce4 XKB Layouts panel plugin.
 
 Information
 ===
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Use standard icon name.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to f924604a1a96a3db96af982826e1c120cf3cbdfe (commit)
   from aa5ab6dabf572dbb9a336d408997b9f2dcc2b2d9 (commit)

commit f924604a1a96a3db96af982826e1c120cf3cbdfe
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 18:49:37 2011 +0200

Use standard icon name.

 panel-plugin/xkb-plugin.desktop.in.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/panel-plugin/xkb-plugin.desktop.in.in 
b/panel-plugin/xkb-plugin.desktop.in.in
index 148c050..ca72592 100644
--- a/panel-plugin/xkb-plugin.desktop.in.in
+++ b/panel-plugin/xkb-plugin.desktop.in.in
@@ -2,6 +2,6 @@
 Type=X-XFCE-PanelPlugin
 _Name=Keyboard Layouts
 _Comment=Keyboard layouts setup and switch plugin
-Icon=gnome-dev-keyboard
+Icon=preferences-desktop-keyboard
 X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-xkb-plugin
 X-XFCE-Unique=TRUE
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Make sure we don't crash if the first iter could not be retrieved.

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to bdcdddb5ae6a2fda9bfd2a5fd39d8ac29ea613fb (commit)
   from f924604a1a96a3db96af982826e1c120cf3cbdfe (commit)

commit bdcdddb5ae6a2fda9bfd2a5fd39d8ac29ea613fb
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 18:55:16 2011 +0200

Make sure we don't crash if the first iter could not be retrieved.

 panel-plugin/xkb-settings-dialog.c |   21 -
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/panel-plugin/xkb-settings-dialog.c 
b/panel-plugin/xkb-settings-dialog.c
index 6b15ce6..238c9f9 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -325,7 +325,8 @@ xkb_settings_get_group_count (t_xkb *xkb)
 gint count = 1;
 
 model = gtk_tree_view_get_model (GTK_TREE_VIEW (xkb-layout_tree_view));
-gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), iter);
+if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), iter))
+return 0;
 while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), iter))
 count++;
 return count;
@@ -452,18 +453,20 @@ xkb_settings_default_layout_toggled 
(GtkCellRendererToggle *renderer,
 GtkTreeIter iter;
 
 model = gtk_tree_view_get_model (GTK_TREE_VIEW (xkb-layout_tree_view));
-gtk_tree_model_get_iter_first (model, iter);
-do
+if (gtk_tree_model_get_iter_first (model, iter))
 {
-gtk_list_store_set (GTK_LIST_STORE (model), iter, DEFAULT_LAYOUT, 
FALSE, -1);
-} while (gtk_tree_model_iter_next (model, iter));
+do
+{
+gtk_list_store_set (GTK_LIST_STORE (model), iter, DEFAULT_LAYOUT, 
FALSE, -1);
+} while (gtk_tree_model_iter_next (model, iter));
 
 
-if (gtk_tree_model_get_iter_from_string (model, iter, path))
-{
-gtk_list_store_set (GTK_LIST_STORE (model), iter, DEFAULT_LAYOUT, 
TRUE, -1);
+if (gtk_tree_model_get_iter_from_string (model, iter, path))
+{
+gtk_list_store_set (GTK_LIST_STORE (model), iter, DEFAULT_LAYOUT, 
TRUE, -1);
+}
+xkb_settings_update_from_ui (xkb);
 }
-xkb_settings_update_from_ui (xkb);
 }
 
 static gboolean
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-xkb-plugin:master Make scrolling the plugin button cycle through layouts (bug #6533).

2011-04-29 Thread Jérôme Guelfucci 
Updating branch refs/heads/master
 to d1586e84d41ea4ef2469f9604d7e6854aa0bcbad (commit)
   from bdcdddb5ae6a2fda9bfd2a5fd39d8ac29ea613fb (commit)

commit d1586e84d41ea4ef2469f9604d7e6854aa0bcbad
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Fri Apr 29 19:08:12 2011 +0200

Make scrolling the plugin button cycle through layouts (bug #6533).

Add a function to cycle in reverse order for the other scroll direction.

 panel-plugin/xfce4-xkb-plugin.c |3 +++
 panel-plugin/xkb-callbacks.c|   22 ++
 panel-plugin/xkb-callbacks.h|6 +-
 panel-plugin/xkb-config.c   |9 +
 panel-plugin/xkb-config.h   |1 +
 5 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/panel-plugin/xfce4-xkb-plugin.c b/panel-plugin/xfce4-xkb-plugin.c
index 6ccc6d9..74741cd 100644
--- a/panel-plugin/xfce4-xkb-plugin.c
+++ b/panel-plugin/xfce4-xkb-plugin.c
@@ -182,6 +182,9 @@ xkb_new (XfcePanelPlugin *plugin)
 
 gtk_widget_show (xkb-btn);
 g_signal_connect (xkb-btn, clicked, G_CALLBACK 
(xkb_plugin_button_clicked), xkb);
+g_signal_connect (xkb-btn, scroll-event,
+  G_CALLBACK (xkb_plugin_button_scrolled), NULL);
+
 g_object_set (G_OBJECT (xkb-btn), has-tooltip, TRUE, NULL);
 g_signal_connect (xkb-btn, query-tooltip,
 G_CALLBACK (xkb_plugin_set_tooltip), xkb);
diff --git a/panel-plugin/xkb-callbacks.c b/panel-plugin/xkb-callbacks.c
index e7eaeac..c2ae9d6 100644
--- a/panel-plugin/xkb-callbacks.c
+++ b/panel-plugin/xkb-callbacks.c
@@ -154,6 +154,28 @@ xkb_plugin_button_clicked (GtkButton *btn,
 }
 }
 
+gboolean
+xkb_plugin_button_scrolled (GtkWidget *btn,
+GdkEventScroll *event,
+gpointer data)
+{
+switch (event-direction)
+{
+  case GDK_SCROLL_UP:
+  case GDK_SCROLL_RIGHT:
+  xkb_config_next_group ();
+  return TRUE;
+  case GDK_SCROLL_DOWN:
+  case GDK_SCROLL_LEFT:
+  xkb_config_prev_group ();
+  return TRUE;
+  default:
+return FALSE;
+}
+
+return FALSE;
+}
+
 void
 xkb_plugin_popup_menu (GtkButton *btn,
gpointer data)
diff --git a/panel-plugin/xkb-callbacks.h b/panel-plugin/xkb-callbacks.h
index e00b436..3cb5edf 100644
--- a/panel-plugin/xkb-callbacks.h
+++ b/panel-plugin/xkb-callbacks.h
@@ -4,7 +4,7 @@
  *
  * Parts of this program comes from the XfKC tool:
  * Copyright (C) 2006 Gauvain Pocentek gauvainpocen...@gmail.com
- * 
+ *
  * A part of this file comes from the gnome keyboard capplet (control-center):
  * Copyright (C) 2003 Sergey V. Oudaltsov s...@users.sourceforge.net
  *
@@ -66,6 +66,10 @@ voidxkb_plugin_popup_menu   (GtkButton 
*btn,
 voidxkb_plugin_button_clicked   (GtkButton *btn,
  gpointer data);
 
+gbooleanxkb_plugin_button_scrolled  (GtkWidget *btn,
+ GdkEventScroll *event,
+ gpointer data);
+
 gbooleanxkb_plugin_set_tooltip  (GtkWidget *widget,
  gint x,
  gint y,
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index d952a3c..6c751f3 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -278,6 +278,15 @@ xkb_config_next_group (void)
 }
 
 gboolean
+xkb_config_prev_group (void)
+{
+xkl_engine_lock_group (config-engine,
+xkl_engine_get_prev_group (config-engine));
+
+return TRUE;
+}
+
+gboolean
 xkb_config_update_settings (t_xkb_settings *settings)
 {
 gboolean activate_settings = FALSE;
diff --git a/panel-plugin/xkb-config.h b/panel-plugin/xkb-config.h
index 3281471..c251e53 100644
--- a/panel-plugin/xkb-config.h
+++ b/panel-plugin/xkb-config.h
@@ -73,6 +73,7 @@ const gchar*  xkb_config_get_group_name   
(gint group);
 const gchar*  xkb_config_get_variant  (gint group);
 gboolean  xkb_config_set_group(gint group);
 gboolean  xkb_config_next_group   (void);
+gboolean  xkb_config_prev_group   (void);
 gint  xkb_config_variant_index_for_group  (gint group);
 
 void  xkb_config_window_changed   (guint new_window_id,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:master l10n: Updated Chinese (China) (zh_CN) translation to 83%

2011-04-29 Thread Transifex 
Updating branch refs/heads/master
 to d24160e438fb943fbffa185068eec3a65a19842e (commit)
   from e3b139f61023f2db84a32b0876ecf69dd78abbd9 (commit)

commit d24160e438fb943fbffa185068eec3a65a19842e
Author: Chipong Luo chipon...@yahoo.com
Date:   Sat Apr 30 01:34:44 2011 +0200

l10n: Updated Chinese (China) (zh_CN) translation to 83%

New status: 244 messages complete with 0 fuzzies and 49 untranslated.

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

 docs/manual/po/zh_CN.po |   36 ++--
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/manual/po/zh_CN.po b/docs/manual/po/zh_CN.po
index e556493..2c7941d 100644
--- a/docs/manual/po/zh_CN.po
+++ b/docs/manual/po/zh_CN.po
@@ -609,47 +609,47 @@ msgstr 新文件夹视图
 
 #: Thunar.xml742(para)
 msgid Select the default view for folders. When you open a new window, the is 
displayed in the view that you select. This can be either the icon view, the 
compact list view or the detailed list view. You can also select guilabelLast 
Active View/guilabel here to use the view you used for the last active 
window.
-msgstr 
+msgstr 选择文件夹的默认视图。这将以您选择的视图显示打开的新窗口。可以是图标视图，紧凑列表视图或详细列表视图。在此可以选择 
guilabelLast Active View/guilabel 使用您最近一次使用的视图。
 
 #: Thunar.xml752(guilabel)
 msgid Sort folders before files
-msgstr 
+msgstr 在文件前排列文件夹
 
 #: Thunar.xml754(para)
 msgid Select this option to list folders before files when you sort a folder.
-msgstr 
+msgstr 选择此选项，将在文件前列出文件夹来排列。
 
 #: Thunar.xml761(guilabel)
 msgid Show thumbnails
-msgstr 
+msgstr 显示缩略图
 
 #: Thunar.xml763(para)
 msgid Select this option to show thumbnails of image files and other 
supported files. The file manager stores the thumbnail files for each folder in 
the hidden filename role=\directory\.thumbnails/filename directory in the 
user's Home Folder.
-msgstr 
+msgstr 选择此选项显示图像和其它支持文件的缩略图。文件管理器将每个文件夹的缩略图文件存储在每个用户文件夹下的隐藏目录 filename 
role=\directory\.thumbnails/filename 下。
 
 #: Thunar.xml768(para)
 msgid See xref linkend=\thumbnailers\/ if you want to extend the basic 
thumbnail functionality provided by applicationThunar/application with 
support for additional file types.
-msgstr 
+msgstr 如果您要扩展 applicationThunar/application 的基本缩略图功能以便支持更多的文件类型，请参阅 xref 
linkend=\thumbnailers\/ 。
 
 #: Thunar.xml777(guilabel)
 msgid Text beside icons
-msgstr 
+msgstr 文本位于图标内
 
 #: Thunar.xml779(para)
 msgid Select this options to place the icon captions for items in the icon 
view beside the icon rather than under the icon.
-msgstr 
+msgstr 在图标视图下，选择此选项将在图标区域内而不是图标下显示项目的说明文字。
 
 #: Thunar.xml790(title) Thunar.xml803(phrase)
 msgid Side Pane Preferences
-msgstr 
+msgstr 侧边栏首选项
 
 #: Thunar.xml792(para)
 msgid You can select display options for the shortcuts pane and the tree 
pane.
-msgstr 
+msgstr 您可以为快捷方式栏和树形栏选择此显示选项。
 
 #: Thunar.xml808(para)
 msgid The side pane can either display a list of shortcuts for folders in 
your file system, which is the default, or a tree view of your file system. 
This page allows you to select the size of the icons for the shortcuts and the 
tree pane. You can also specify whether emblems should be displayed.
-msgstr 
+msgstr 
侧边栏可以用默认的列表形式显示文件系统中的文件夹，也可以用树形视图方式显示文件系统。此页让您为快捷方式和树行栏选择图标的大小。您也可以指定是否显示徽标。
 
 #: Thunar.xml817(guilabel)
 msgid Icon Size
@@ -657,15 +657,15 @@ msgstr 图标大小
 
 #: Thunar.xml819(para)
 msgid The size of the icons displayed in the side, ranging from 
guilabelVery Small/guilabel (around 16x16 pixels) to guilabelVery 
Large/guilabel (around 128x128 pixels).
-msgstr 
+msgstr 侧边栏中显示的图标大小范围是 guilabel非常小/guilabel （大约 16x16 像素）至 
guilabel非常打/guilabel （大约 128x128 像素）。
 
 #: Thunar.xml827(guilabel)
 msgid Show Icon Emblems
-msgstr 
+msgstr 显示徽标
 
 #: Thunar.xml829(para)
 msgid Select this option to display emblems for folders in the side pane. You 
can assign emblems to folders in the guilabelProperties/guilabel dialog. 
Select a folder in the main area and choose 
menuchoiceguimenuFile/guimenuguimenuitemProperties.../guimenuitem/menuchoice
 from the main menu, or right-click the folder and select 
menuchoiceguimenuitemProperties.../guimenuitem/menuchoice from the 
context menu.
-msgstr 
+msgstr 选择此选项用来在侧边栏中显示文件夹的徽标。您可以在 guilabel属性/guilabel 
对话框中为每个文件夹指定徽标。即选中主区域中的文件夹，从主菜单中选择 
menuchoiceguimenu文件/guimenuguimenuitem属性.../guimenuitem/menuchoice 
，或右击文件夹从交互菜单中选择 menuchoiceguimenuitem属性.../guimenuitem/menuchoice 。
 
 #: Thunar.xml843(title) Thunar.xml856(phrase)
 msgid Behavior Preferences
@@ -673,7 +673,7 @@ msgstr 行为首选项
 
 #: Thunar.xml845(para)
 msgid You can select the preferred behavior to interact with the file 
manager.
-msgstr 
+msgstr 您可以根据喜好选择与文件管理器互动的行为。
 
 #: Thunar.xml863(guilabel)
 msgid Single click to active items
@@ -681,11 +681,11 @@ msgstr 单击以便激活项目
 
 #: Thunar.xml865(para)
 msgid Select this option to perform the default action for an item when you 
click on the item. When this option is selected, and you point to an item, the 
title of the item is underlined and the item will be selected

[Xfce4-commits] thunar:master l10n: Updated Chinese (China) (zh_CN) translation to 84%

2011-04-29 Thread Transifex 
Updating branch refs/heads/master
 to c7828af615f19e2c2f395f209d3c9737d4f62aa8 (commit)
   from d24160e438fb943fbffa185068eec3a65a19842e (commit)

commit c7828af615f19e2c2f395f209d3c9737d4f62aa8
Author: Chipong Luo chipon...@yahoo.com
Date:   Sat Apr 30 04:17:04 2011 +0200

l10n: Updated Chinese (China) (zh_CN) translation to 84%

New status: 249 messages complete with 0 fuzzies and 44 untranslated.

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

 docs/manual/po/zh_CN.po |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/manual/po/zh_CN.po b/docs/manual/po/zh_CN.po
index 2c7941d..547d154 100644
--- a/docs/manual/po/zh_CN.po
+++ b/docs/manual/po/zh_CN.po
@@ -709,7 +709,7 @@ msgstr 文件夹权限
 
 #: Thunar.xml915(para)
 msgid Choose the action that should be performed when you change the 
permissions of a folder in the guilabelProperties/guilabel dialog. You can 
choose to let applicationThunar/application ask everytime when you change 
folder permissions, tell it to default to applying the new permissions to the 
folder only or to apply them recursively to the folder contents as well.
-msgstr 
+msgstr 在 guilabel属性/guilabel 对话框内选择当您更改文件夹权限时要执行的动作。在您更改文件夹权限时，您可以选择让 
applicationThunar/application 每次都询问是使用默认的将更改仅应用到所选文件夹，还是将更改递归地应用到子文件夹及其内容。
 
 #: Thunar.xml925(guilabel)
 msgid Volume Management
@@ -717,7 +717,7 @@ msgstr 卷管理
 
 #: Thunar.xml927(para)
 msgid If applicationThunar/application was installed with support for HAL 
and the applicationthunar-volman/application package is also installed, you 
can enable the integrated volume manager. See xref 
linkend=\management-of-removable-drives-and-media\/ for details about this 
feature.
-msgstr 
+msgstr 如果 applicationThunar/application 已安装且支持 HAL ，并且 
applicationthunar-volman/application 也安装了，您就可以启用整合的卷管理。此功能的详情请参阅 xref 
linkend=\management-of-removable-drives-and-media\/ 。
 
 #: Thunar.xml940(title)
 msgid Customizing Thunar
@@ -733,7 +733,7 @@ msgstr “发送至” 菜单
 
 #: Thunar.xml950(para)
 msgid Thunar includes a guilabelSend To/guilabel menu, which provides 
possible targets where files and folders can be sent to. To access the 
guilabelSend To/guilabel menu, choose 
menuchoiceguimenuFile/guimenuguimenuitemSend 
To/guimenuitem/menuchoice from the main menu, or right-click on a file or 
folder and choose menuchoiceguimenuitemSend To/guimenuitem/menuchoice.
-msgstr 
+msgstr Thunar 有一将文件和文件夹发送到某个地方的 guilabel发送至/guilabel 菜单。从主菜单中选择 
menuchoiceguimenu文件/guimenuguimenuitem发送至/guimenuitem/menuchoice 
，或右击文件或文件夹并选择 menuchoiceguimenuitem发送至/guimenuitem/menuchoice 即可访问 
guilabel发送至/guilabel 菜单。
 
 #: Thunar.xml964(phrase)
 msgid \Send To\ Menu
@@ -741,11 +741,11 @@ msgstr “发送至” 菜单
 
 #: Thunar.xml969(para)
 msgid By default, the guilabelSend To/guilabel menu includes an entry 
named guilabelDesktop (Create Link)/guilabel for all files and folders, 
which simply creates a link on the desktop for each selected file. In addition, 
if the guilabelShortcuts Pane/guilabel is active, the menu also includes an 
entry called guilabelSide Pane (Create Shortcut)/guilabel for folders, 
which allows users to add new shortcuts to the side pane. Following these 
entries, applicationThunar/application lists the removable drives currently 
plugged into the computer. In the screenshot above, the guilabelFloppy 
Drive/guilabel represents a possible target where files can be sent to. Note 
that the device is mounted automatically once selected from the guilabelSend 
To/guilabel menu, so you do not need to manually mount it.
-msgstr 
+msgstr 默认情况下， guilabel发送至/guilabel 菜单中有一个 guilabel桌面 (创建链接)/guilabel 
条目，此条目仅为桌面上选中的文件创建链接。而且，如果 guilabel快捷方式栏/guilabel 已运行，菜单中也有一个 
guilabel侧边栏（创建快捷方式）/guilabel 条目，此条目可以在侧边栏中为每个文件夹添加快捷方式。顺着这些条目， 
applicationThunar/application 列出当前接入计算机的可移动驱动器。在上面的截图中， 
guilabel软盘驱动器/guilabel 表示文件可被发送至的可能目的地。注意在您从菜单中选择 guilabel发送至/guilabel 
时，设备自动挂载，所以您无需手动挂载它。
 
 #: Thunar.xml979(para)
 msgid In addition applicationThunar/application also ships the 
applicationthunar-sendto-email/application plugin, which adds the entry 
guilabelMail Recipient/guilabel to the menu, that opens the mail composer 
with the selected files attach to the new email. If the selection contains 
atleast one folder, the selected items are added to a ZIP archive before 
attaching them to the email. Otherwise, if the selection contains multiple 
files, or a single file, which is larger than 200Kib, the user will be prompted 
whether to pack the files into a ZIP archive, and send the ZIP archive.
-msgstr 
+msgstr 而且， applicationThunar/application 还有 
applicationthunar-sendto-email/application 插件，此插件在菜单中添加 
guilabel邮件接收人/guilabel 条目，点击此条目打开邮件撰写且把选中文件当作邮件附件。如果选中的项目包含文件夹，那么此项目先压缩为 
ZIP 档案然后再添加为邮件附件。如果选择的项目是混合文件，或超过 200K 的单个文件，会先询问用户是否打包并存入 ZIP 档案。
 
 #: Thunar.xml987(para)
 msgid Like most other features of applicationThunar/application, the 
guilabelSend to/guilabel menu can be easily extended by users and 
application developers with new