diff options
-rw-r--r-- | colorblind/keybinder/eggaccelerators.h | 2 | ||||
-rw-r--r-- | colorblind/keybinder/tomboykeybinder.c | 1 | ||||
-rw-r--r-- | colorblind/keybinder/tomboykeybinder.h | 2 | ||||
-rw-r--r-- | magnifier/magnifier-main.c | 2 | ||||
-rw-r--r-- | magnifier/magnifier-private.h | 11 | ||||
-rw-r--r-- | magnifier/magnifier.c | 2 | ||||
-rw-r--r-- | magnifier/zoom-region.c | 9 |
7 files changed, 12 insertions, 17 deletions
diff --git a/colorblind/keybinder/eggaccelerators.h b/colorblind/keybinder/eggaccelerators.h index e4df317..8cf97cd 100644 --- a/colorblind/keybinder/eggaccelerators.h +++ b/colorblind/keybinder/eggaccelerators.h @@ -21,7 +21,7 @@ #ifndef __EGG_ACCELERATORS_H__ #define __EGG_ACCELERATORS_H__ -#include <gtk/gtkaccelgroup.h> +#include <gtk/gtk.h> #include <gdk/gdk.h> G_BEGIN_DECLS diff --git a/colorblind/keybinder/tomboykeybinder.c b/colorblind/keybinder/tomboykeybinder.c index b188958..5685dea 100644 --- a/colorblind/keybinder/tomboykeybinder.c +++ b/colorblind/keybinder/tomboykeybinder.c @@ -4,7 +4,6 @@ #include <unistd.h> #include <sys/socket.h> #include <gdk/gdk.h> -#include <gdk/gdkwindow.h> #include <gdk/gdkx.h> #include <X11/Xlib.h> diff --git a/colorblind/keybinder/tomboykeybinder.h b/colorblind/keybinder/tomboykeybinder.h index 6923bd0..1a04da3 100644 --- a/colorblind/keybinder/tomboykeybinder.h +++ b/colorblind/keybinder/tomboykeybinder.h @@ -2,7 +2,7 @@ #ifndef __TOMBOY_KEY_BINDER_H__ #define __TOMBOY_KEY_BINDER_H__ -#include <glib/gtypes.h> +#include <glib.h> G_BEGIN_DECLS diff --git a/magnifier/magnifier-main.c b/magnifier/magnifier-main.c index 481fa91..a2f89a1 100644 --- a/magnifier/magnifier-main.c +++ b/magnifier/magnifier-main.c @@ -31,7 +31,7 @@ #include <stdlib.h> #include <sys/time.h> -#include <gdk/gdkwindow.h> +#include <gdk/gdk.h> #include <gdk/gdkx.h> #include <gtk/gtk.h> diff --git a/magnifier/magnifier-private.h b/magnifier/magnifier-private.h index 3e78f4c..318362f 100644 --- a/magnifier/magnifier-private.h +++ b/magnifier/magnifier-private.h @@ -23,12 +23,9 @@ #ifndef MAGNIFIER_PRIVATE_H_ #define MAGNIFIER_PRIVATE_H_ +G_BEGIN_DECLS -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> struct _MagnifierPrivate { GtkWidget *w; @@ -49,8 +46,6 @@ struct _MagnifierPrivate { GHashTable *cursorlist; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* MAGNIFIER_PRIVATE_H_ */ diff --git a/magnifier/magnifier.c b/magnifier/magnifier.c index d89bb06..c51d6c1 100644 --- a/magnifier/magnifier.c +++ b/magnifier/magnifier.c @@ -36,7 +36,7 @@ #include <libbonobo.h> #include <login-helper/login-helper.h> -#include <gdk-pixbuf/gdk-pixbuf-io.h> +#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdkx.h> #include <gdk/gdk.h> #include <gtk/gtk.h> diff --git a/magnifier/zoom-region.c b/magnifier/zoom-region.c index ecd52ab..add7a0a 100644 --- a/magnifier/zoom-region.c +++ b/magnifier/zoom-region.c @@ -26,18 +26,19 @@ #include <stdlib.h> #include <string.h> #include <popt.h> + #ifdef HAVE_COLORBLIND #include <colorblind.h> #endif /* HAVE_COLORBLIND */ -#include <gdk/gdkwindow.h> + +#include <gdk/gdk.h> #include <gtk/gtk.h> + #ifdef USE_GDKPIXBUF_RENDER_TO_DRAWABLE #include <gdk/gdkpixbuf.h> -#else -#include <gdk/gdk.h> #endif + #include <gdk/gdkx.h> -#include <gdk/gdkrgb.h> #include <libbonobo.h> #include <math.h> |