1 diff -up gnome-control-center-2.21.5/capplets/keyboard/Makefile.am.orig gnome-control-center-2.21.5/capplets/keyboard/Makefile.am 2 --- gnome-control-center-2.21.5/capplets/keyboard/Makefile.am.orig 2008-01-15 00:56:42.000000000 +0000 3 +++ gnome-control-center-2.21.5/capplets/keyboard/Makefile.am 2008-01-18 14:00:59.749645000 +0000 4 @@ -3,10 +3,8 @@ cappletname = keyboard 5 6 bin_PROGRAMS = gnome-keyboard-properties 7 8 -gnome_keyboard_properties_SOURCES = \ 9 - gnome-keyboard-properties.c \ 10 - gnome-keyboard-properties-a11y.c \ 11 - gnome-keyboard-properties-a11y.h \ 12 +if HAVE_GSWITCHIT 13 +GSWITCHIT_FILES = \ 14 gnome-keyboard-properties-xkb.c \ 15 gnome-keyboard-properties-xkbmc.c \ 16 gnome-keyboard-properties-xkblt.c \ 17 @@ -14,6 +12,13 @@ gnome_keyboard_properties_SOURCES = \ 18 gnome-keyboard-properties-xkbot.c \ 19 gnome-keyboard-properties-xkbpv.c \ 20 gnome-keyboard-properties-xkb.h 21 +endif 22 + 23 +gnome_keyboard_properties_SOURCES = \ 24 + gnome-keyboard-properties.c \ 25 + gnome-keyboard-properties-a11y.c \ 26 + gnome-keyboard-properties-a11y.h \ 27 + $(GSWITCHIT_FILES) 28 29 gnome_keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS) 30 31 --- gnome-control-center-2.25.92/capplets/keyboard/gnome-keyboard-properties.c.ori 2009-03-13 11:02:22.202010618 +0000 32 diff -up gnome-control-center-2.27.4.1/config.h.in.orig gnome-control-center-2.27.4.1/config.h.in 33 --- gnome-control-center-2.27.4.1/config.h.in.orig 2009-07-16 13:02:48.000000000 +0100 34 +++ gnome-control-center-2.27.4.1/config.h.in 2009-07-24 12:43:58.454618754 +0100 35 @@ -120,3 +120,7 @@ 36 37 /* Define to 1 if the X Window System is missing or not being used. */ 38 #undef X_DISPLAY_MISSING 39 + 40 +/* Defined when gswitchit is detected */ 41 +#undef HAVE_GSWITCHIT 42 + 43 44 +++ gnome-control-center-2.25.92/capplets/keyboard/gnome-keyboard-properties.c 2009-03-13 11:09:14.248747056 +0000 45 @@ -37,7 +37,9 @@ 46 #include "capplet-stock-icons.h" 47 48 #include "gnome-keyboard-properties-a11y.h" 49 +#ifdef HAVE_GSWITCHIT 50 #include "gnome-keyboard-properties-xkb.h" 51 +#endif 52 53 enum { 54 RESPONSE_APPLY = 1, 55 @@ -184,7 +186,9 @@ 56 g_signal_connect (WID ("keyboard_dialog"), "response", 57 (GCallback) dialog_response, changeset); 58 59 +#ifdef HAVE_GSWITCHIT 60 setup_xkb_tabs (dialog, changeset); 61 +#endif 62 setup_a11y_tabs (dialog, changeset); 63 } 64 65 @@ -243,18 +247,35 @@ 66 changeset = NULL; 67 dialog = create_dialog (); 68 setup_dialog (dialog, changeset); 69 +#ifndef HAVE_GSWITCHIT 70 + /* Do not display Layout tabs if libxklavier is not enabled */ 71 + gtk_notebook_remove_page (GTK_NOTEBOOK (WID ("keyboard_notebook")), 1); 72 +#endif 73 if (switch_to_typing_break_page) { 74 +#ifdef HAVE_GSWITCHIT 75 gtk_notebook_set_current_page (GTK_NOTEBOOK 76 (WID 77 ("keyboard_notebook")), 78 4); 79 +#else 80 + gtk_notebook_set_current_page (GTK_NOTEBOOK 81 + (WID 82 + ("keyboard_notebook")), 83 + 3); 84 +#endif 85 } 86 else if (switch_to_a11y_page) { 87 +#ifdef HAVE_GSWITCHIT 88 gtk_notebook_set_current_page (GTK_NOTEBOOK 89 (WID 90 ("keyboard_notebook")), 91 2); 92 - 93 +#else 94 + gtk_notebook_set_current_page (GTK_NOTEBOOK 95 + (WID 96 + ("keyboard_notebook")), 97 + 1); 98 +#endif 99 } 100 101 capplet_set_icon (WID ("keyboard_dialog"), 102 diff -ruN gnome-control-center-2.27.5.orig/configure.in gnome-control-center-2.27.5/configure.in 103 --- gnome-control-center-2.27.5.orig/configure.in 2009-08-12 15:40:06.139651543 +0100 104 +++ gnome-control-center-2.27.5/configure.in 2009-08-12 15:41:07.114874068 +0100 105 @@ -210,13 +210,21 @@ 106 dnl ============== 107 dnl gswitchit 108 dnl ============== 109 -PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.27.4 libxklavier >= 4.0]) 110 -AC_SUBST(LIBGNOMEKBD_CFLAGS) 111 -AC_SUBST(LIBGNOMEKBD_LIBS) 112 - 113 -PKG_CHECK_MODULES(LIBGNOMEKBDUI, [libgnomekbdui >= 2.21]) 114 -AC_SUBST(LIBGNOMEKBDUI_CFLAGS) 115 -AC_SUBST(LIBGNOMEKBDUI_LIBS) 116 +AC_ARG_ENABLE(gswitchit, 117 + AC_HELP_STRING([--disable-gswitchit], 118 + [Do not build with gswitchit support]),, 119 + enable_gswitchit=yes) 120 + 121 +if test x$enable_gswitchit = xyes; then 122 + PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4.1 libxklavier >= 4.0]) 123 + AC_SUBST(LIBGNOMEKBD_CFLAGS) 124 + AC_SUBST(LIBGNOMEKBD_LIBS) 125 + 126 + PKG_CHECK_MODULES(LIBGNOMEKBDUI, [libgnomekbdui >= 2.21]) 127 + AC_SUBST(LIBGNOMEKBDUI_CFLAGS) 128 + AC_SUBST(LIBGNOMEKBDUI_LIBS) 129 +fi 130 +AM_CONDITIONAL(HAVE_GSWITCHIT, [test $enable_gswitchit = yes]) 131 132 dnl ============================================== 133 dnl About-me 134