Reverting r14626. It botched the 'svn move' (svk bug) and broke the build.

"gnc-gobject-utils.c:52: error: 'GtkFunction' undeclared."


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14658 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -4,11 +4,6 @@
 	currency problems when importing QIF files (introduced by the
 	widget cleanup.)
 
-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

src/core-utils/Makefile.am

@@ -6,11 +6,13 @@ libcore_utils_la_SOURCES = \
   gnc-gdate-utils.c \
   gnc-gkeyfile-utils.c \
   gnc-glib-utils.c \
-  gnc-gobject-utils.c
+  gnc-gobject-utils.c \
+  gnc-gtk-utils.c
 
 libcore_utils_la_LIBADD = \
   ${GLIB_LIBS} \
-  ${GCONF_LIBS}
+  ${GCONF_LIBS} \
+  ${GTK_LIBS}
 
 nodist_libgw_core_utils_la_SOURCES = \
   gw-core-utils.c
@@ -27,7 +29,8 @@ noinst_HEADERS = \
   gnc-gdate-utils.h \
   gnc-gkeyfile-utils.h \
   gnc-glib-utils.h \
-  gnc-gobject-utils.h
+  gnc-gobject-utils.h \
+  gnc-gtk-utils.h
 
 EXTRA_DIST = ${gwmod_DATA}
 
@@ -35,7 +38,8 @@ AM_CFLAGS = \
   ${G_WRAP_COMPILE_ARGS} \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
-  ${GCONF_CFLAGS}
+  ${GCONF_CFLAGS} \
+  ${GTK_CFLAGS}
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
 gwmod_DATA = gw-core-utils-spec.scm

src/core-utils/gnc-gobject-utils.c

@@ -26,6 +26,10 @@
 #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);
 
 /************************************************************/

src/gnome-utils/Makefile.am

@@ -66,7 +66,6 @@ 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 \
@@ -133,7 +132,6 @@ 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 \