[dasher] Move GnomeSettingsStore from DasherCore to Gtk2.

[Patrick Welche <pwelche src gnome org>]

commit 74c0a01f06d06b218ac5ccbcce1455eee1662e51
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Sat Apr 2 13:46:24 2011 +0200

    Move GnomeSettingsStore from DasherCore to Gtk2.
    
    GnomeSettingsStore is obviously not platform independent. While
    here remove Gtk build flags from Common and DasherCore and g/c
    references to a "intl" directory.

 Src/Common/Makefile.am                          |    2 +-
 Src/DasherCore/Makefile.am                      |    4 +---
 Src/Gtk2/DasherControl.h                        |    2 +-
 Src/{DasherCore => Gtk2}/GnomeSettingsStore.cpp |    0
 Src/{DasherCore => Gtk2}/GnomeSettingsStore.h   |    0
 Src/Gtk2/Makefile.am                            |    2 ++
 Src/Makefile.am                                 |    1 -
 7 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/Src/Common/Makefile.am b/Src/Common/Makefile.am
index 2513fcc..fe1dcff 100644
--- a/Src/Common/Makefile.am
+++ b/Src/Common/Makefile.am
@@ -24,6 +24,6 @@ libdashermisc_a_SOURCES = \
 #		IOstreamDasherEdit.cc   I have no idea what this does, but it's broken now
 #		IOstreamDasherEdit.h 
 
-AM_CXXFLAGS = -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS)
+AM_CXXFLAGS = -I$(srcdir)/../DasherCore
 
 EXTRA_DIST = Common.vcproj Common_vc80.vcproj
diff --git a/Src/DasherCore/Makefile.am b/Src/DasherCore/Makefile.am
index 3c48a2d..ce60d1e 100644
--- a/Src/DasherCore/Makefile.am
+++ b/Src/DasherCore/Makefile.am
@@ -86,8 +86,6 @@ libdashercore_a_SOURCES = \
 		GameScorer.cpp \
 		GameScorer.h \
 		GameStatistics.h \
-		GnomeSettingsStore.cpp \
-		GnomeSettingsStore.h \
 		InputFilter.h \
 		MandarinAlphMgr.cpp \
 		MandarinAlphMgr.h \
@@ -150,7 +148,7 @@ EXTRA_libdashercore_a_SOURCES = \
 		CannaConversionHelper.cpp \
 		CannaConversionHelper.h
 
-AM_CXXFLAGS = -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl $(GTK_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS)
+AM_CXXFLAGS = -I$(srcdir)
 
 EXTRA_DIST = \
 		LanguageModelling/KanjiConversionIME.cpp \
diff --git a/Src/Gtk2/DasherControl.h b/Src/Gtk2/DasherControl.h
index 8b8a929..1f235c1 100644
--- a/Src/Gtk2/DasherControl.h
+++ b/Src/Gtk2/DasherControl.h
@@ -28,7 +28,7 @@
 
 //#include "../DasherCore/DasherSettingsInterface.h"
 #include "../DasherCore/DasherInterfaceBase.h"
-#include "../DasherCore/GnomeSettingsStore.h"
+#include "GnomeSettingsStore.h"
 #include "../DasherCore/UserLog.h"
 
 ///
diff --git a/Src/DasherCore/GnomeSettingsStore.cpp b/Src/Gtk2/GnomeSettingsStore.cpp
similarity index 100%
rename from Src/DasherCore/GnomeSettingsStore.cpp
rename to Src/Gtk2/GnomeSettingsStore.cpp
diff --git a/Src/DasherCore/GnomeSettingsStore.h b/Src/Gtk2/GnomeSettingsStore.h
similarity index 100%
rename from Src/DasherCore/GnomeSettingsStore.h
rename to Src/Gtk2/GnomeSettingsStore.h
diff --git a/Src/Gtk2/Makefile.am b/Src/Gtk2/Makefile.am
index f3bcec3..6036f8c 100644
--- a/Src/Gtk2/Makefile.am
+++ b/Src/Gtk2/Makefile.am
@@ -31,6 +31,8 @@ libdashercontrol_la_SOURCES = \
 		Canvas.h \
 		DasherControl.cpp \
 		DasherControl.h \
+		GnomeSettingsStore.cpp \
+		GnomeSettingsStore.h \
 		GtkDasherControl.cpp \
 		GtkDasherControl.h \
 		KeyboardHelper.cpp \
diff --git a/Src/Makefile.am b/Src/Makefile.am
index 860ed18..56988cd 100644
--- a/Src/Makefile.am
+++ b/Src/Makefile.am
@@ -14,7 +14,6 @@ dasher_SOURCES = main.cc
 AM_CXXFLAGS = \
 	-I$(srcdir)/Gtk2 \
 	-I$(srcdir)/DasherCore \
-	-I$(top_srcdir)/intl \
 	$(GTK2BUILD_CFLAGS) \
 	-DPREFIX=\"$(PREFIX)\" \
 	-DLIBDIR=\"$(libdir)\" \