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