r15665 - gnucash/branches/module-cleanup - merge 15658 - remove network-utils ...
Peter McAlpine
prock at cvs.gnucash.org
Sun Feb 25 17:22:20 EST 2007
Author: prock
Date: 2007-02-25 17:22:19 -0500 (Sun, 25 Feb 2007)
New Revision: 15665
Trac: http://svn.gnucash.org/trac/changeset/15665
Removed:
gnucash/branches/module-cleanup/src/network-utils/
Modified:
gnucash/branches/module-cleanup/configure.in
gnucash/branches/module-cleanup/src/Makefile.am
gnucash/branches/module-cleanup/src/gnome-utils/Makefile.am
gnucash/branches/module-cleanup/src/gnome-utils/gnc-html.c
gnucash/branches/module-cleanup/src/gnome-utils/gnc-html.h
gnucash/branches/module-cleanup/src/gnome-utils/gncmod-gnome-utils.c
gnucash/branches/module-cleanup/src/gnome-utils/test/Makefile.am
gnucash/branches/module-cleanup/src/gnome/Makefile.am
gnucash/branches/module-cleanup/src/import-export/qif/test/Makefile.am
gnucash/branches/module-cleanup/src/import-export/test/Makefile.am
gnucash/branches/module-cleanup/src/report/report-gnome/test/Makefile.am
gnucash/branches/module-cleanup/src/report/stylesheets/test/Makefile.am
Log:
merge 15658 - remove network-utils ...
Modified: gnucash/branches/module-cleanup/configure.in
===================================================================
--- gnucash/branches/module-cleanup/configure.in 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/configure.in 2007-02-25 22:22:19 UTC (rev 15665)
@@ -1969,15 +1969,9 @@
AC_SUBST(GNUCASH_APP_UTILS_CFLAGS)
AC_SUBST(GNUCASH_APP_UTILS_LIBS)
-GNUCASH_NETWORK_UTILS_CFLAGS="${GLIB_CFLAGS} ${GHTTP_CFLAGS} ${GNOME_INCLUDEDIR}"
-GNUCASH_NETWORK_UTILS_LIBS="${GHTTP_LIBS} ${GNOME_LIBDIR} ${GNOME_LIBS} ${GNOMEUI_LIBS} -lgncmod-network-utils"
+GNUCASH_GNOME_UTILS_CFLAGS="${GNUCASH_APP_UTILS_CFLAGS} ${GNOME_PRINT_CFLAGS} ${GNOME_INCLUDEDIR} ${GDK_PIXBUF_CFLAGS}"
+GNUCASH_GNOME_UTILS_LIBS="${GNUCASH_APP_UTILS_LIBS} ${GNOME_LIBDIR} ${GNOMEUI_LIBS} ${GNOME_PRINT_LIBS} ${GTKHTML_LIBS} ${GLADE_LIBS} ${GDK_PIXBUF_LIBS} -lgncmod-gnome-utils"
-AC_SUBST(GNUCASH_NETWORK_UTILS_CFLAGS)
-AC_SUBST(GNUCASH_NETWORK_UTILS_LIBS)
-
-GNUCASH_GNOME_UTILS_CFLAGS="${GNUCASH_APP_UTILS_CFLAGS} ${GNUCASH_NETWORK_UTILS_CFLAGS} ${GNOME_PRINT_CFLAGS} ${GNOME_INCLUDEDIR} ${GDK_PIXBUF_CFLAGS}"
-GNUCASH_GNOME_UTILS_LIBS="${GNUCASH_APP_UTILS_LIBS} ${GNUCASH_NETWORK_UTILS_LIBS} ${GNOME_LIBDIR} ${GNOMEUI_LIBS} ${GNOME_PRINT_LIBS} ${GTKHTML_LIBS} ${GLADE_LIBS} ${GDK_PIXBUF_LIBS} -lgncmod-gnome-utils"
-
AC_SUBST(GNUCASH_GNOME_UTILS_CFLAGS)
AC_SUBST(GNUCASH_GNOME_UTILS_LIBS)
@@ -2207,8 +2201,6 @@
src/import-export/hbci/glade/Makefile
src/import-export/hbci/schemas/Makefile
src/import-export/hbci/test/Makefile
- src/network-utils/Makefile
- src/network-utils/test/Makefile
src/optional/Makefile
src/optional/xsl/Makefile
src/pixmaps/Makefile
Modified: gnucash/branches/module-cleanup/src/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/Makefile.am 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/src/Makefile.am 2007-02-25 22:22:19 UTC (rev 15665)
@@ -10,7 +10,6 @@
quotes
GUI_SUBDIRS_1 = \
- network-utils \
calculation \
tax \
app-utils \
Modified: gnucash/branches/module-cleanup/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/gnome/Makefile.am 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/src/gnome/Makefile.am 2007-02-25 22:22:19 UTC (rev 15665)
@@ -108,7 +108,6 @@
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/calculation \
-I${top_srcdir}/src/engine \
- -I${top_srcdir}/src/network-utils \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/backend/file \
-I${top_srcdir}/src/gnome-utils \
Modified: gnucash/branches/module-cleanup/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/gnome-utils/Makefile.am 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/src/gnome-utils/Makefile.am 2007-02-25 22:22:19 UTC (rev 15665)
@@ -9,7 +9,6 @@
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/backend/file \
- -I${top_srcdir}/src/network-utils \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src \
-I${top_builddir}/src \
@@ -176,7 +175,6 @@
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/backend/file/libgnc-backend-file-utils.la \
${top_builddir}/src/calculation/libgnc-calculation.la \
- ${top_builddir}/src/network-utils/libgncmod-network-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
$(top_builddir)/lib/libc/libc-missing.la \
${GNOME_LIBS} \
Modified: gnucash/branches/module-cleanup/src/gnome-utils/gnc-html.c
===================================================================
--- gnucash/branches/module-cleanup/src/gnome-utils/gnc-html.c 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/src/gnome-utils/gnc-html.c 2007-02-25 22:22:19 UTC (rev 15665)
@@ -49,7 +49,6 @@
#include "gnc-engine.h"
#include "gnc-gui-query.h"
#include "gnc-html.h"
-#include "gnc-http.h"
#include "gnc-html-history.h"
#include "gnc-html-graph-gog.h"
#include "gnc-ui.h"
@@ -65,7 +64,7 @@
URLType base_type; /* base of URL (path - filename) */
gchar * base_location;
- gnc_http * http; /* handles HTTP requests */
+ //gnc_http * http; /* handles HTTP requests */
GHashTable * request_info; /* hash uri to GList of GtkHTMLStream * */
/* callbacks */
@@ -541,9 +540,7 @@
g_hash_table_insert(html->request_info, uri, handles);
if(need_request) {
- gnc_set_busy_cursor (html->html, FALSE);
- gnc_http_start_request(html->http, uri, gnc_html_http_request_cb,
- (gpointer)html);
+ g_critical("we've not supported network requests for years");
}
}
@@ -898,14 +895,9 @@
DEBUG(" ");
form_data = gnc_html_unpack_form_data(encoded_form_data);
type = gnc_html_parse_url(gnchtml, action, &location, &label);
+
+ g_critical("form submission hasn't been supported in years.");
- if(!strcasecmp(method, "get")) {
- gnc_html_generic_get_submit(gnchtml, action, form_data);
- }
- else if(!strcasecmp(method, "post")) {
- gnc_html_generic_post_submit(gnchtml, action, form_data);
- }
-
g_free(location);
g_free(label);
g_free(new_loc);
@@ -1149,7 +1141,7 @@
GTK_WIDGET(retval->html));
retval->request_info = g_hash_table_new(g_str_hash, g_str_equal);
- retval->http = gnc_http_new();
+ //retval->http = gnc_http_new();
retval->history = gnc_html_history_new();
g_object_ref (retval->container);
@@ -1209,7 +1201,7 @@
gnc_html_cancel(gnc_html * html)
{
/* remove our own references to requests */
- gnc_http_cancel_requests(html->http);
+ //gnc_http_cancel_requests(html->http);
g_hash_table_foreach_remove(html->request_info, html_cancel_helper, NULL);
}
@@ -1613,94 +1605,3 @@
g_string_free(escaped, FALSE);
return out;
}
-
-
-/********************************************************************
- * gnc_html_generic_get_submit() : normal 'get' submit method.
- ********************************************************************/
-
-void
-gnc_html_generic_get_submit(gnc_html * html, const char * action,
- GHashTable * form_data)
-{
- URLType type;
- char * location = NULL;
- char * label = NULL;
- char * fullurl = NULL;
- char * encoded = gnc_html_pack_form_data(form_data);
-
- type = gnc_html_parse_url(html, action, &location, &label);
- fullurl = g_strconcat(location, "?", encoded, NULL);
- gnc_html_show_url(html, type, fullurl, label, 0);
-
- g_free(encoded);
- g_free(location);
- g_free(label);
- g_free(fullurl);
-}
-
-
-/********************************************************************
- * gnc_html_generic_post_submit() : normal 'post' submit method.
- ********************************************************************/
-
-void
-gnc_html_generic_post_submit(gnc_html * html, const char * action,
- GHashTable * form_data)
-{
- char * encoded = gnc_html_pack_form_data(form_data);
- char * copy = strdup(encoded);
- gnc_http_start_post(html->http, action,
- "application/x-www-form-urlencoded",
- copy, strlen(copy),
- gnc_html_http_request_cb, html);
- g_free(encoded);
-}
-
-
-/********************************************************************
- * gnc_html_multipart_post_submit() : this is really sort of useless
- * but I'll make it better later. It's useless because FTMP CGI/php
- * don't properly decode the urlencoded values.
- ********************************************************************/
-
-static void
-multipart_post_helper(gpointer key, gpointer val,
- gpointer user_data)
-{
- char * old_str = *(char **)user_data;
- char * new_str =
- g_strconcat(old_str,
- "--XXXgncXXX\r\n",
- "Content-Disposition: form-data; name=\"",
- (char *)key, "\"\r\n\r\n",
- (char *)val, "\r\n",
- NULL);
- *(char **)user_data = new_str;
- g_free(old_str);
-}
-
-
-void
-gnc_html_multipart_post_submit(gnc_html * html, const char * action,
- GHashTable * form_data)
-{
-
- char * htmlstr = g_strdup("");
- char * next_htmlstr;
-
- /* encode the arguments from the hash table */
- g_hash_table_foreach(form_data, multipart_post_helper, &htmlstr);
-
- /* add the closing boundary marker */
- next_htmlstr = g_strconcat(htmlstr, "--XXXgncXXX--\r\n", NULL);
- g_free(htmlstr);
- htmlstr = next_htmlstr;
- next_htmlstr = NULL;
- gnc_http_start_post(html->http, action,
- "multipart/form-data; boundary=XXXgncXXX",
- htmlstr, strlen(htmlstr),
- gnc_html_http_request_cb, html);
-
- g_free(htmlstr);
-}
Modified: gnucash/branches/module-cleanup/src/gnome-utils/gnc-html.h
===================================================================
--- gnucash/branches/module-cleanup/src/gnome-utils/gnc-html.h 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/src/gnome-utils/gnc-html.h 2007-02-25 22:22:19 UTC (rev 15665)
@@ -138,16 +138,6 @@
GncHTMLUrlCB hand);
void gnc_html_unregister_url_handler(URLType url_type);
-/* default action handlers for GET and POST methods. 'generic_post'
- * is the trivial application/x-www-form-urlencoded submit,
- * multipart-post is a multipart/form-data submit. */
-void gnc_html_generic_get_submit(gnc_html * html, const char * act,
- GHashTable * form_data);
-void gnc_html_generic_post_submit(gnc_html * html, const char * act,
- GHashTable * form_data);
-void gnc_html_multipart_post_submit(gnc_html * html, const char * a,
- GHashTable * form_data);
-
URLType gnc_html_parse_url(gnc_html * html, const gchar * url,
char ** url_location, char ** url_label);
Modified: gnucash/branches/module-cleanup/src/gnome-utils/gncmod-gnome-utils.c
===================================================================
--- gnucash/branches/module-cleanup/src/gnome-utils/gncmod-gnome-utils.c 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/src/gnome-utils/gncmod-gnome-utils.c 2007-02-25 22:22:19 UTC (rev 15665)
@@ -59,12 +59,6 @@
return FALSE;
}
- /* load the calculation module (we depend on it) */
- if(!gnc_module_load("gnucash/network-utils", 0)) {
- return FALSE;
- }
-
- /* load the calculation module (we depend on it) */
if(!gnc_module_load("gnucash/app-utils", 0)) {
return FALSE;
}
Modified: gnucash/branches/module-cleanup/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/gnome-utils/test/Makefile.am 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/src/gnome-utils/test/Makefile.am 2007-02-25 22:22:19 UTC (rev 15665)
@@ -18,7 +18,6 @@
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/src/backend/file \
- --library-dir ${top_builddir}/src/network-utils \
--library-dir ${top_builddir}/src/calculation \
--library-dir ${top_builddir}/src/app-utils \
--library-dir ${top_builddir}/src/gnome-utils
Modified: gnucash/branches/module-cleanup/src/import-export/qif/test/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/import-export/qif/test/Makefile.am 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/src/import-export/qif/test/Makefile.am 2007-02-25 22:22:19 UTC (rev 15665)
@@ -36,7 +36,6 @@
--gnc-module-dir ${top_srcdir}/src/app-utils \
--gnc-module-dir ${top_srcdir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/network-utils \
--gnc-module-dir ${top_builddir}/src/gnome \
--guile-load-dir ${top_srcdir}/src/scm \
--guile-load-dir ${top_srcdir}/src/import-export \
Modified: gnucash/branches/module-cleanup/src/import-export/test/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/import-export/test/Makefile.am 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/src/import-export/test/Makefile.am 2007-02-25 22:22:19 UTC (rev 15665)
@@ -30,7 +30,6 @@
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/src/backend/file \
- --library-dir ${top_builddir}/src/network-utils \
--library-dir ${top_builddir}/src/calculation \
--library-dir ${top_builddir}/src/app-utils \
--library-dir ${top_builddir}/src/gnome-utils \
Modified: gnucash/branches/module-cleanup/src/report/report-gnome/test/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/report/report-gnome/test/Makefile.am 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/src/report/report-gnome/test/Makefile.am 2007-02-25 22:22:19 UTC (rev 15665)
@@ -13,7 +13,6 @@
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/src/backend/file \
- --library-dir ${top_builddir}/src/network-utils \
--library-dir ${top_builddir}/src/calculation \
--library-dir ${top_builddir}/src/app-utils \
--library-dir ${top_builddir}/src/gnome-utils \
Modified: gnucash/branches/module-cleanup/src/report/stylesheets/test/Makefile.am
===================================================================
--- gnucash/branches/module-cleanup/src/report/stylesheets/test/Makefile.am 2007-02-25 22:11:23 UTC (rev 15664)
+++ gnucash/branches/module-cleanup/src/report/stylesheets/test/Makefile.am 2007-02-25 22:22:19 UTC (rev 15665)
@@ -11,7 +11,6 @@
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/src/backend/file \
- --library-dir ${top_builddir}/src/network-utils \
--library-dir ${top_builddir}/src/calculation \
--library-dir ${top_builddir}/src/app-utils \
--library-dir ${top_builddir}/src/gnome-utils \
More information about the gnucash-changes
mailing list