applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://bugzilla.gnome.org/show_bug.cgi?id=148291 typo

Browse source 
2004-07-23  Jody Goldberg <jody@gnome.org>

	http://bugzilla.gnome.org/show_bug.cgi?id=148291
	* configure.in : typo

2004-06-07  Jody Goldberg <jody@gnome.org>

	* po/POTFILES.in : add server file, still unused without the patch
	* configure.in : ditto.

2004-06-01  Jody Goldberg <jody@gnome.org>

	* schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in : Add
	  xkb/update_handlers.
This commit is contained in:
Jody Goldberg 2004-08-28 01:42:25 +00:00 • committed by Jody Goldberg
parent c8763b95a7
commit 2ab41bb8cc
5 changed files with 47 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2004-07-23 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=148291
* configure.in : typo
2004-06-07 Jody Goldberg <jody@gnome.org>
* po/POTFILES.in : add server file, still unused without the patch
* configure.in : ditto.
2004-06-01 Jody Goldberg <jody@gnome.org>
* schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in : Add
xkb/update_handlers.
2004-08-17 Kjartan Maraas <kmaraas@gnome.org>
* configure.in: Added «nb» to ALL_LINGUAS.

6
NEWS
View file

@ -5,9 +5,15 @@ gnome-control-center 2.7.0
------------------------------------------------------------------------------
gnome-control-center 2.6.1
Jody:
* Add the ximian shell to the tarball and polish it up a bit
Michael Terry:
* Fix ui-review comments for keybinding capplet
Sergey:
* Add a hook to libgswitchit to notify when xkb is reloaded
Shailesh Mittal:
http://bugzilla.gnome.org/show_bug.cgi?id=114832
* IPV6 support in the file types capplet

3
configure.in
View file

@ -290,7 +290,7 @@ AC_SUBST(GDK_PIXBUF_CSOURCE)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
if text x"$GLIB_GENMARSHAL" = xno; then
if test x"$GLIB_GENMARSHAL" = xno; then
AC_MSG_ERROR([glib-genmarshal executable not found in your path - should be installed with glib])
fi
@ -519,6 +519,7 @@ gnome-settings-daemon/Makefile
gnome-settings-daemon/xrdb/Makefile
gnome-settings-daemon/actions/Makefile
control-center/Makefile
control-center/GNOME_ControlCenter.server
libbackground/Makefile
libwindow-settings/Makefile
libwindow-settings/gnome-window-settings-2.0.pc

22
gnome-settings-daemon/gnome-settings-keyboard-xkb.c
View file

@ -48,8 +48,8 @@ static gboolean initedOk;
static PostActivationCallback paCallback = NULL;
static void *paCallbackUserData = NULL;
static const char DISABLE_XMM_WARNING_KEY[] =
"/desktop/gnome/peripherals/keyboard/disable_xmm_and_xkb_warning";
#define DISABLE_XMM_WARNING_KEY \
"/desktop/gnome/peripherals/keyboard/disable_xmm_and_xkb_warning"
typedef enum {
RESPONSE_USE_X,
@ -217,16 +217,14 @@ gnome_settings_keyboard_xkb_chk_lcl_xmm (void)
if (homeDir == NULL)
return;
while ((fname = g_dir_read_name (homeDir)) != NULL)
if (strlen (fname) >= 8
&& !g_ascii_strncasecmp (fname, ".xmodmap", 8)) {
GtkWidget *msg =
gtk_message_dialog_new_with_markup (NULL, 0,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_OK,
_
("You have a keyboard remapping file (%s) in your home directory whose contents will now be ignored."
" You can use the keyboard preferences to restore them."),
fname);
if (strlen (fname) >= 8 &&
!g_ascii_strncasecmp (fname, ".xmodmap", 8)) {
GtkWidget *msg = gtk_message_dialog_new_with_markup (NULL, 0,
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
_("You have a keyboard remapping file (%s) in "
"your home directory whose contents are ignored by default. "
"Add it to /desktop/gnome/peripherals/keyboard/xkb/update_handlers"),
fname);
g_signal_connect (msg, "response",
G_CALLBACK
(gnome_settings_keyboard_xkb_chk_lcl_xmm_response),

36
schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in
View file

@ -2,15 +2,10 @@
<schemalist>
<schema>
<key>/schemas/desktop/gnome/peripherals/keyboard/xkb/overrideSettings</key>
<applyto>/desktop/gnome/peripherals/keyboard/xkb/overrideSettings</applyto>
<owner>gnome</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>XKB settings in gconf will be overridden from the system ASAP</short>
<long>Very soon, XKB settings in gconf will be overridden (from the system configuration)</long>
@ -19,15 +14,10 @@
<schema>
<key>/schemas/desktop/gnome/peripherals/keyboard/xkb/model</key>
<applyto>/desktop/gnome/peripherals/keyboard/xkb/model</applyto>
<owner>gnome</owner>
<type>string</type>
<default>pc105</default>
<locale name="C">
<short>XKB keyboard model</short>
<long>XKB keyboard model</long>
@ -36,17 +26,11 @@
<schema>
<key>/schemas/desktop/gnome/peripherals/keyboard/xkb/layouts</key>
<applyto>/desktop/gnome/peripherals/keyboard/xkb/layouts</applyto>
<owner>gnome</owner>
<type>list</type>
<list_type>string</list_type>
<default>[us]</default>
<locale name="C">
<short>XKB keyboard layout</short>
<long>XKB keyboard layout</long>
@ -55,22 +39,30 @@
<schema>
<key>/schemas/desktop/gnome/peripherals/keyboard/xkb/options</key>
<applyto>/desktop/gnome/peripherals/keyboard/xkb/options</applyto>
<owner>gnome</owner>
<type>list</type>
<list_type>string</list_type>
<default>[]</default>
<locale name="C">
<short>XKB options</short>
<long>XKB options</long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/peripherals/keyboard/xkb/update_handlers</key>
<applyto>/desktop/gnome/peripherals/keyboard/xkb/update_handlers</applyto>
<owner>gnome</owner>
<type>list</type>
<list_type>string</list_type>
<default>[]</default>
<locale name="C">
<short>XKB Update Handlers</short>
<long>A collection of scripts to run whenever the XKB state is
reloaded. Useful for re-applying xmodmap based adjustments</long>
</locale>
</schema>
</schemalist>
</gconfschemafile>