GNOME Bugzilla – Bug 724277
keyboard: Move code to get the XkbRF_VarDefsRec here
Last modified: 2014-02-13 14:49:00 UTC
We need this in g-s-d before I can land https://bugzilla.gnome.org/show_bug.cgi?id=719942 on gnome-desktop to keep things working.
Created attachment 268993 [details] [review] keyboard: Move code to get the XkbRF_VarDefsRec here GnomeXkbInfo needs to drop its X dependency to be used on a wayland compositor gnome-shell and in that case the xkb data path is an implementation detail. This g-s-d plugin will still be used on X only setups so we'll move the code here.
Review of attachment 268993 [details] [review]: ::: configure.ac @@ +197,3 @@ PKG_CHECK_MODULES(KEYBOARD, xkbfile $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) +XKB_BASE=$($PKG_CONFIG --variable xkb_base xkeyboard-config) You'll need to check at least once for the xkeyboard-config pkg-config file. ::: plugins/keyboard/gsd-keyboard-manager.c @@ +49,3 @@ +#endif +#ifndef XKB_MODEL +#define XKB_MODEL "pc105+inet" Could you move those to a separate header file? @@ +927,2 @@ static void +get_var_defs (gchar **rules, And those to a separate .c file?
Created attachment 269009 [details] [review] keyboard: Move code to get the XkbRF_VarDefsRec here GnomeXkbInfo needs to drop its X dependency to be used on a wayland compositor gnome-shell and in that case the xkb data path is an implementation detail. This g-s-d plugin will still be used on X only setups so we'll move the code here. -- Ok, there's more stuff that could be moved into this new utils file but for now let's just start with these methods.
Review of attachment 269009 [details] [review]: Looks good
Attachment 269009 [details] pushed as b462e65 - keyboard: Move code to get the XkbRF_VarDefsRec here