[evolution-rss] fix crash when no proxy setup
- From: Lucian Langa <lucilanga src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution-rss] fix crash when no proxy setup
- Date: Fri, 8 May 2009 08:19:11 -0400 (EDT)
commit f349c6bf701385d30c6cc3615b091bce12827396
Author: Lucian Langa <lucilanga gnome org>
Date: Fri May 8 15:18:58 2009 +0300
fix crash when no proxy setup
---
configure.ac | 4 ++--
src/network-soup.c | 1 +
src/rss.c | 8 +++++---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 675a2e9..32e51d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
[libgnome-2.0 >= $LIBGNOME_REQUIRED dnl
libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dnl
gtk+-2.0 >= $LIBGTK_REQUIRED dnl
- libsoup$SOUP >= $LIBSOUP_REQUIRED dnl
+ dnl libsoup$SOUP >= $LIBSOUP_REQUIRED dnl
libsoup-gnome$SOUP >= $LIBSOUP_REQUIRED dnl
evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
@@ -234,7 +234,7 @@ dnl ********************
SOUP_VERSION=`$PKG_CONFIG --modversion libsoup$SOUP`
SOUP_VERSION=`echo $SOUP_VERSION|$AWK -F . '{print $1 * 1000000 + $2 * 1000 + $3}'`
AC_SUBST(SOUP_VERSION)
-LIBSOUP_LIBS=`$PKG_CONFIG --libs libsoup$SOUP`
+LIBSOUP_LIBS=`$PKG_CONFIG --libs libsoup$SOUP libsoup-gnome$SOUP`
AC_SUBST(LIBSOUP_LIBS)
dnl ***********
diff --git a/src/network-soup.c b/src/network-soup.c
index ceee1c3..a67630e 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -25,6 +25,7 @@
#include <string.h>
#include <gconf/gconf-client.h>
#include <libsoup/soup-gnome.h>
+#include <libsoup/soup-gnome-features.h>
#include <libedataserver/e-proxy.h>
#include "network.h"
diff --git a/src/rss.c b/src/rss.c
index 1811cb1..7b26724 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -1470,9 +1470,11 @@ gecko_set_preferences(void)
g_free(agstr);
//I'm only forcing scheme here
uri = e_proxy_peek_uri_for(proxy, "http:///";);
- gecko_prefs_set_string("network.proxy.http", uri->host);
- gecko_prefs_set_int("network.proxy.http_port", uri->port);
- gecko_prefs_set_int("network.proxy.type", 1);
+ if (uri) {
+ gecko_prefs_set_string("network.proxy.http", uri->host);
+ gecko_prefs_set_int("network.proxy.http_port", uri->port);
+ gecko_prefs_set_int("network.proxy.type", 1);
+ }
// soup_uri_free(uri);
// uri = e_proxy_peek_uri_for(proxy, "https:///";);
// gecko_prefs_set_string("network.proxy.ssl", uri->host);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]