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