From 3bb09e2a1ab068bd868ce12436d32d7c62c743a5 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Mon, 21 Nov 2005 12:08:18 +0000 Subject: [PATCH] Fixes #321778 2005-11-21 Jens Granseuer Fixes #321778 * gnome-settings-daemon/gnome-settings-keyboard.c (numlock_set_xkb_state, numlock_get_gconf_state): C89 compilation fixes. --- gnome-settings-daemon/ChangeLog | 8 ++++++++ gnome-settings-daemon/gnome-settings-keyboard.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index a70db886d..e7b5396fb 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,11 @@ +2005-11-21 Jens Granseuer + + Fixes #321778 + + * gnome-settings-daemon/gnome-settings-keyboard.c + (numlock_set_xkb_state, numlock_get_gconf_state): C89 compilation + fixes. + 2005-11-14 Sebastien Bacher * gnome-settings-xsettings.c: diff --git a/gnome-settings-daemon/gnome-settings-keyboard.c b/gnome-settings-daemon/gnome-settings-keyboard.c index bf417a425..8ff1eff46 100644 --- a/gnome-settings-daemon/gnome-settings-keyboard.c +++ b/gnome-settings-daemon/gnome-settings-keyboard.c @@ -140,10 +140,11 @@ numlock_NumLock_modifier_mask () static void numlock_set_xkb_state (gboolean new_state) { + unsigned int num_mask; Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); if (new_state != NUMLOCK_STATE_ON && new_state != NUMLOCK_STATE_OFF) return; - unsigned num_mask = numlock_NumLock_modifier_mask (); + num_mask = numlock_NumLock_modifier_mask (); XkbLockModifiers (dpy, XkbUseCoreKbd, num_mask, new_state ? num_mask : 0); } @@ -162,12 +163,13 @@ numlock_gconf_state_key () static int numlock_get_gconf_state () { + int curr_state; GConfClient *gcc; GError *err = NULL; char *key = numlock_gconf_state_key (); if (!key) return NUMLOCK_STATE_UNKNOWN; gcc = gnome_settings_daemon_get_conf_client (); - int curr_state = gconf_client_get_bool (gcc, key, &err); + curr_state = gconf_client_get_bool (gcc, key, &err); if (err) curr_state = NUMLOCK_STATE_UNKNOWN; g_clear_error (&err); g_free (key);