From d2fae32d816fcc5b50b9142d613d2c9a4d462bb1 Mon Sep 17 00:00:00 2001
From: pvalchev <pvalchev@openbsd.org>
Date: Sun, 4 Dec 2005 07:05:34 +0000
Subject: [PATCH] move variable declarations to beginning of blocks

---
 .../patches/patch-libxklavier_xklavier_c         | 15 +++++++++++++++
 .../patches/patch-libxklavier_xklavier_xmm_c     | 16 ++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 x11/gnome/libxklavier/patches/patch-libxklavier_xklavier_c
 create mode 100644 x11/gnome/libxklavier/patches/patch-libxklavier_xklavier_xmm_c

diff --git a/x11/gnome/libxklavier/patches/patch-libxklavier_xklavier_c b/x11/gnome/libxklavier/patches/patch-libxklavier_xklavier_c
new file mode 100644
index 00000000000..74fe66c58a4
--- /dev/null
+++ b/x11/gnome/libxklavier/patches/patch-libxklavier_xklavier_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-libxklavier_xklavier_c,v 1.1 2005/12/04 07:05:34 pvalchev Exp $
+--- libxklavier/xklavier.c.orig	Sat Dec  3 19:56:28 2005
++++ libxklavier/xklavier.c	Sat Dec  3 19:57:02 2005
+@@ -772,9 +772,10 @@ void _XklEnsureVTableInited( void )
+ {
+   if ( xklVTable == NULL )
+   {
++    char *p = NULL;
+     XklDebug( 0, "ERROR: XKL VTable is NOT initialized.\n" );
+     /* force the crash! */
+-    char *p = NULL; *p = '\0';
++    *p = '\0';
+   }
+ }
+ 
diff --git a/x11/gnome/libxklavier/patches/patch-libxklavier_xklavier_xmm_c b/x11/gnome/libxklavier/patches/patch-libxklavier_xklavier_xmm_c
new file mode 100644
index 00000000000..3e79427d2bc
--- /dev/null
+++ b/x11/gnome/libxklavier/patches/patch-libxklavier_xklavier_xmm_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-libxklavier_xklavier_xmm_c,v 1.1 2005/12/04 07:05:34 pvalchev Exp $
+--- libxklavier/xklavier_xmm.c.orig	Sat Dec  3 23:19:19 2005
++++ libxklavier/xklavier_xmm.c	Sat Dec  3 23:20:03 2005
+@@ -66,10 +66,11 @@ void _XklXmmUngrabShortcuts( )
+ const XmmSwitchOptionPtr _XklXmmGetCurrentShortcut()
+ {
+   const char* optionName = _XklXmmGetCurrentShortcutOptionName();
++  XmmSwitchOptionPtr switchOption;
+   XklDebug( 150, "Configured switch option: [%s]\n", optionName );
+   if( optionName == NULL )
+     return NULL;
+-  XmmSwitchOptionPtr switchOption = allSwitchOptions;
++  switchOption = allSwitchOptions;
+   while( switchOption->optionName != NULL )
+   {
+     if( !strcmp( switchOption->optionName, optionName ) )