[atomix] Remove overlinking. Fixes bug #596094.

[Andre Klapper <aklapper src gnome org>]

commit b3450260f496c26fd5e276db7548a0674f9a04e1
Author: Andre Klapper <a9016009 gmx de>
Date:   Wed Sep 23 18:46:54 2009 +0200

    Remove overlinking. Fixes bug #596094.

 src/board.c         |    3 ++-
 src/board.h         |    1 +
 src/canvas_helper.h |    1 -
 src/goal-view.h     |    2 +-
 src/level-manager.c |    2 ++
 src/level.h         |    3 ---
 src/main.c          |    1 +
 src/main.h          |    1 -
 src/playfield.h     |    1 -
 src/preferences.h   |    2 --
 src/theme-manager.c |    1 +
 src/theme-private.h |    1 +
 src/theme.h         |    2 +-
 src/tile.h          |    2 +-
 src/undo.h          |    2 --
 15 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/src/board.c b/src/board.c
index 2be2580..35635de 100644
--- a/src/board.c
+++ b/src/board.c
@@ -17,8 +17,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <gdk/gdkkeysyms.h>
+
 #include "board.h"
-#include <gnome.h>
 #include <math.h>
 #include <unistd.h>
 #include "goal.h"
diff --git a/src/board.h b/src/board.h
index abdb5ab..948e314 100644
--- a/src/board.h
+++ b/src/board.h
@@ -20,6 +20,7 @@
 #ifndef _ATOMIX_BOARD_H_
 #define _ATOMIX_BOARD_H_
 
+#include <libgnomecanvas/libgnomecanvas.h>
 #include "theme.h"
 #include "playfield.h"
 #include "goal.h"
diff --git a/src/canvas_helper.h b/src/canvas_helper.h
index 6f61084..349f62f 100644
--- a/src/canvas_helper.h
+++ b/src/canvas_helper.h
@@ -19,7 +19,6 @@
 #ifndef _ATOMIX_CANVAS_HELPER_H_
 #define _ATOMIX_CANVAS_HELPER_H_
 
-#include <gnome.h>
 #include "theme.h"
 
 void set_background_color (GtkWidget * canvas, GdkColor * color);
diff --git a/src/goal-view.h b/src/goal-view.h
index 624d1f6..fc98b8a 100644
--- a/src/goal-view.h
+++ b/src/goal-view.h
@@ -20,7 +20,7 @@
 #ifndef _ATOMIX_GOAL_VIEW_H_
 #define _ATOMIX_GOAL_VIEW_H_
 
-#include <gnome.h>
+#include <libgnomecanvas/libgnomecanvas.h>
 
 #include "theme.h"
 #include "goal.h"
diff --git a/src/level-manager.c b/src/level-manager.c
index 4d7c6ad..2aa7ea0 100644
--- a/src/level-manager.c
+++ b/src/level-manager.c
@@ -16,6 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+
+#include <glib/gi18n.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
diff --git a/src/level.h b/src/level.h
index 8fafb66..22f89a9 100644
--- a/src/level.h
+++ b/src/level.h
@@ -20,9 +20,6 @@
 #ifndef _ATOMIX_LEVEL_H 
 #define _ATOMIX_LEVEL_H 
 
-#include <gnome.h>
-#include "playfield.h"
-
 #define LEVEL_TYPE        (level_get_type ())
 #define LEVEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), LEVEL_TYPE, Level))
 #define LEVEL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), LEVEL_TYPE, LevelClass))
diff --git a/src/main.c b/src/main.c
index 832a517..4778067 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,6 +19,7 @@
 
 #include "config.h"
 
+#include <libgnomeui/gnome-ui-init.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
diff --git a/src/main.h b/src/main.h
index 6458f9f..39c07d3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -20,7 +20,6 @@
 #ifndef _ATOMIX_MAIN_H_
 #define _ATOMIX_MAIN_H_
 
-#include <gnome.h>
 #include <bonobo.h>
 #include "theme-manager.h"
 #include "level-manager.h"
diff --git a/src/playfield.h b/src/playfield.h
index 3d60b60..cb37026 100644
--- a/src/playfield.h
+++ b/src/playfield.h
@@ -20,7 +20,6 @@
 #ifndef _ATOMIX_PLAY_FIELD_H
 #define _ATOMIX_PLAY_FIELD_H
 
-#include <gnome.h>
 #include <libxml/tree.h>
 #include "tile.h"
 #include "theme.h"
diff --git a/src/preferences.h b/src/preferences.h
index 9aa121d..0329cf6 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -20,8 +20,6 @@
 #ifndef _ATOMIX_PREFERENCES_H_
 #define _ATOMIX_PREFERENCES_H_
 
-#include <gnome.h>
-
 typedef struct _Preferences Preferences;
 
 struct _Preferences
diff --git a/src/theme-manager.c b/src/theme-manager.c
index 3879527..c0b0943 100644
--- a/src/theme-manager.c
+++ b/src/theme-manager.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <glib/gi18n.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
diff --git a/src/theme-private.h b/src/theme-private.h
index bfa1283..054f346 100644
--- a/src/theme-private.h
+++ b/src/theme-private.h
@@ -20,6 +20,7 @@
 #ifndef _ATOMIX_THEME_PRIVATE_H_
 #define _ATOMIX_THEME_PRIVATE_H_
 
+#include <gdk/gdk.h>
 #include "tile.h"
 
 typedef struct
diff --git a/src/theme.h b/src/theme.h
index 733536f..55ed630 100644
--- a/src/theme.h
+++ b/src/theme.h
@@ -20,8 +20,8 @@
 #ifndef _ATOMIX_THEME_H_
 #define _ATOMIX_THEME_H_
 
-#include <gnome.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
 #include "tile.h"
 
 
diff --git a/src/tile.h b/src/tile.h
index 48cf2bf..c454474 100644
--- a/src/tile.h
+++ b/src/tile.h
@@ -20,7 +20,7 @@
 #ifndef _TILE_H_
 #define _TILE_H_
 
-#include <gnome.h>
+#include <glib-object.h>
 #include <libxml/tree.h>
 
 #define TILE_TYPE        (tile_get_type ())
diff --git a/src/undo.h b/src/undo.h
index 4aa27d8..52c0fd4 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -20,8 +20,6 @@
 #ifndef _ATOMIX_UNDO_H_
 #define _ATOMIX_UNDO_H_
 
-#include <gnome.h>
-
 typedef struct
 {
   GnomeCanvasItem *item;