From e71180c16ade3665c03ebe0409fe8637a1ccf90f Mon Sep 17 00:00:00 2001
From: Derek Atkins <derek@ihtfp.com>
Date: Wed, 9 Aug 2006 17:48:00 +0000
Subject: [PATCH] 	* move gnc-gtk-utils from core-utils to gnome-utils
 because 	  core-utils should not depend on gtk.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14626 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 ChangeLog                                       |  5 +++++
 src/core-utils/Makefile.am                      | 12 ++++--------
 src/core-utils/gnc-gobject-utils.c              |  4 ----
 src/gnome-utils/Makefile.am                     |  2 ++
 src/{core-utils => gnome-utils}/gnc-gtk-utils.c |  0
 src/{core-utils => gnome-utils}/gnc-gtk-utils.h |  0
 6 files changed, 11 insertions(+), 12 deletions(-)
 rename src/{core-utils => gnome-utils}/gnc-gtk-utils.c (100%)
 rename src/{core-utils => gnome-utils}/gnc-gtk-utils.h (100%)

diff --git a/ChangeLog b/ChangeLog
index 0410cbd954..59928b0c8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-09  Derek Atkins  <derek@ihtfp.com>
+
+	* move gnc-gtk-utils from core-utils to gnome-utils because
+	  core-utils should not depend on gtk.
+
 2006-08-08  Christian Stimming <stimming@tuhh.de>
 
 	* configure.in, src/gnome-utils/schemas/Makefile.am: Find absolute
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index dd2eb75b48..82ea897546 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -6,13 +6,11 @@ libcore_utils_la_SOURCES = \
   gnc-gdate-utils.c \
   gnc-gkeyfile-utils.c \
   gnc-glib-utils.c \
-  gnc-gobject-utils.c \
-  gnc-gtk-utils.c
+  gnc-gobject-utils.c
 
 libcore_utils_la_LIBADD = \
   ${GLIB_LIBS} \
-  ${GCONF_LIBS} \
-  ${GTK_LIBS}
+  ${GCONF_LIBS}
 
 nodist_libgw_core_utils_la_SOURCES = \
   gw-core-utils.c
@@ -29,8 +27,7 @@ noinst_HEADERS = \
   gnc-gdate-utils.h \
   gnc-gkeyfile-utils.h \
   gnc-glib-utils.h \
-  gnc-gobject-utils.h \
-  gnc-gtk-utils.h
+  gnc-gobject-utils.h
 
 EXTRA_DIST = ${gwmod_DATA}
 
@@ -38,8 +35,7 @@ AM_CFLAGS = \
   ${G_WRAP_COMPILE_ARGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
-  ${GCONF_CFLAGS} \
-  ${GTK_CFLAGS}
+  ${GCONF_CFLAGS}
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
 gwmod_DATA = gw-core-utils-spec.scm
diff --git a/src/core-utils/gnc-gobject-utils.c b/src/core-utils/gnc-gobject-utils.c
index 49e0d4f442..d674a33d5d 100644
--- a/src/core-utils/gnc-gobject-utils.c
+++ b/src/core-utils/gnc-gobject-utils.c
@@ -26,10 +26,6 @@
 #include <stdio.h>
 #include "gnc-gobject-utils.h"
 
-#include <gtk/gtk.h>	// For gtk_main_quit(). Can't get this to work with
-			// a g_source attached to the main glib context.
-
-
 static void gnc_gobject_weak_cb (gpointer user_data, GObject *object);
 
 /************************************************************/
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index be8d3d1bcb..9c7ab015eb 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -66,6 +66,7 @@ libgncmod_gnome_utils_la_SOURCES = \
   gnc-recurrence.c \
   gnc-general-select.c \
   gnc-gnome-utils.c \
+  gnc-gtk-utils.c \
   gnc-gui-query.c \
   gnc-html-graph-gog.c \
   gnc-html-history.c \
@@ -132,6 +133,7 @@ gncinclude_HEADERS = \
   gnc-recurrence.h \
   gnc-general-select.h \
   gnc-gnome-utils.h \
+  gnc-gtk-utils.h \
   gnc-gui-query.h \
   gnc-html-graph-gog.h \
   gnc-html-history.h \
diff --git a/src/core-utils/gnc-gtk-utils.c b/src/gnome-utils/gnc-gtk-utils.c
similarity index 100%
rename from src/core-utils/gnc-gtk-utils.c
rename to src/gnome-utils/gnc-gtk-utils.c
diff --git a/src/core-utils/gnc-gtk-utils.h b/src/gnome-utils/gnc-gtk-utils.h
similarity index 100%
rename from src/core-utils/gnc-gtk-utils.h
rename to src/gnome-utils/gnc-gtk-utils.h