gok r2513 - in branches/rm-dep: . gok

[gerdk svn gnome org]

Author: gerdk
Date: Fri Jul 25 10:51:57 2008
New Revision: 2513
URL: http://svn.gnome.org/viewvc/gok?rev=2513&view=rev

Log:
2008-07-25  Gerd Kohlberger  <gerdk svn gnome org>

	* gok/gok-input.c:
	* gok/gok-input.h:
	* gok/gok-key.c:
	* gok/gok-key.h:
	Use G_*_DECLS. Cleanup includes.



Modified:
   branches/rm-dep/ChangeLog
   branches/rm-dep/gok/gok-input.c
   branches/rm-dep/gok/gok-input.h
   branches/rm-dep/gok/gok-key.c
   branches/rm-dep/gok/gok-key.h

Modified: branches/rm-dep/gok/gok-input.c
==============================================================================
--- branches/rm-dep/gok/gok-input.c	(original)
+++ branches/rm-dep/gok/gok-input.c	Fri Jul 25 10:51:57 2008
@@ -23,11 +23,11 @@
 #  include <config.h>
 #endif
 
-#include <gnome.h>
-
-#include <gdk/gdk.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gconf/gconf-client.h>
+
 #include "gok-gconf-keys.h"
 #include "gok-log.h"
 #include "gok-input.h"

Modified: branches/rm-dep/gok/gok-input.h
==============================================================================
--- branches/rm-dep/gok/gok-input.h	(original)
+++ branches/rm-dep/gok/gok-input.h	Fri Jul 25 10:51:57 2008
@@ -27,6 +27,8 @@
 #include <X11/extensions/XInput.h>
 #endif
 
+G_BEGIN_DECLS
+
 #define N_INPUT_TYPES 5
 
 typedef enum {
@@ -37,10 +39,6 @@
   GOK_INPUT_TYPE_KEY_RELEASE    = 4
 } GokInputType;
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 typedef struct _GokInput GokInput;
 struct _GokInput {
         char        *name;
@@ -72,8 +70,7 @@
 #ifdef HAVE_XINPUT
 void       gok_input_mismatch_warn (XDeviceInfo *devinfo);
 #endif
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
 
 #endif /* #ifndef __GOKINPUT_H__ */

Modified: branches/rm-dep/gok/gok-key.c
==============================================================================
--- branches/rm-dep/gok/gok-key.c	(original)
+++ branches/rm-dep/gok/gok-key.c	Fri Jul 25 10:51:57 2008
@@ -24,7 +24,9 @@
 #endif
 
 #include <string.h>
-#include <gnome.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
 #include "gok-key.h"
 #include "gok-keyboard.h"
 #include "gok-mousecontrol.h"

Modified: branches/rm-dep/gok/gok-key.h
==============================================================================
--- branches/rm-dep/gok/gok-key.h	(original)
+++ branches/rm-dep/gok/gok-key.h	Fri Jul 25 10:51:57 2008
@@ -22,22 +22,19 @@
 #ifndef __GOKKEY_H__
 #define __GOKKEY_H__
 
+#include <gtk/gtk.h>
+
 #define XK_MISCELLANY
 #include <X11/Xlib.h>
 #include <X11/keysymdef.h>
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKBgeom.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <gnome.h>
+
 #include "gok-spy-priv.h"
 #include "gok-output.h"
 #include "gok-word-complete.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* general type of key */
 typedef enum {
@@ -273,8 +270,6 @@
 unsigned int gok_key_get_numlock_mask (Display *display);
 gchar * gok_key_modifier_for_keycode (Display *display, XkbDescPtr xkb, int keycode);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* #ifndef __GOKKEY_H__ */