From b16ef6d7cda7c97c63a1ca21ebfe397d9f7e01ad Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Tue, 23 Apr 2002 18:27:19 +0000 Subject: [PATCH] suppress warning. 2002-04-23 Jody Goldberg * gnome-settings-accessibility-keyboard.c (get_xkb_desc_rec) : suppress warning. --- gnome-settings-daemon/ChangeLog | 5 +++++ .../gnome-settings-accessibility-keyboard.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index c3fbc994e..1fcecfff8 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,8 @@ +2002-04-23 Jody Goldberg + + * gnome-settings-accessibility-keyboard.c (get_xkb_desc_rec) : + suppress warning. + 2002-04-17 Rachel Hestilow * GNOME_SettingsDaemon.server.in: s/gnome2/gnome diff --git a/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c b/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c index 984d904b2..280ab6d05 100644 --- a/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c +++ b/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c @@ -68,8 +68,8 @@ xkb_enabled (void) static XkbDescRec * get_xkb_desc_rec (void) { - XkbDescRec *desc; - Status status; + XkbDescRec *desc; + Status status = Success; /* Any bogus value, to suppress warning */ if (!xkb_enabled ()) return NULL; @@ -83,9 +83,9 @@ get_xkb_desc_rec (void) XSync (GDK_DISPLAY (), FALSE); gdk_error_trap_pop (); - g_return_val_if_fail (status == Success, NULL); g_return_val_if_fail (desc != NULL, NULL); g_return_val_if_fail (desc->ctrls != NULL, NULL); + g_return_val_if_fail (status == Success, NULL); return desc; }