summaryrefslogtreecommitdiff
path: root/extra/xfce4-xkb-plugin
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2012-02-05 17:25:05 +0000
committerParabola <dev@list.parabolagnulinux.org>2012-02-05 17:25:05 +0000
commit359d940358dec836dd0acfe9d9caf0b1ff0a97fe (patch)
treeeeed5f77c8417a98fe5b8538d3c019d1cea00c04 /extra/xfce4-xkb-plugin
parentcdc66cc7110e78bf1197f9effc70422114f9341b (diff)
Sun Feb 5 17:25:01 UTC 2012
Diffstat (limited to 'extra/xfce4-xkb-plugin')
-rw-r--r--extra/xfce4-xkb-plugin/crashfix.diff34
-rw-r--r--extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch30
2 files changed, 0 insertions, 64 deletions
diff --git a/extra/xfce4-xkb-plugin/crashfix.diff b/extra/xfce4-xkb-plugin/crashfix.diff
deleted file mode 100644
index 5ccfbaa3c..000000000
--- a/extra/xfce4-xkb-plugin/crashfix.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From 52dc725bf5e44a0ab0064daebffe7ff139da0f78 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpouit@gmail.com>
-Date: Fri, 24 Sep 2010 21:28:49 +0200
-Subject: Handle cases when the keyboard model is empty
-
-gtk_combo_box_get_active_iter () does not set the iter, and a call to
-gtk_tree_model_get () using this iter will crash. Thus, check the return value
-of gtk_combo_box_get_active_iter () before using the iter.
----
- panel-plugin/xkb-settings-dialog.c | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c
-index 178ec5f..37a0a9a 100644
---- a/panel-plugin/xkb-settings-dialog.c
-+++ b/panel-plugin/xkb-settings-dialog.c
-@@ -831,9 +831,11 @@ xkb_settings_update_from_ui (t_xkb *xkb)
- gint i = 0;
-
- model = GTK_TREE_MODEL (xkb->combo_store);
-- gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter);
-- gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
-- kbd_config->model = kbdmodel;
-+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter))
-+ {
-+ gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
-+ kbd_config->model = kbdmodel;
-+ }
-
- model = GTK_TREE_MODEL (xkb->toggle_options_store);
- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter))
---
-1.7.1
-
diff --git a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch b/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
deleted file mode 100644
index 5b9dc5401..000000000
--- a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c
---- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c 2009-03-06 15:16:03.000000000 +0200
-+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2009-07-20 18:40:34.000000000 +0300
-@@ -150,7 +150,7 @@
- config->application_map = g_hash_table_new (g_direct_hash, NULL);
-
- registry = xkl_config_registry_get_instance (config->engine);
-- xkl_config_registry_load (registry);
-+ xkl_config_registry_load (registry, FALSE);
-
- config_item = xkl_config_item_new ();
-
-@@ -214,7 +214,7 @@
-
- gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
-
-- xkl_engine_stop_listen (config->engine);
-+ xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE);
- }
-
- gint
-@@ -547,7 +547,7 @@
- if (!config) return NULL;
-
- registry = xkl_config_registry_get_instance (config->engine);
-- xkl_config_registry_load (registry);
-+ xkl_config_registry_load (registry, FALSE);
-
- return registry;
- }