s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't include cspi/spi.h if CSPI-1.0 is disabled.

Browse Source
This commit is contained in:
Daiki Ueno
2011-04-19 10:08:57 +09:00
parent 77c00a10da
commit 0691766a31
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/client-main.c
View File

@ -20,10 +20,12 @@
#endif /* HAVE_CONFIG_H */ #endif /* HAVE_CONFIG_H */
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_CSPI
#include <cspi/spi.h> #include <cspi/spi.h>
#include <gconf/gconf-client.h>
#endif /* HAVE_CSPI */
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gconf/gconf-client.h>
#include "eekboard/eekboard.h" #include "eekboard/eekboard.h"
#include "client.h" #include "client.h"
@ -34,10 +36,8 @@ static gboolean opt_session = FALSE;
static gchar *opt_address = NULL; static gchar *opt_address = NULL;
static gboolean opt_use_system_layout = FALSE; static gboolean opt_use_system_layout = FALSE;
#ifdef HAVE_CSPI
static gboolean opt_focus = FALSE; static gboolean opt_focus = FALSE;
static gboolean opt_keystroke = FALSE; static gboolean opt_keystroke = FALSE;
#endif /* HAVE_CSPI */
static gchar *opt_keyboard = NULL; static gchar *opt_keyboard = NULL;
@ -117,7 +117,9 @@ main (int argc, char **argv)
GBusType bus_type; GBusType bus_type;
GDBusConnection *connection; GDBusConnection *connection;
GError *error; GError *error;
#ifdef HAVE_CSPI
GConfClient *gconfc; GConfClient *gconfc;
#endif /* HAVE_CSPI */
GOptionContext *option_context; GOptionContext *option_context;
GMainLoop *loop; GMainLoop *loop;
@ -173,9 +175,9 @@ main (int argc, char **argv)
exit (1); exit (1);
} }
#ifdef HAVE_CSPI
gconfc = gconf_client_get_default (); gconfc = gconf_client_get_default ();
#ifdef HAVE_CSPI
error = NULL; error = NULL;
if (opt_focus || opt_keystroke) { if (opt_focus || opt_keystroke) {
if (gconf_client_get_bool (gconfc, if (gconf_client_get_bool (gconfc,