Updating branch refs/heads/4.10_panel_support
to 264ff9a488c5d4ddfabe6d954e509dd42301cf63 (commit)
from c7e8f482fd2ffd49feda3feea729f24a88271f37 (commit)
commit 264ff9a488c5d4ddfabe6d954e509dd42301cf63
Author: Szalai Bandi <szalai.ba...@gmail.com>
Date: Mon Jul 23 14:33:07 2012 -0400
Look for .rc file in system dirs as well.
The patch is from bug 3263.
(cherry picked from commit cb50bc31797bf34d4896fefdcd4c99641131854a)
panel-plugin/xfce4-xkb-plugin.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/xfce4-xkb-plugin.c b/panel-plugin/xfce4-xkb-plugin.c
index 6a0635a..e137ee2 100644
--- a/panel-plugin/xfce4-xkb-plugin.c
+++ b/panel-plugin/xfce4-xkb-plugin.c
@@ -168,7 +168,7 @@ xkb_new (XfcePanelPlugin *plugin)
xkb->settings = g_new0 (t_xkb_settings, 1);
xkb->plugin = plugin;
- filename = xfce_panel_plugin_save_location (plugin, TRUE);
+ filename = xfce_panel_plugin_lookup_rc_file (plugin);
if ((!filename) || (!xkb_load_config (xkb, filename)))
{
xkb_load_default (xkb);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
