evolution-webcal r411 - in trunk: . src

[danw svn gnome org]

Author: danw
Date: Thu Jan 17 14:55:45 2008
New Revision: 411
URL: http://svn.gnome.org/viewvc/evolution-webcal?rev=411&view=rev

Log:
	* configure.ac: Require libsoup 2.4

	* src/evolution-webcal-notify.c: 
	* src/evolution-webcal-main.c: Minor updates for libsoup 2.4


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/evolution-webcal-main.c
   trunk/src/evolution-webcal-notify.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Jan 17 14:55:45 2008
@@ -28,10 +28,7 @@
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 AM_GCONF_SOURCE_2
 
-# Check for libsoup-2.4 and fall back to 2.2 if not found
-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, LIBSOUP_API=2.4, LIBSOUP_API=2.2)
-
-PKG_CHECK_MODULES(EVOLUTION_WEBCAL, glib-2.0 >= 2.8 gtk+-2.0 >= 2.4 libgnome-2.0 >= 2.14 libgnomeui-2.0 libecal-1.2 >= 1.1.0 libsoup-$LIBSOUP_API >= 2.1.8)
+PKG_CHECK_MODULES(EVOLUTION_WEBCAL, glib-2.0 >= 2.8 gtk+-2.0 >= 2.4 libgnome-2.0 >= 2.14 libgnomeui-2.0 libecal-1.2 >= 1.1.0 libsoup-2.4 >= 2.3.0)
 AC_SUBST(EVOLUTION_WEBCAL_CFLAGS)
 AC_SUBST(EVOLUTION_WEBCAL_LIBS)
 

Modified: trunk/src/evolution-webcal-main.c
==============================================================================
--- trunk/src/evolution-webcal-main.c	(original)
+++ trunk/src/evolution-webcal-main.c	Thu Jan 17 14:55:45 2008
@@ -45,7 +45,7 @@
 
   comp = icalparser_parse_string (body);
   if (comp == NULL) {
-    SoupUri * tmpuri;
+    SoupURI * tmpuri;
     gchar * message, * tmpname;
 
     tmpuri = soup_uri_new (uri);
@@ -100,16 +100,15 @@
   bonobo_main_quit ();
 }
 
-static void e_webcal_read (SoupMessage * msg, gpointer data) {
-  const SoupUri * tmpuri;
+static void e_webcal_read (SoupSession *session, SoupMessage * msg, gpointer data) {
+  const SoupURI * tmpuri;
   const gchar * uri = (const gchar *) data;
   const gchar * header;
-  gchar * body;
 
   tmpuri = soup_message_get_uri (msg);
 
   if (SOUP_STATUS_IS_REDIRECTION (msg->status_code)) {
-    header = soup_message_get_header (msg->response_headers, "Location");
+    header = soup_message_headers_get (msg->response_headers, "Location");
     if (header) {
       e_webcal_open_cal_http (header, uri);
     }
@@ -154,9 +153,7 @@
     return;
   }
 
-  body = g_strndup (msg->response.body, msg->response.length);
-  e_webcal_load (body, uri);
-  g_free (body);
+  e_webcal_load (msg->response_body->data, uri);
 
   g_free (data);
 }
@@ -188,7 +185,7 @@
   soup_message_set_flags (message, SOUP_MESSAGE_NO_REDIRECT);
 
   soup_session_queue_message (session, message,
-			      (SoupMessageCallbackFn) e_webcal_read,
+			      (SoupSessionCallback) e_webcal_read,
 			      (gpointer) olduri);
 }
 

Modified: trunk/src/evolution-webcal-notify.c
==============================================================================
--- trunk/src/evolution-webcal-notify.c	(original)
+++ trunk/src/evolution-webcal-notify.c	Thu Jan 17 14:55:45 2008
@@ -249,7 +249,7 @@
   GtkWidget * rlabel, * clabel;
   GtkWidget * cbutton;
   GtkWidget * label, * button;
-  SoupUri * tmpuri;
+  SoupURI * tmpuri;
   gchar * tmpname;
   gchar * icofile, * mrkname, * ref_str;
   gint ref_timeout, ref_multi;