[Fedora-i18n-bugs] [eekboard] Update eekboard-fix-disable-cspi.patch.

[Daiki Ueno]

commit b13ee8f432ae882ccb39cfa7190ed1bb09fbf339
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Tue Apr 19 10:22:31 2011 +0900

    Update eekboard-fix-disable-cspi.patch.

 eekboard-fix-disable-cspi.patch |   48 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 42 insertions(+), 6 deletions(-)
---
diff --git a/eekboard-fix-disable-cspi.patch b/eekboard-fix-disable-cspi.patch
index 5c25181..e7ca211 100644
--- a/eekboard-fix-disable-cspi.patch
+++ b/eekboard-fix-disable-cspi.patch
@@ -1,26 +1,62 @@
-From 871799df5092c5e2063ae405e9296f19d8df4f57 Mon Sep 17 00:00:00 2001
+From 0691766a316269aa88f2715beddc53959fcb5c09 Mon Sep 17 00:00:00 2001
 From: Daiki Ueno <ueno at unixuser.org>
 Date: Tue, 19 Apr 2011 10:08:57 +0900
 Subject: [PATCH] Don't include cspi/spi.h if CSPI-1.0 is disabled.
 
 ---
- src/client-main.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ src/client-main.c |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/src/client-main.c b/src/client-main.c
-index 0091e27..8e4d5cf 100644
+index 0091e27..722c0e1 100644
 --- a/src/client-main.c
 +++ b/src/client-main.c
-@@ -20,7 +20,9 @@
+@@ -20,10 +20,12 @@
  #endif  /* HAVE_CONFIG_H */
  
  #include <stdlib.h>
 +#ifdef HAVE_CSPI
  #include <cspi/spi.h>
++#include <gconf/gconf-client.h>
 +#endif  /* HAVE_CSPI */
  #include <gtk/gtk.h>
  #include <glib/gi18n.h>
- #include <gconf/gconf-client.h>
+-#include <gconf/gconf-client.h>
+ #include "eekboard/eekboard.h"
+ #include "client.h"
+ 
+@@ -34,10 +36,8 @@ static gboolean opt_session = FALSE;
+ static gchar *opt_address = NULL;
+ 
+ static gboolean opt_use_system_layout = FALSE;
+-#ifdef HAVE_CSPI
+ static gboolean opt_focus = FALSE;
+ static gboolean opt_keystroke = FALSE;
+-#endif  /* HAVE_CSPI */
+ 
+ static gchar *opt_keyboard = NULL;
+ 
+@@ -117,7 +117,9 @@ main (int argc, char **argv)
+     GBusType bus_type;
+     GDBusConnection *connection;
+     GError *error;
++#ifdef HAVE_CSPI
+     GConfClient *gconfc;
++#endif  /* HAVE_CSPI */
+     GOptionContext *option_context;
+     GMainLoop *loop;
+ 
+@@ -173,9 +175,9 @@ main (int argc, char **argv)
+         exit (1);
+     }
+ 
++#ifdef HAVE_CSPI
+     gconfc = gconf_client_get_default ();
+ 
+-#ifdef HAVE_CSPI
+     error = NULL;
+     if (opt_focus || opt_keystroke) {
+         if (gconf_client_get_bool (gconfc,
 -- 
 1.7.4.4