evolution-rss r333 - in trunk: . m4 src

[lucilanga svn gnome org]

Author: lucilanga
Date: Sat Jul  5 13:27:34 2008
New Revision: 333
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=333&view=rev

Log:
2008-07-05  Lucian Langa  <lucilanga gnome org>

* src/misc: sanitize_url() parse aditional
url (beging with feed:)
* src/network-soup.c: 
net_post_blocking() - fix handling url

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/m4/gecko.m4
   trunk/src/misc.c
   trunk/src/network-soup.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jul  5 13:27:34 2008
@@ -180,7 +180,8 @@
 if test "x$have_gecko" != "xno"; then
 	if test $GECKO = libxul-embedding; then
 		PKG_CHECK_MODULES([GECKO],[libxul-embedding $gecko_cv_extra_pkg_dependencies  >= $gecko_min_version])
-		GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
+		#GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
+		#GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
 	elif test $GECKO = firefox; then
 		GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags firefox-xpcom)"
     		PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version])
@@ -214,8 +215,8 @@
 			AC_SUBST(HAVE_GECKO_1_9)
 			fi
 		#fi
-		_SAVE_CPPFLAGS="$CPPFLAGS"
-               	CPPFLAGS="$CPPFLAGS $GECKO_CFLAGS"
+#		_SAVE_CPPFLAGS="$CPPFLAGS"
+#               	CPPFLAGS="$CPPFLAGS $GECKO_CFLAGS"
                	AC_MSG_CHECKING([[whether we have a xpcom glue]])
                	AC_COMPILE_IFELSE(
                        [AC_LANG_SOURCE(
@@ -227,7 +228,7 @@
                        [gecko_cv_have_xpcom_glue=yes],
                        [gecko_cv_have_xpcom_glue=no])
                	AC_MSG_RESULT([$gecko_cv_have_xpcom_glue])
-               	CPPFLAGS="$_SAVE_CPPFLAGS"
+#               	CPPFLAGS="$_SAVE_CPPFLAGS"
                	AM_CONDITIONAL([HAVE_XPCOM_GLUE], [test "$gecko_cv_have_xpcom_glue" = "yes"])
 		AC_ARG_WITH([primary-render],
         		AS_HELP_STRING([--with-primary-render],[Forces Gecko to be the primary html renderer  @<:@=gecko|webkit@:>@ (default:gtkHTML)]),

Modified: trunk/m4/gecko.m4
==============================================================================
--- trunk/m4/gecko.m4	(original)
+++ trunk/m4/gecko.m4	Sat Jul  5 13:27:34 2008
@@ -61,8 +61,8 @@
 gecko_cv_gecko=$with_gecko
 
 # Autodetect gecko
-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul"
-#_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul"
+#_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul"
+_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul"
 if test -z "$gecko_cv_gecko"; then
 	for lizard in $_geckos; do
 		if $PKG_CONFIG --exists $lizard-xpcom; then

Modified: trunk/src/misc.c
==============================================================================
--- trunk/src/misc.c	(original)
+++ trunk/src/misc.c	Sat Jul  5 13:27:34 2008
@@ -65,6 +65,8 @@
 {
 	if (strstr(text, "feed//"))
 		text = strextr(text, "feed//");
+	if (strstr(text, "feed:"))
+		text = strextr(text, "feed:");
 	if (strstr(text, "feed://"))
 		text = strextr(text, "feed://");
  	if (!strstr (text, "http://";) 

Modified: trunk/src/network-soup.c
==============================================================================
--- trunk/src/network-soup.c	(original)
+++ trunk/src/network-soup.c	Sat Jul  5 13:27:34 2008
@@ -488,7 +488,7 @@
 
 	if (!rf->b_session)
 		rf->b_session = soup_sess = 
-			soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL);
+			soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL);		
 	else
 		soup_sess = rf->b_session;
 
@@ -499,14 +499,14 @@
             G_CALLBACK (reauthenticate), soup_sess);
 #endif
 
-	suri = soup_uri_new(url);
-	if (!suri)
+	req = soup_message_new(SOUP_METHOD_GET, url);
+	if (!req)
 	{
 		g_set_error(err, NET_ERROR, NET_ERROR_GENERIC,
 				soup_status_get_phrase(2));			//invalid url
 		goto out;
 	}
-	req = soup_message_new_from_uri(SOUP_METHOD_GET, suri);
+	d(g_print("request ok :%d\n", req->status_code));
 	g_signal_connect(G_OBJECT(req), "got-chunk",
 			G_CALLBACK(got_chunk_blocking_cb), &info);
 	for (; headers; headers = headers->next) {