r21880 - gnucash/trunk - Remove some stray references to libglade.
Geert Janssens
gjanssens at code.gnucash.org
Mon Jan 23 15:45:26 EST 2012
Author: gjanssens
Date: 2012-01-23 15:45:26 -0500 (Mon, 23 Jan 2012)
New Revision: 21880
Trac: http://svn.gnucash.org/trac/changeset/21880
Modified:
gnucash/trunk/README.dependencies
gnucash/trunk/configure.ac
gnucash/trunk/packaging/win32/defaults.sh
gnucash/trunk/packaging/win32/dist-impl.sh
gnucash/trunk/packaging/win32/install-impl.sh
gnucash/trunk/src/business/business-gnome/Makefile.am
gnucash/trunk/src/business/business-ledger/Makefile.am
gnucash/trunk/src/core-utils/gnc-path.c
gnucash/trunk/src/core-utils/gnc-path.h
gnucash/trunk/src/gnome-search/Makefile.am
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome-utils/dialog-utils.c
gnucash/trunk/src/gnome-utils/dialog-utils.h
gnucash/trunk/src/gnome-utils/test/Makefile.am
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/gnome/assistant-loan.c
gnucash/trunk/src/gnome/gnc-plugin-page-budget.c
gnucash/trunk/src/html/Makefile.am
gnucash/trunk/src/import-export/Makefile.am
gnucash/trunk/src/import-export/aqbanking/Makefile.am
gnucash/trunk/src/import-export/csv/Makefile.am
gnucash/trunk/src/import-export/log-replay/Makefile.am
gnucash/trunk/src/import-export/ofx/Makefile.am
gnucash/trunk/src/import-export/qif-import/Makefile.am
gnucash/trunk/src/optional/gtkmm/Makefile.am
gnucash/trunk/src/optional/gtkmm/test/Makefile.am
gnucash/trunk/src/optional/python-bindings/Makefile.am
gnucash/trunk/src/plugins/bi_import/Makefile.am
gnucash/trunk/src/register/ledger-core/Makefile.am
gnucash/trunk/src/register/register-core/Makefile.am
gnucash/trunk/src/register/register-gnome/Makefile.am
gnucash/trunk/src/report/report-gnome/Makefile.am
Log:
Remove some stray references to libglade.
It's no longer used by GnuCash. Yay!
Modified: gnucash/trunk/README.dependencies
===================================================================
--- gnucash/trunk/README.dependencies 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/README.dependencies 2012-01-23 20:45:26 UTC (rev 21880)
@@ -67,7 +67,6 @@
gtk+2
guile
libart2
-libglade2
libgnomeprint2.2
libgnomeui2
[lib]goffice
@@ -131,7 +130,6 @@
- pangoft2 >= 1.8.1
- cairo >= 0.5.0 [optional]
- gtk+-2.0 >= 2.6.0
- - libglade-2.0 >= 2.3.6
- libgnomeprint-2.2 >= 2.8.2
- libart-2.0 >= 2.3.11
- gconf-2.0
@@ -151,7 +149,6 @@
- gtk2-2.4.13 gtk2-2.10.4-16.el5
- guile-1.6.4 guile-1.8.0--8.20060831cvs
- libart_lgpl-2.3.16 libart-lgpl-2.3.17-4
- - libglade2-2.4.0 libglade2-2.6.0-2
- libgnomeprint22-2.8.0 libgnomeprint22-2.12.1-6
- libgnomeui-2.8.0 libgnomeui-2.16.0-5.el5
- libgsf-1.10.1 libgsf-1.14.1-6.1
@@ -208,12 +205,8 @@
- guile-1.6.7-1ubuntu3
- g-wrap-1.9.6-2ubuntu2
- libart2-2.3.17-1
- - libglade2-2.5.1-2ubuntu1
- libgnomeprint2.2-2.12.1-0ubuntu1
- libgnomeui2-2.12.0-0ubuntu1
- - libgtkhtml3
- - libgtkhtml3.6-18-3.6.2-1
- - gtkhtml3.8-15-3.8.1-0ubuntu1
- libgsf1-1.12.3-3ubuntu3
- libofx2-0.8.0-3ubuntu8
- libxml2-2.6.21-0ubuntu1
@@ -231,7 +224,6 @@
- gwrapguile-1.3.4
- g-wrap-1.9.6
- libart-2 libart-2.0-2_2.3.17-1_i386.deb
- - libglade-2 libglade2-0_2.5.1-0ubuntu1_i386.deb
- libgnomeprint-2.2 libgnomeprint2.2-0_2.10.3-0ubuntu1_i386.deb
- libgnomeui-2 libgnomeui-0_2.10.0-0ubuntu1_i386.deb
- libgsf-1 libgsf-1_1.11.1-1ubuntu1_i386.deb
@@ -249,14 +241,12 @@
- guile-1.6.8
- g-wrap-1.9.6
- libart-2.3.17
- - libglade-2.6.0
- libgnomeprint-2.2-2.12.1
- libgnomeui-2.16.0
- libgsf-1.14.1
- libofx-0.8.0
- libxml-2.6.26
- pango-1.14.3
- - libgtkhtml-3.8-3.12.0
Note: -devel packages for the libraries above must also be installed.
- 2006 = 2005-10-06
[from ftp://ftp.rutgers.edu/pub/Mandrakelinux/devel/2006.0/i586/media/main/]
@@ -268,15 +258,12 @@
- guile-1.6.7
- g-wrap-1.3.4
- libart-2.3.17
- - libglade-2.5.1
- libgnomeprint-2.2-2.10.3
- libgnomeui-2.10.2
- libgsf-1.12.2
- libofx-0.7.0
- libxml-2.6.21
- pango-1.10.0
- - libgtkhtml-3.1-3.2.5
- - libgtkhtml-3.6-3.6.2
- *2005 = 2005-04-14
[from ftp://ftp.rutgers.edu/pub/Mandrakelinux/devel/2005/i586/media/main/]
- aqbanking-1.0.7
@@ -287,14 +274,12 @@
- guile-1.6.7
- g-wrap-1.3.4
- libart-2.3.17
- - libglade-2.4.2
- libgnomeprint-2.2-2.8.2
- libgnomeui-2.8.2
- libgsf-1.11.1
- libofx-0.7.0
- libxml-2.6.17
- pango-1.8.1
- - libgtkhtml-3.1.11
- SUSE / opensuse
- 10.2 = 2006-12-07
- aqbanking-2.2.3
@@ -303,11 +288,9 @@
- glib2-2.12.4
- goffice-0.2.1
- gtk2-2.10.6
- - gtkhtml2-3.12.2
- guile-1.8.1
- g-wrap: not included
- libart_lgpl-2.3.17
- - libglade2-2.6.0
- libgnomeprint-2.12.1
- libgnomeui-2.16.1
- libgsf-1.14.2
@@ -322,11 +305,9 @@
- glib2-2.8.5
- goffice-0.1.2
- gtk2-2.8.10
- - gtkhtml2-3.10.0
- guile-1.6.7
- g-wrap: not included
- libart_lgpl-2.3.17
- - libglade2-2.5.1
- libgnomeprint-2.12.1
- libgnomeui-2.12.0
- libgsf-1.13.99
@@ -343,7 +324,6 @@
- guile-1.6.7
- g-wrap: not included
- libart_lgpl-2.3.17
- - libglade2-2.5.1
- libgnomeprint-2.12.0
- libgnomeui-2.12.0
- libgsf-1.12.1
@@ -357,11 +337,9 @@
- gconf2-2.10.0
- glib2-2.6.3
- gtk2-2.6.4
- - gtkhtml2-3.6.1
- guile-1.6.7
- gwrap: not included
- libart_lgpl-2.3.17
- - libglade2-2.5.1
- libgnomeprint-2.10.1
- libgnomeui-2.10.0
- libgsf-1.11.1
@@ -379,7 +357,6 @@
- gtk2-2.6.10
- guile-1.6.7
- libart_lgpl-2.3.17
- - libglade2-2.5.1
- libgnomeprint22-2.10.3
- libgnomeui-2.10.0
- libgsf-1.11.1
@@ -395,7 +372,6 @@
- gtk2-2.4.14
- guile-1.6.4
- libart_lgpl-2.3.16
- - libglade2-2.4.0
- libgnomeprint22-2.8.0
- libgnomeui-2.8.0
- libgsf-1.10.1
@@ -412,7 +388,6 @@
- gtk2-2.6.10
- guile-1.6.7
- libart2-2.3.17
- - libglade2-??
- libgnomeprint2.2-2.10.3
- libgnomeui2-2.10.1
- libgsf1-1.12.3
@@ -429,7 +404,6 @@
- gtk2-2.6.4
- guile-1.6.7
- libart2-2.3.17
- - libglade2-??
- libgnomeprint2.2-2.8.2
- libgnomeui2-2.8.1
- libgsf1-1.11.1
@@ -455,7 +429,6 @@
- gtk+-2.6.8
- guile-1.6.7
- libart_lgpl-2.3.17
- - libglade-2.5.1
- libgnomeprint-2.10.3
- libgnomeui-2.10.0
- libgsf-1.12.1
@@ -472,7 +445,6 @@
- glib-2.6.2
- guile-1.6.7
- libart_gpl-2.3.16
- - libglade-2.4.0
- libgnomeprint-2.8.1
- libgnomeui-2.8.1-r1
- libgsf-1.10.0
@@ -493,11 +465,9 @@
- guile-1.6.7
- gwrap: no
- libart2-2.3.17
- - libglade2-2.4.2
- libgnomeprint2.2: no
- libgnomeui2: no
- libgsf1-1.12.1
- - [lib]gtkhtml3: no
- libofx: no
- libxml2-2.6.22
- pango-1.8.2
@@ -511,12 +481,9 @@
- guile-1.6.5
- gwrap: no
- libart2-2.3.16
- - libglade2-2.6.0
- libgnomeprint2.2-2.6.1
- libgnomeui2-2.6.1
- libgsf1-1.9.1
- - [lib]gtkhtml3: no
- - libgtkhtml-2.6.2
- libofx: no
- libxml2-2.6.16
- pango-1.8.1
@@ -535,11 +502,9 @@
- guile-1.6.5
- g-wrap-1.3.4_6
- libart_lgpl2-2.3.17
- - libglade2-2.5.1_2
- libgnomeprint-2.10.1
- libgnomeui-2.10.0_1
- libgsf-1.11.1
- - [lib]gtkhtml3-3.6.1
- libofx-0.7.0
- libxml2-2.6.18
- pango-1.8.1
@@ -557,7 +522,6 @@
- guile-1.6.4
- gwrap: not included
- libart_lgpl-2.3.16
- - libglade2-2.4.0
- libgnomeprint22-2.8.0
- libgnomeui-2.8.0
- libgsf-1.10.1
@@ -573,7 +537,6 @@
- guile-1.6.4
- g-wrap: not included
- libart_lgpl-2.3.11
- - libglade2-2.0.1
- libgnomeprint22-2.2.1.3
- libgnomeui-2.2.1
- libgsf-1.6.0
@@ -591,11 +554,9 @@
- guile-1.6.4
- gwrap: no
- libart2-2.3.16
- - libglade2-2.4.0
- libgnomeprint2.2-2.8.0
- libgnomeui2-2.8.0
- libgsf1-1.10.1
- - [lib]gtkhtml3-3.3.2
- libofx: no
- libxml2-2.6.16
- pango-1.6.0
@@ -608,11 +569,9 @@
- guile-1.6.4
- gwrap: no
- libart2-2.3.16
- - libglade2-2.4.0
- libgnomeprint2.2-2.8.0
- libgnomeui2-2.8.0
- libgsf1-1.10.1
- - [lib]gtkhtml3-3.3.2
- libofx: no
- libxml2-2.6.16
- pango-1.6.0
Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/configure.ac 2012-01-23 20:45:26 UTC (rev 21880)
@@ -559,7 +559,6 @@
GNC_ACCOUNTS_DIR='${GNC_SHAREDIR}/accounts'
GNC_CHECKS_DIR='${GNC_SHAREDIR}/checks'
-GNC_GLADE_DIR='${GNC_SHAREDIR}/glade'
GNC_GTKBUILDER_DIR='${GNC_SHAREDIR}/gtkbuilder'
GNC_UI_DIR='${GNC_SHAREDIR}/ui'
GNC_PIXMAP_DIR='${GNC_SHAREDIR}/pixmaps'
@@ -568,7 +567,6 @@
AC_SUBST(GNC_CHECKS_DIR)
AC_SUBST(GNC_CONFIGDIR)
AC_SUBST(GNC_DOC_INSTALL_DIR)
-AC_SUBST(GNC_GLADE_DIR)
AC_SUBST(GNC_GTKBUILDER_DIR)
AC_SUBST(GNC_UI_DIR)
AC_SUBST(GNC_INCLUDE_DIR)
@@ -880,11 +878,6 @@
AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS)
- PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6)
- AS_SCRUB_INCLUDE(GLADE_CFLAGS)
- AC_SUBST(GLADE_CFLAGS)
- AC_SUBST(GLADE_LIBS)
-
# checks for goffice
PKG_CHECK_MODULES(GOFFICE, libgoffice-0.8 >= 0.7.0, [goffice=1], [
PKG_CHECK_MODULES(GOFFICE, libgoffice-0.6 >= 0.6.0, [goffice=1], [
Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/packaging/win32/defaults.sh 2012-01-23 20:45:26 UTC (rev 21880)
@@ -258,8 +258,6 @@
set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip"
set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
-set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
-set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip"
Modified: gnucash/trunk/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist-impl.sh 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/packaging/win32/dist-impl.sh 2012-01-23 20:45:26 UTC (rev 21880)
@@ -97,7 +97,6 @@
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/packaging/win32/install-impl.sh 2012-01-23 20:45:26 UTC (rev 21880)
@@ -536,8 +536,6 @@
wget_unpacked $LIBBONOBO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBBONOBOUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR
Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -21,7 +21,6 @@
-I${top_srcdir}/src/libqof/qof \
${GNOME_CFLAGS} \
${GCONF_CFLAGS} \
- ${GLADE_CFLAGS} \
${GLIB_CFLAGS} \
${GUILE_INCS}
@@ -80,7 +79,6 @@
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
- ${GLADE_LIBS} \
${GNOME_LIBS} \
${GCONF_LIBS} \
${GUILE_LIBS} \
Modified: gnucash/trunk/src/business/business-ledger/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-ledger/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/business/business-ledger/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -39,8 +39,8 @@
-I${top_srcdir}/src/register/register-core \
-I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
- ${GLADE_CFLAGS} \
${GCONF_CFLAGS} \
+ ${GTK_CFLAGS} \
${GLIB_CFLAGS}
INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.ledger\"
Modified: gnucash/trunk/src/core-utils/gnc-path.c
===================================================================
--- gnucash/trunk/src/core-utils/gnc-path.c 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/core-utils/gnc-path.c 2012-01-23 20:45:26 UTC (rev 21880)
@@ -96,19 +96,6 @@
return result;
}
-/** Returns the glade file path, usually
- * "$prefix/share/gnucash/glade".
- *
- * @returns A newly allocated string. */
-gchar *gnc_path_get_gladedir()
-{
- gchar *pkgdatadir = gnc_path_get_pkgdatadir ();
- gchar *result = g_build_filename (pkgdatadir, "glade", (char*)NULL);
- g_free (pkgdatadir);
- //printf("Returning gladedir %s\n", result);
- return result;
-}
-
/** Returns the gtkbuilder file path, usually
* "$prefix/share/gnucash/gtkbuilder".
*
Modified: gnucash/trunk/src/core-utils/gnc-path.h
===================================================================
--- gnucash/trunk/src/core-utils/gnc-path.h 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/core-utils/gnc-path.h 2012-01-23 20:45:26 UTC (rev 21880)
@@ -62,12 +62,6 @@
* @returns A newly allocated string. */
gchar *gnc_path_get_pkglibdir(void);
-/** Returns the glade file path, usually
- * "$prefix/share/gnucash/glade".
- *
- * @returns A newly allocated string. */
-gchar *gnc_path_get_gladedir(void);
-
/** Returns the gtkbuilder file path, usually
* "$prefix/share/gnucash/gktbuilder".
*
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/gnome/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -16,7 +16,6 @@
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
- ${GLADE_LIBS} \
${GUILE_LIBS} \
${GNOME_LIBS} \
${GCONF_LIBS} \
@@ -123,7 +122,6 @@
${GUILE_INCS} \
${GNOME_CFLAGS} \
${GCONF_CFLAGS} \
- ${GLADE_CFLAGS} \
$(GLIB_CFLAGS) \
${GTK_MAC_CFLAGS}
Modified: gnucash/trunk/src/gnome/assistant-loan.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-loan.c 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/gnome/assistant-loan.c 2012-01-23 20:45:26 UTC (rev 21880)
@@ -28,7 +28,6 @@
#include <glib/gi18n.h>
#include <string.h>
#include <stdlib.h>
-#include <glade/glade.h>
#include <math.h>
#include "assistant-loan.h"
#include "SchedXaction.h"
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-budget.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-budget.c 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-budget.c 2012-01-23 20:45:26 UTC (rev 21880)
@@ -40,7 +40,6 @@
#endif
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
-#include <glade/glade.h>
#include "gnc-date-edit.h"
#include "gnc-plugin-page-register.h"
Modified: gnucash/trunk/src/gnome-search/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-search/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/gnome-search/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -9,8 +9,8 @@
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
- ${GLADE_CFLAGS} \
${GCONF_CFLAGS} \
+ ${GTK_CFLAGS} \
${GLIB_CFLAGS}
libgncmod_gnome_search_la_SOURCES = \
@@ -55,7 +55,6 @@
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GUILE_LIBS} \
${GCONF_LIBS} \
- ${GLADE_LIBS} \
${GLIB_LIBS} \
${REGEX_LIBS}
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -15,7 +15,6 @@
-I${top_srcdir}/lib/libc \
-I${top_srcdir}/src/libqof/qof \
${GLIB_CFLAGS} \
- ${GLADE_CFLAGS} \
${GTK_CFLAGS} \
${GNOME_CFLAGS} \
${GCONF_CFLAGS} \
@@ -191,7 +190,6 @@
${GNOME_LIBS} \
${GCONF_LIBS} \
${GNOME_KEYRING_LIBS} \
- ${GLADE_LIBS} \
${GUILE_LIBS} \
${GLIB_LIBS} \
${DB_LIBS} \
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c 2012-01-23 20:45:26 UTC (rev 21880)
@@ -28,7 +28,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
-#include <glade/glade.h>
#include <gmodule.h>
#ifdef HAVE_DLFCN_H
# include <dlfcn.h>
@@ -786,137 +785,13 @@
gtk_clist_set_text (list, row, col, "");
}
-/* Glade Stuff
- *
- *
- */
-static gboolean glade_inited = FALSE;
-
-/* gnc_glade_xml_new: a convenience wrapper for glade_xml_new
- * - takes care of glade initialization, if needed
- * - takes care of finding the directory for glade files
- */
-GladeXML *
-gnc_glade_xml_new (const char *filename, const char *root)
-{
- GladeXML *xml;
- char *fname;
- gchar *gnc_glade_dir;
-
- g_return_val_if_fail (filename != NULL, NULL);
- g_return_val_if_fail (root != NULL, NULL);
-
- if (!glade_inited)
- {
- glade_gnome_init ();
- glade_inited = TRUE;
- }
-
- gnc_glade_dir = gnc_path_get_gladedir ();
- if (!g_file_test(gnc_glade_dir, G_FILE_TEST_IS_DIR))
- {
- g_critical("Directory for glade UI files \"%s\" is not found. Your installation is incomplete and cannot be run.", gnc_glade_dir);
- g_free (gnc_glade_dir);
- return NULL;
- }
-
- fname = g_build_filename(gnc_glade_dir, filename, (char *)NULL);
- g_free (gnc_glade_dir);
-
- if (!g_file_test(fname, G_FILE_TEST_EXISTS))
- {
- g_critical("The glade UI file \"%s\" is not found. Your installation is incomplete and cannot be run.", fname);
- return NULL;
- }
-
- xml = glade_xml_new (fname, root, NULL);
-
- g_free (fname);
-
- return xml;
-}
-
-/* gnc_glade_lookup_widget: Given a root (or at least ancestor) widget,
- * find the child widget with the given name.
- */
-GtkWidget *
-gnc_glade_lookup_widget (GtkWidget *widget, const char *name)
-{
- GladeXML *xml;
- GtkWidget *wid;
-
- if (!widget || !name) return NULL;
-
- xml = glade_get_widget_tree (widget);
- if (!xml) return NULL;
-
- wid = glade_xml_get_widget (xml, name);
- if (!wid)
- PWARN("I know nothing of this '%s' whom you seek.", name);
-
- return wid;
-}
-
-/*
- * The following function is built from a couple of glade functions.
- */
-GModule *allsymbols = NULL;
-
-void
-gnc_glade_autoconnect_full_func(const gchar *handler_name,
- GObject *signal_object,
- const gchar *signal_name,
- const gchar *signal_data,
- GObject *other_object,
- gboolean signal_after,
- gpointer user_data)
-{
- GCallback func;
- GCallback *p_func = &func;
-
- if (allsymbols == NULL)
- {
- /* get a handle on the main executable -- use this to find symbols */
- allsymbols = g_module_open(NULL, 0);
- }
-
- if (!g_module_symbol(allsymbols, handler_name, (gpointer *)p_func))
- {
-#ifdef HAVE_DLSYM
- /* Fallback to dlsym -- necessary for *BSD linkers */
- func = dlsym(RTLD_DEFAULT, handler_name);
-#else
- func = NULL;
-#endif
- if (func == NULL)
- {
- g_warning("ggaff: could not find signal handler '%s'.", handler_name);
- return;
- }
- }
-
- if (other_object)
- {
- if (signal_after)
- g_signal_connect_object (signal_object, signal_name, func,
- other_object, G_CONNECT_AFTER);
- else
- g_signal_connect_object (signal_object, signal_name, func, other_object, 0);
- }
- else
- {
- if (signal_after)
- g_signal_connect_after(signal_object, signal_name, func, user_data);
- else
- g_signal_connect(signal_object, signal_name, func, user_data);
- }
-}
-
/*--------------------------------------------------------------------------
* GtkBuilder support functions
*-------------------------------------------------------------------------*/
+GModule *allsymbols = NULL;
+
/* gnc_builder_add_from_file:
*
* a convenience wrapper for gtk_builder_add_objects_from_file.
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.h 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.h 2012-01-23 20:45:26 UTC (rev 21880)
@@ -26,7 +26,6 @@
#ifndef DIALOG_UTILS_H
#define DIALOG_UTILS_H
-#include <glade/glade.h>
#include <gtk/gtk.h>
#include "qof.h"
@@ -118,16 +117,6 @@
gboolean checked);
#endif
-GladeXML * gnc_glade_xml_new (const char *filename, const char *root);
-GtkWidget * gnc_glade_lookup_widget (GtkWidget *widget, const char *name);
-void gnc_glade_autoconnect_full_func(const gchar *handler_name,
- GObject *signal_object,
- const gchar *signal_name,
- const gchar *signal_data,
- GObject *connect_object,
- gboolean after,
- gpointer user_data);
-
gboolean gnc_builder_add_from_file (GtkBuilder *builder, const char *filename, const char *root);
void gnc_builder_connect_full_func (GtkBuilder *builder,
GObject *signal_object,
Modified: gnucash/trunk/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/test/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/gnome-utils/test/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -47,8 +47,7 @@
-I${top_srcdir}/src/test-core \
-I${top_srcdir}/src/libqof/qof \
${GLIB_CFLAGS} \
- ${GUILE_INCS} \
- ${GLADE_CFLAGS}
+ ${GUILE_INCS}
LDADD = \
${GNOME_LIBS} \
Modified: gnucash/trunk/src/html/Makefile.am
===================================================================
--- gnucash/trunk/src/html/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/html/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -16,7 +16,6 @@
${GLIB_CFLAGS} \
${GUILE_INCS} \
${GTK_CFLAGS} \
- ${GLADE_CFLAGS} \
${GNOME_CFLAGS} \
${WEBKIT_CFLAGS} \
${GOFFICE_CFLAGS}
@@ -61,7 +60,6 @@
${DB_LIBS} \
${QOF_LIBS} \
${GOFFICE_LIBS} \
- ${GLADE_LIBS} \
${GUILE_LIBS} \
${REGEX_LIBS}
Modified: gnucash/trunk/src/import-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/import-export/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -47,7 +47,6 @@
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GCONF_LIBS} \
- ${GLADE_LIBS} \
${REGEX_LIBS} \
${GLIB_LIBS}
@@ -64,8 +63,8 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/libqof/qof \
${GCONF_CFLAGS} \
- ${GLADE_CFLAGS} \
${GUILE_INCS} \
+ ${GTK_CFLAGS} \
${GLIB_CFLAGS}
EXTRA_DIST = \
Modified: gnucash/trunk/src/import-export/aqbanking/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/import-export/aqbanking/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -44,7 +44,6 @@
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GNOME_LIBS} \
${GCONF_LIBS} \
- ${GLADE_LIBS} \
${GLIB_LIBS} \
${GWENGUI_GTK2_LIBS} \
${AQBANKING_LIBS}
@@ -64,7 +63,6 @@
-I${top_srcdir}/src/libqof/qof \
${GNOME_CFLAGS} \
${GCONF_CFLAGS} \
- ${GLADE_CFLAGS} \
${GLIB_CFLAGS} \
${AQBANKING_CFLAGS}
Modified: gnucash/trunk/src/import-export/csv/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/import-export/csv/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -43,7 +43,6 @@
-I${top_srcdir}/lib/libc \
-I${top_srcdir}/lib \
${GCONF_CFLAGS} \
- ${GLADE_CFLAGS} \
${GUILE_INCS} \
${GLIB_CFLAGS} \
$(GOFFICE_CFLAGS)
Modified: gnucash/trunk/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/log-replay/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/import-export/log-replay/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -35,8 +35,8 @@
-I${top_srcdir}/src/import-export \
-I${top_srcdir}/src/libqof/qof \
${GCONF_CFLAGS} \
- ${GLADE_CFLAGS} \
${GUILE_INCS} \
+ ${GTK_CFLAGS} \
${GLIB_CFLAGS}
uidir = $(GNC_UI_DIR)
Modified: gnucash/trunk/src/import-export/ofx/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/ofx/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/import-export/ofx/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -37,8 +37,8 @@
-I${top_srcdir}/src/import-export \
-I${top_srcdir}/src/libqof/qof \
${GCONF_CFLAGS} \
- ${GLADE_CFLAGS} \
${GUILE_INCS} \
+ ${GTK_CFLAGS} \
${GLIB_CFLAGS} \
${LIBOFX_CFLAGS}
Modified: gnucash/trunk/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/import-export/qif-import/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -26,7 +26,6 @@
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GUILE_LIBS} \
${GCONF_LIBS} \
- ${GLADE_LIBS} \
${GLIB_LIBS}
@@ -64,7 +63,7 @@
-I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
${GLIB_CFLAGS} \
- ${GLADE_CFLAGS} \
+ ${GTK_CFLAGS} \
${GCONF_CFLAGS}
uidir = $(GNC_UI_DIR)
Modified: gnucash/trunk/src/optional/gtkmm/Makefile.am
===================================================================
--- gnucash/trunk/src/optional/gtkmm/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/optional/gtkmm/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -43,7 +43,6 @@
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GTKMM_LIBS} \
${GCONF_LIBS} \
- ${GLADE_LIBS} \
${GLIB_LIBS}
AM_CPPFLAGS = \
@@ -54,15 +53,14 @@
-I${top_srcdir}/src/engine \
${GTKMM_CFLAGS} \
${GCONF_CFLAGS} \
- ${GLADE_CFLAGS} \
${GLIB_CFLAGS}
uidir = $(GNC_UI_DIR)
ui_DATA = gnc-plugin-gtkmm-ui.xml
-gladedir = $(GNC_GLADE_DIR)
-glade_DATA =
+gtkbuilderdir = $(GNC_GTKBUILDER_DIR)
+gtkbuilder_DATA =
-EXTRA_DIST = ${ui_DATA} ${glade_DATA}
+EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA}
INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui.gtkmm\"
Modified: gnucash/trunk/src/optional/gtkmm/test/Makefile.am
===================================================================
--- gnucash/trunk/src/optional/gtkmm/test/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/optional/gtkmm/test/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -24,7 +24,6 @@
test_gtkmm_LDADD = ${top_builddir}/${MODULEPATH}/libgncmod-gtkmm.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GTKMM_LIBS} \
- ${GLADE_LIBS} \
${GLIB_LIBS}
AM_CPPFLAGS = \
@@ -38,5 +37,4 @@
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/optional/gtkmm \
${GTKMM_CFLAGS} \
- ${GLADE_CFLAGS} \
${GLIB_CFLAGS}
Modified: gnucash/trunk/src/optional/python-bindings/Makefile.am
===================================================================
--- gnucash/trunk/src/optional/python-bindings/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/optional/python-bindings/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -34,7 +34,6 @@
_gnucash_core_c_la_LIBADD = \
${GLIB_LIBS} \
- ${GLADE_LIBS} \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la
Modified: gnucash/trunk/src/plugins/bi_import/Makefile.am
===================================================================
--- gnucash/trunk/src/plugins/bi_import/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/plugins/bi_import/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -27,7 +27,6 @@
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${top_builddir}/lib/libc/libc-missing.la \
${GCONF_LIBS} \
- ${GLADE_LIBS} \
${QOF_LIBS} \
${GLIB_LIBS}
@@ -50,7 +49,7 @@
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/lib/libc \
${GCONF_CFLAGS} \
- ${GLADE_CFLAGS} \
+ ${GTK_CFLAGS} \
${QOF_CFLAGS} \
${GLIB_CFLAGS}
Modified: gnucash/trunk/src/register/ledger-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/ledger-core/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/register/ledger-core/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -33,7 +33,6 @@
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
- ${GLADE_LIBS} \
${GCONF_LIBS} \
${GUILE_LIBS} \
${GTK_LIBS} \
@@ -50,8 +49,8 @@
-I${top_srcdir}/src/register/register-gnome \
-I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
- ${GLADE_CFLAGS} \
${GCONF_CFLAGS} \
+ ${GTK_CFLAGS} \
${GLIB_CFLAGS}
Modified: gnucash/trunk/src/register/register-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/register/register-core/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -62,7 +62,7 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
- ${GLADE_CFLAGS} \
+ ${GTK_CFLAGS} \
${GLIB_CFLAGS}
CLEANFILES = $(BUILT_SOURCES)
Modified: gnucash/trunk/src/register/register-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-gnome/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/register/register-gnome/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -61,7 +61,6 @@
-I${top_srcdir}/src/register/register-core \
-I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
- ${GLADE_CFLAGS} \
${GLIB_CFLAGS} \
${GTK_XIM_FLAGS} \
${GNOME_CFLAGS}
Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am 2012-01-23 19:50:04 UTC (rev 21879)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am 2012-01-23 20:45:26 UTC (rev 21880)
@@ -14,9 +14,9 @@
-I${top_srcdir}/src/html \
-I${top_srcdir}/src/report/report-system \
-I${top_srcdir}/src/libqof/qof \
- ${GLADE_CFLAGS} \
${GUILE_INCS} \
${GCONF_CFLAGS} \
+ ${GTK_CFLAGS} \
${GLIB_CFLAGS}
libgncmod_report_gnome_la_SOURCES = \
@@ -47,7 +47,6 @@
${top_builddir}/src/html/libgncmod-html.la \
${top_builddir}/src/report/report-system/libgncmod-report-system.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
- ${GLADE_LIBS} \
${GUILE_LIBS} \
${GCONF_LIBS} \
${GLIB_LIBS}
More information about the gnucash-changes
mailing list