Fix some building and linking problems with the soup backend

The soup backend was not being linked to the atom library and it used
the wrong names for some error functions.

diff --git a/atom/Makefile.am b/atom/Makefile.am
index 5bb2ff2..0206273 100644 (file)
--- a/atom/Makefile.am
+++ b/atom/Makefile.am
@@ -3,10 +3,11 @@ libatom_la_SOURCES = id.c entry.c person.c feed.c \
                config.c ctx.c backend.c error.c frontend.c request.c \
                core.c
 libatom_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
-libatom_la_CFLAGS += $(XML_CFLAGS) $(GIO_CFLAGS)
-libatom_la_LIBADD = $(GIO_LIBS) $(GLIB_LIBS) $(XML_LIBS)
+libatom_la_CFLAGS += $(XML_CFLAGS) $(GIO_CFLAGS) $(SOUP_CFLAGS)
+libatom_la_LIBADD = $(GIO_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(SOUP_LIBS)
 libatom_la_LIBADD += -L$(top_builddir)/backend/files -lgiochannel
 libatom_la_LIBADD += -L$(top_builddir)/backend/gio -lgio
+libatom_la_LIBADD += -L$(top_builddir)/backend/soup -lsoup
 libatom_la_LIBADD += -L$(top_builddir)/frontend/cgi -lcgi
 libatom_la_LIBADD += -L$(top_builddir)/config -lgkeyfile
 libatom_la_LIBADD += -L$(top_builddir)/iri -liri

diff --git a/backend/soup/soup.c b/backend/soup/soup.c
index 2e70307..49720fb 100644 (file)
--- a/backend/soup/soup.c
+++ b/backend/soup/soup.c
@@ -42,8 +42,8 @@ soup_message_to_atom (AtomCtx *ctx, SoupMessage *message)
   if (message->status_code != 200)
     {
       AtomError *aerr = atom_error_new ();
-      atom_error_set_code (aerr, message->status_code);
-      atom_error_set_message (aerr, message->reason_phrase);
+      atom_error_code_set (aerr, message->status_code);
+      atom_error_message_set (aerr, message->reason_phrase);
       atom_error_set (ctx, aerr);
       return NULL;
     }
@@ -89,8 +89,8 @@ soup_atom_publish_entry (AtomCtx *ctx, char *req, AtomEntry *entry)
   if (message->status_code != 201)
     {
       AtomError *aerr = atom_error_new ();
-      atom_error_set_code (aerr, message->status_code);
-      atom_error_set_message (aerr, message->reason_phrase);
+      atom_error_code_set (aerr, message->status_code);
+      atom_error_message_set (aerr, message->reason_phrase);
       atom_error_set (ctx, aerr);
     }
   g_object_unref (message);