1 9178 bc99092 --- control-center-2.16.0/config.h.in-orig 2006-09-05 14:38:47.724266000 -0500 2 9178 bc99092 +++ control-center-2.16.0/config.h.in 2006-09-05 14:39:07.362578000 -0500 3 9178 bc99092 @@ -45,6 +45,9 @@ 4 9178 bc99092 /* Defined when evolution-data-server libebook-1.2 is detected */ 5 9178 bc99092 #undef HAVE_LIBEBOOK 6 8624 gf115653 7 9178 bc99092 +/* Defined when libxklavier is detected */ 8 9178 bc99092 +#undef HAVE_LIBXKLAVIER 9 9178 bc99092 + 10 9178 bc99092 /* Define to 1 if you have the <locale.h> header file. */ 11 9178 bc99092 #undef HAVE_LOCALE_H 12 8624 gf115653 13 9178 bc99092 --- control-center-2.16.0/configure.in-orig 2006-09-05 14:23:13.639863000 -0500 14 9178 bc99092 +++ control-center-2.16.0/configure.in 2006-09-05 14:56:41.467141000 -0500 15 9178 bc99092 @@ -109,9 +109,19 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-d 16 9178 bc99092 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0) 17 9178 bc99092 PKG_CHECK_MODULES(SOUND_CAPPLET, esound gstreamer-0.10) 18 9178 bc99092 PKG_CHECK_MODULES(METACITY, libmetacity-private) 19 9178 bc99092 -PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= 2.91,, 20 9178 bc99092 - AC_MSG_ERROR([gnome-control-center depends on libxklavier >= 2.91. 21 9178 bc99092 -The latest release is available from http://prdownloads.sourceforge.net/gswitchit], 1)) 22 8624 gf115653 + 23 9178 bc99092 +AC_ARG_ENABLE(libxklavier, 24 9178 bc99092 + AC_HELP_STRING([--disable-xklavier], 25 9178 bc99092 + [Do not build with libxklavier support]),, 26 9178 bc99092 + enable_libxklavier=yes) 27 8624 gf115653 + 28 9178 bc99092 +if test x$enable_libxklavier = xyes; then 29 9178 bc99092 + PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= 2.91,, 30 9178 bc99092 + AC_MSG_ERROR([gnome-control-center depends on libxklavier >= 2.91. 31 9178 bc99092 + The latest release is available from http://prdownloads.sourceforge.net/gswitchit], 1)) 32 9178 bc99092 + AC_DEFINE([HAVE_LIBXKLAVIER], 1, [Defined when libxklavier is detected]) 33 9178 bc99092 +fi 34 9178 bc99092 +AM_CONDITIONAL(HAVE_LIBXKLAVIER, [test $enable_libxklavier = yes]) 35 9178 bc99092 36 9178 bc99092 dnl 37 9178 bc99092 dnl Check for Xft version 2; we build in extra functionality to the font capplet 38 9178 bc99092 --- control-center-2.16.0/Makefile.am-orig 2006-09-05 14:27:01.521538000 -0500 39 9178 bc99092 +++ control-center-2.16.0/Makefile.am 2006-09-05 14:42:22.605183000 -0500 40 9178 bc99092 @@ -1,4 +1,11 @@ 41 9178 bc99092 -SUBDIRS = po libsounds libbackground libwindow-settings libgswitchit libkbdraw gnome-settings-daemon capplets control-center help vfs-methods idl schemas $(TYPING_BREAK) 42 8624 gf115653 + 43 9178 bc99092 +SUBDIRS = po libsounds libbackground libwindow-settings 44 8624 gf115653 + 45 9178 bc99092 +if HAVE_LIBXKLAVIER 46 9178 bc99092 +SUBDIRS += libgswitchit 47 9178 bc99092 +endif 48 8624 gf115653 + 49 9178 bc99092 +SUBDIRS += libkbdraw gnome-settings-daemon capplets control-center help vfs-methods idl schemas $(TYPING_BREAK) 50 9178 bc99092 51 9178 bc99092 ACLOCAL_AMFLAGS = -I m4 52 9178 bc99092 53 9178 bc99092 --- control-center-2.16.0/capplets/keyboard/Makefile.am-orig 2005-08-26 05:39:16.000000000 -0500 54 9178 bc99092 +++ control-center-2.16.0/capplets/keyboard/Makefile.am 2006-09-05 16:23:02.519745000 -0500 55 9178 bc99092 @@ -1,16 +1,23 @@ 56 9178 bc99092 bin_PROGRAMS = gnome-keyboard-properties 57 9178 bc99092 58 9178 bc99092 +if HAVE_LIBXKLAVIER 59 9178 bc99092 +LIBXKLAVIER_FILES = \ 60 9178 bc99092 + gnome-keyboard-properties-xkb.c \ 61 9178 bc99092 + gnome-keyboard-properties-xkbmc.c \ 62 9178 bc99092 + gnome-keyboard-properties-xkblt.c \ 63 9178 bc99092 + gnome-keyboard-properties-xkbot.c \ 64 9178 bc99092 + gnome-keyboard-properties-xkbpv.c \ 65 9178 bc99092 + gnome-keyboard-properties-xkb.h 66 9178 bc99092 +SWITCHIT_LIB = ../../libgswitchit/libgswitchit.a 67 9178 bc99092 +endif 68 8624 gf115653 + 69 8624 gf115653 + 70 9178 bc99092 gnome_keyboard_properties_SOURCES = gnome-keyboard-properties.c \ 71 9178 bc99092 - gnome-keyboard-properties-xkb.c \ 72 9178 bc99092 - gnome-keyboard-properties-xkbmc.c \ 73 9178 bc99092 - gnome-keyboard-properties-xkblt.c \ 74 9178 bc99092 - gnome-keyboard-properties-xkbot.c \ 75 9178 bc99092 - gnome-keyboard-properties-xkbpv.c \ 76 9178 bc99092 - gnome-keyboard-properties-xkb.h 77 9178 bc99092 + $(LIBXKLAVIER_FILES) 78 9178 bc99092 gnome_keyboard_properties_LDADD = \ 79 9178 bc99092 ../accessibility/keyboard/libaccessibility-keyboard.a \ 80 9178 bc99092 $(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \ 81 9178 bc99092 - ../../libgswitchit/libgswitchit.a \ 82 9178 bc99092 + $(SWITCHIT_LIB) \ 83 9178 bc99092 ../../libkbdraw/libkbdraw.a 84 9178 bc99092 85 9178 bc99092 @INTLTOOL_DESKTOP_RULE@ 86 9178 bc99092 --- control-center-2.16.0/gnome-settings-daemon/Makefile.am-orig 2006-09-05 14:31:50.705975000 -0500 87 9178 bc99092 +++ control-center-2.16.0/gnome-settings-daemon/Makefile.am 2006-09-05 15:03:27.781221000 -0500 88 9178 bc99092 @@ -9,6 +9,14 @@ INCLUDES=$(DBUS_CFLAGS) $(LIBXKLAVIER_CF 89 9178 bc99092 90 9178 bc99092 libexec_PROGRAMS=gnome-settings-daemon 91 9178 bc99092 92 9178 bc99092 +if HAVE_LIBXKLAVIER 93 9178 bc99092 +LIBXKLAVIER_FILES = \ 94 9178 bc99092 + gnome-settings-keyboard-xkb.h \ 95 9178 bc99092 + gnome-settings-keyboard-xkb.c 96 9178 bc99092 +SWITCHIT_LIB = \ 97 9178 bc99092 + $(top_builddir)/libgswitchit/libgswitchit.a 98 9178 bc99092 +endif 99 8624 gf115653 + 100 9178 bc99092 gnome_settings_daemon_SOURCES = \ 101 9178 bc99092 factory.c \ 102 9178 bc99092 eggaccelerators.h \ 103 9178 bc99092 @@ -21,8 +29,7 @@ gnome_settings_daemon_SOURCES = \ 104 9178 bc99092 gnome-settings-mouse.c \ 105 9178 bc99092 gnome-settings-multimedia-keys.h \ 106 9178 bc99092 gnome-settings-multimedia-keys.c \ 107 9178 bc99092 - gnome-settings-keyboard-xkb.h \ 108 9178 bc99092 - gnome-settings-keyboard-xkb.c \ 109 9178 bc99092 + $(LIBXKLAVIER_FILES) \ 110 9178 bc99092 gnome-settings-keyboard.h \ 111 9178 bc99092 gnome-settings-keyboard.c \ 112 9178 bc99092 gnome-settings-background.h \ 113 9178 bc99092 @@ -71,7 +78,7 @@ gnome_settings_daemon_LDADD = \ 114 9178 bc99092 $(LIBXKLAVIER_LIBS) \ 115 9178 bc99092 $(top_builddir)/libbackground/libbackground.la \ 116 9178 bc99092 $(top_builddir)/libsounds/libsounds.a \ 117 9178 bc99092 - $(top_builddir)/libgswitchit/libgswitchit.a \ 118 9178 bc99092 + $(SWITCHIT_LIB) \ 119 9178 bc99092 $(top_builddir)/libwindow-settings/libgnome-window-settings.la \ 120 9178 bc99092 $(top_builddir)/gnome-settings-daemon/actions/libacme.la \ 121 9178 bc99092 $(GNOME_SETTINGS_DAEMON_LIBS) \ 122 9178 bc99092 --- control-center-2.16.0/gnome-settings-daemon/gnome-settings-daemon.c-orig 2006-09-05 14:33:13.786899000 -0500 123 9178 bc99092 +++ control-center-2.16.0/gnome-settings-daemon/gnome-settings-daemon.c 2006-09-05 15:01:11.257424000 -0500 124 9178 bc99092 @@ -46,7 +46,9 @@ 125 9178 bc99092 #include "gnome-settings-font.h" 126 9178 bc99092 #include "gnome-settings-xsettings.h" 127 9178 bc99092 #include "gnome-settings-mouse.h" 128 9178 bc99092 +#ifdef HAVE_LIBXKLAVIER 129 9178 bc99092 #include "gnome-settings-keyboard-xkb.h" 130 9178 bc99092 +#endif 131 9178 bc99092 #include "gnome-settings-keyboard.h" 132 9178 bc99092 #include "gnome-settings-background.h" 133 9178 bc99092 #include "gnome-settings-sound.h" 134 9178 bc99092 @@ -325,9 +327,11 @@ gnome_settings_daemon_new (void) 135 9178 bc99092 gnome_settings_font_init (client); 136 8624 gf115653 gnome_settings_xsettings_init (client); 137 8624 gf115653 gnome_settings_mouse_init (client); 138 9178 bc99092 +#ifdef HAVE_LIBXKLAVIER 139 8624 gf115653 /* Essential - xkb initialization should happen before */ 140 8624 gf115653 gnome_settings_keyboard_xkb_set_post_activation_callback ((PostActivationCallback)gnome_settings_load_modmap_files, NULL); 141 8624 gf115653 gnome_settings_keyboard_xkb_init (client); 142 9178 bc99092 +#endif 143 8624 gf115653 gnome_settings_keyboard_init (client); 144 8624 gf115653 gnome_settings_multimedia_keys_init (client); 145 8624 gf115653 /* */ 146 9178 bc99092 @@ -380,8 +384,10 @@ gnome_settings_daemon_new (void) 147 9178 bc99092 gnome_settings_font_load (client); 148 8624 gf115653 gnome_settings_xsettings_load (client); 149 8624 gf115653 gnome_settings_mouse_load (client); 150 9178 bc99092 +#ifdef HAVE_LIBXKLAVIER 151 8624 gf115653 /* Essential - xkb initialization should happen before */ 152 8624 gf115653 gnome_settings_keyboard_xkb_load (client); 153 9178 bc99092 +#endif 154 8624 gf115653 gnome_settings_keyboard_load (client); 155 8624 gf115653 gnome_settings_multimedia_keys_load (client); 156 8624 gf115653 /* */ 157 9178 bc99092 --- control-center-2.16.0/capplets/keyboard/gnome-keyboard-properties.c-orig 2006-09-05 14:29:11.146860000 -0500 158 9178 bc99092 +++ control-center-2.16.0/capplets/keyboard/gnome-keyboard-properties.c 2006-09-05 15:55:44.488954000 -0500 159 9178 bc99092 @@ -38,7 +38,9 @@ 160 9178 bc99092 #include "capplet-stock-icons.h" 161 9178 bc99092 #include <../accessibility/keyboard/accessibility-keyboard.h> 162 9178 bc99092 163 9178 bc99092 +#ifdef HAVE_LIBXKLAVIER 164 9178 bc99092 #include "gnome-keyboard-properties-xkb.h" 165 9178 bc99092 +#endif 166 9178 bc99092 167 9178 bc99092 enum 168 9178 bc99092 { 169 9178 bc99092 @@ -169,7 +171,9 @@ setup_dialog (GladeXML *dialog, 170 9178 bc99092 171 9178 bc99092 gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("break_enabled_toggle"))->child), TRUE); 172 9178 bc99092 173 9178 bc99092 +#ifdef HAVE_LIBXKLAVIER 174 9178 bc99092 setup_xkb_tabs(dialog,changeset); 175 9178 bc99092 +#endif 176 9178 bc99092 } 177 9178 bc99092 178 9178 bc99092 static void 179 9178 bc99092 @@ -250,8 +254,19 @@ main (int argc, char **argv) 180 9178 bc99092 changeset = NULL; 181 9178 bc99092 dialog = create_dialog (); 182 9178 bc99092 setup_dialog (dialog, changeset); 183 9178 bc99092 + 184 9178 bc99092 +#ifndef HAVE_LIBXKLAVIER 185 9178 bc99092 + /* Do not display Layout tabs if libxklavier is not enabled */ 186 9178 bc99092 + gtk_notebook_remove_page (GTK_NOTEBOOK (WID ("keyboard_notebook")), 2); 187 9178 bc99092 + gtk_notebook_remove_page (GTK_NOTEBOOK (WID ("keyboard_notebook")), 1); 188 9178 bc99092 +#endif 189 9178 bc99092 + 190 9178 bc99092 if (switch_to_typing_break_page) { 191 9178 bc99092 +#ifdef HAVE_LIBXKLAVIER 192 9178 bc99092 gtk_notebook_set_current_page (GTK_NOTEBOOK (WID ("keyboard_notebook")), 3); 193 9178 bc99092 +#else 194 9178 bc99092 + gtk_notebook_set_current_page (GTK_NOTEBOOK (WID ("keyboard_notebook")), 1); 195 9178 bc99092 +#endif 196 9178 bc99092 } 197 9178 bc99092 capplet_set_icon (WID ("keyboard_dialog"), 198 9178 bc99092 "gnome-dev-keyboard"); 199
Indexes created Thu Nov 26 09:50:34 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.