summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--docs/reference/Makefile.am2
-rw-r--r--libsoup/Makefile.am8
-rw-r--r--libsoup/soup-address.c1
-rw-r--r--libsoup/soup-auth-domain-basic.c1
-rw-r--r--libsoup/soup-auth-domain-digest.c1
-rw-r--r--libsoup/soup-auth-manager.c3
-rw-r--r--libsoup/soup-auth.c1
-rw-r--r--libsoup/soup-body-input-stream.c3
-rw-r--r--libsoup/soup-client-input-stream.c3
-rw-r--r--libsoup/soup-connection.c3
-rw-r--r--libsoup/soup-cookie-jar.c3
-rw-r--r--libsoup/soup-message.c25
-rw-r--r--libsoup/soup-server.c9
-rw-r--r--libsoup/soup-session.c13
-rw-r--r--libsoup/soup-socket.c9
16 files changed, 34 insertions, 52 deletions
diff --git a/.gitignore b/.gitignore
index b3a877b9..d7c22fba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ libsoup-zip
libsoup-2.4.pc
libsoup-gnome-2.4.pc
libsoup/soup-enum-types.*
-libsoup/soup-marshal.*
libsoup/Soup-2.4.gir
libsoup/Soup-2.4.typelib
libsoup/SoupGNOME-2.4.gir
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index d36977ec..29ff97e0 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -29,7 +29,7 @@ HFILE_GLOB=
CFILE_GLOB=
# Header files to ignore when scanning.
-IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \
+IGNORE_HFILES= soup.h soup-enum-types.h \
soup-message-private.h soup-session-private.h \
soup-auth-basic.h soup-auth-digest.h soup-auth-ntlm.h \
soup-connection.h soup-connection-auth.h \
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index d54a06a9..c2f69aec 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -142,8 +142,6 @@ libsoup_2_4_la_SOURCES = \
soup-io-stream.h \
soup-io-stream.c \
soup-logger.c \
- soup-marshal.h \
- soup-marshal.c \
soup-message.c \
soup-message-body.c \
soup-message-client-io.c \
@@ -226,13 +224,11 @@ libsoup_gnome_2_4_la_SOURCES = \
endif
-GLIB_GENERATED = soup-marshal.c soup-marshal.h
-GLIB_GENERATED += soup-enum-types.c soup-enum-types.h
+GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
BUILT_SOURCES = \
$(GLIB_GENERATED) \
tld_data.inc
-soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES)
soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
@@ -248,7 +244,7 @@ if HAVE_INTROSPECTION
# Core library
gi_soup_files = \
- $(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
+ $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
$(soup_headers) $(filter-out %.h, $(libsoup_2_4_la_SOURCES)))
gi_built_soup_files = soup-enum-types.h
diff --git a/libsoup/soup-address.c b/libsoup/soup-address.c
index da4da948..e2a06912 100644
--- a/libsoup/soup-address.c
+++ b/libsoup/soup-address.c
@@ -15,7 +15,6 @@
#include "soup-address.h"
#include "soup.h"
-#include "soup-marshal.h"
#include "soup-misc-private.h"
/**
diff --git a/libsoup/soup-auth-domain-basic.c b/libsoup/soup-auth-domain-basic.c
index 9e8afe8f..b843ad72 100644
--- a/libsoup/soup-auth-domain-basic.c
+++ b/libsoup/soup-auth-domain-basic.c
@@ -13,7 +13,6 @@
#include "soup-auth-domain-basic.h"
#include "soup.h"
-#include "soup-marshal.h"
/**
* SECTION:soup-auth-domain-basic
diff --git a/libsoup/soup-auth-domain-digest.c b/libsoup/soup-auth-domain-digest.c
index 6f48ce56..ebf3ddb6 100644
--- a/libsoup/soup-auth-domain-digest.c
+++ b/libsoup/soup-auth-domain-digest.c
@@ -15,7 +15,6 @@
#include "soup-auth-domain-digest.h"
#include "soup.h"
#include "soup-auth-digest.h"
-#include "soup-marshal.h"
/**
* SECTION:soup-auth-domain-digest
diff --git a/libsoup/soup-auth-manager.c b/libsoup/soup-auth-manager.c
index 3f230b1a..f40a9282 100644
--- a/libsoup/soup-auth-manager.c
+++ b/libsoup/soup-auth-manager.c
@@ -14,7 +14,6 @@
#include "soup-auth-manager.h"
#include "soup.h"
#include "soup-connection-auth.h"
-#include "soup-marshal.h"
#include "soup-message-private.h"
#include "soup-message-queue.h"
#include "soup-path-map.h"
@@ -146,7 +145,7 @@ soup_auth_manager_class_init (SoupAuthManagerClass *auth_manager_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupAuthManagerClass, authenticate),
NULL, NULL,
- _soup_marshal_NONE__OBJECT_OBJECT_BOOLEAN,
+ NULL,
G_TYPE_NONE, 3,
SOUP_TYPE_MESSAGE,
SOUP_TYPE_AUTH,
diff --git a/libsoup/soup-auth.c b/libsoup/soup-auth.c
index 8f1e2182..0c348ad4 100644
--- a/libsoup/soup-auth.c
+++ b/libsoup/soup-auth.c
@@ -14,7 +14,6 @@
#include "soup-auth.h"
#include "soup.h"
#include "soup-connection-auth.h"
-#include "soup-marshal.h"
/**
* SECTION:soup-auth
diff --git a/libsoup/soup-body-input-stream.c b/libsoup/soup-body-input-stream.c
index 939753a9..62747446 100644
--- a/libsoup/soup-body-input-stream.c
+++ b/libsoup/soup-body-input-stream.c
@@ -16,7 +16,6 @@
#include "soup-body-input-stream.h"
#include "soup.h"
#include "soup-filter-input-stream.h"
-#include "soup-marshal.h"
typedef enum {
SOUP_BODY_INPUT_STREAM_STATE_CHUNK_SIZE,
@@ -385,7 +384,7 @@ soup_body_input_stream_class_init (SoupBodyInputStreamClass *stream_class)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
g_object_class_install_property (
diff --git a/libsoup/soup-client-input-stream.c b/libsoup/soup-client-input-stream.c
index 78bc15f1..3e533ca8 100644
--- a/libsoup/soup-client-input-stream.c
+++ b/libsoup/soup-client-input-stream.c
@@ -11,7 +11,6 @@
#include "soup-client-input-stream.h"
#include "soup.h"
-#include "soup-marshal.h"
#include "soup-message-private.h"
struct _SoupClientInputStreamPrivate {
@@ -226,7 +225,7 @@ soup_client_input_stream_class_init (SoupClientInputStreamClass *stream_class)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
g_object_class_install_property (
diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c
index fbddfea3..7657fc9c 100644
--- a/libsoup/soup-connection.c
+++ b/libsoup/soup-connection.c
@@ -11,7 +11,6 @@
#include "soup-connection.h"
#include "soup.h"
-#include "soup-marshal.h"
#include "soup-message-queue.h"
#include "soup-misc-private.h"
@@ -249,7 +248,7 @@ soup_connection_class_init (SoupConnectionClass *connection_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupConnectionClass, disconnected),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/* properties */
diff --git a/libsoup/soup-cookie-jar.c b/libsoup/soup-cookie-jar.c
index 38ddf923..93fd157b 100644
--- a/libsoup/soup-cookie-jar.c
+++ b/libsoup/soup-cookie-jar.c
@@ -13,7 +13,6 @@
#include "soup-cookie-jar.h"
#include "soup.h"
-#include "soup-marshal.h"
/**
* SECTION:soup-cookie-jar
@@ -175,7 +174,7 @@ soup_cookie_jar_class_init (SoupCookieJarClass *jar_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupCookieJarClass, changed),
NULL, NULL,
- _soup_marshal_NONE__BOXED_BOXED,
+ NULL,
G_TYPE_NONE, 2,
SOUP_TYPE_COOKIE | G_SIGNAL_TYPE_STATIC_SCOPE,
SOUP_TYPE_COOKIE | G_SIGNAL_TYPE_STATIC_SCOPE);
diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c
index b65dd76b..cd206a2f 100644
--- a/libsoup/soup-message.c
+++ b/libsoup/soup-message.c
@@ -8,7 +8,6 @@
#include "soup-message.h"
#include "soup.h"
#include "soup-connection.h"
-#include "soup-marshal.h"
#include "soup-message-private.h"
/**
@@ -351,7 +350,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupMessageClass, wrote_informational),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -369,7 +368,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupMessageClass, wrote_headers),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -391,7 +390,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupMessageClass, wrote_chunk),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -414,7 +413,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
0, /* FIXME after next ABI break */
NULL, NULL,
- _soup_marshal_NONE__BOXED,
+ NULL,
G_TYPE_NONE, 1,
SOUP_TYPE_BUFFER);
@@ -435,7 +434,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupMessageClass, wrote_body),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -458,7 +457,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupMessageClass, got_informational),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -490,7 +489,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupMessageClass, got_headers),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -513,7 +512,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupMessageClass, got_chunk),
NULL, NULL,
- _soup_marshal_NONE__BOXED,
+ NULL,
G_TYPE_NONE, 1,
/* Use %G_SIGNAL_TYPE_STATIC_SCOPE so that
* the %SOUP_MEMORY_TEMPORARY buffers used
@@ -542,7 +541,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupMessageClass, got_body),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -579,7 +578,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
- _soup_marshal_NONE__STRING_BOXED,
+ NULL,
G_TYPE_NONE, 2,
G_TYPE_STRING,
G_TYPE_HASH_TABLE);
@@ -599,7 +598,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupMessageClass, restarted),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -616,7 +615,7 @@ soup_message_class_init (SoupMessageClass *message_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupMessageClass, finished),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
index cea950db..acf8fa14 100644
--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
@@ -14,7 +14,6 @@
#include "soup-server.h"
#include "soup.h"
#include "soup-message-private.h"
-#include "soup-marshal.h"
#include "soup-path-map.h"
/**
@@ -387,7 +386,7 @@ soup_server_class_init (SoupServerClass *server_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupServerClass, request_started),
NULL, NULL,
- _soup_marshal_NONE__OBJECT_POINTER,
+ NULL,
G_TYPE_NONE, 2,
SOUP_TYPE_MESSAGE,
SOUP_TYPE_CLIENT_CONTEXT);
@@ -412,7 +411,7 @@ soup_server_class_init (SoupServerClass *server_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupServerClass, request_read),
NULL, NULL,
- _soup_marshal_NONE__OBJECT_POINTER,
+ NULL,
G_TYPE_NONE, 2,
SOUP_TYPE_MESSAGE,
SOUP_TYPE_CLIENT_CONTEXT);
@@ -432,7 +431,7 @@ soup_server_class_init (SoupServerClass *server_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupServerClass, request_finished),
NULL, NULL,
- _soup_marshal_NONE__OBJECT_POINTER,
+ NULL,
G_TYPE_NONE, 2,
SOUP_TYPE_MESSAGE,
SOUP_TYPE_CLIENT_CONTEXT);
@@ -461,7 +460,7 @@ soup_server_class_init (SoupServerClass *server_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupServerClass, request_aborted),
NULL, NULL,
- _soup_marshal_NONE__OBJECT_POINTER,
+ NULL,
G_TYPE_NONE, 2,
SOUP_TYPE_MESSAGE,
SOUP_TYPE_CLIENT_CONTEXT);
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 2ae7249a..7ffd8f76 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -16,7 +16,6 @@
#include "soup-auth-manager.h"
#include "soup-cache-private.h"
#include "soup-connection.h"
-#include "soup-marshal.h"
#include "soup-message-private.h"
#include "soup-misc-private.h"
#include "soup-message-queue.h"
@@ -2840,7 +2839,7 @@ soup_session_class_init (SoupSessionClass *session_class)
G_SIGNAL_RUN_FIRST,
0, /* FIXME? */
NULL, NULL,
- _soup_marshal_NONE__OBJECT,
+ NULL,
G_TYPE_NONE, 1,
SOUP_TYPE_MESSAGE);
@@ -2860,7 +2859,7 @@ soup_session_class_init (SoupSessionClass *session_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupSessionClass, request_started),
NULL, NULL,
- _soup_marshal_NONE__OBJECT_OBJECT,
+ NULL,
G_TYPE_NONE, 2,
SOUP_TYPE_MESSAGE,
SOUP_TYPE_SOCKET);
@@ -2883,7 +2882,7 @@ soup_session_class_init (SoupSessionClass *session_class)
G_SIGNAL_RUN_FIRST,
0, /* FIXME? */
NULL, NULL,
- _soup_marshal_NONE__OBJECT,
+ NULL,
G_TYPE_NONE, 1,
SOUP_TYPE_MESSAGE);
@@ -2916,7 +2915,7 @@ soup_session_class_init (SoupSessionClass *session_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupSessionClass, authenticate),
NULL, NULL,
- _soup_marshal_NONE__OBJECT_OBJECT_BOOLEAN,
+ NULL,
G_TYPE_NONE, 3,
SOUP_TYPE_MESSAGE,
SOUP_TYPE_AUTH,
@@ -2939,7 +2938,7 @@ soup_session_class_init (SoupSessionClass *session_class)
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
- _soup_marshal_NONE__OBJECT,
+ NULL,
G_TYPE_NONE, 1,
/* SoupConnection is private, so we can't use
* SOUP_TYPE_CONNECTION here.
@@ -2963,7 +2962,7 @@ soup_session_class_init (SoupSessionClass *session_class)
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
- _soup_marshal_NONE__OBJECT,
+ NULL,
G_TYPE_NONE, 1,
/* SoupConnection is private, so we can't use
* SOUP_TYPE_CONNECTION here.
diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c
index ee1aac99..baa9290c 100644
--- a/libsoup/soup-socket.c
+++ b/libsoup/soup-socket.c
@@ -17,7 +17,6 @@
#include "soup.h"
#include "soup-filter-input-stream.h"
#include "soup-io-stream.h"
-#include "soup-marshal.h"
#include "soup-misc-private.h"
/**
@@ -321,7 +320,7 @@ soup_socket_class_init (SoupSocketClass *socket_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (SoupSocketClass, readable),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -337,7 +336,7 @@ soup_socket_class_init (SoupSocketClass *socket_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (SoupSocketClass, writable),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -353,7 +352,7 @@ soup_socket_class_init (SoupSocketClass *socket_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (SoupSocketClass, disconnected),
NULL, NULL,
- _soup_marshal_NONE__NONE,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -373,7 +372,7 @@ soup_socket_class_init (SoupSocketClass *socket_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (SoupSocketClass, new_connection),
NULL, NULL,
- _soup_marshal_NONE__OBJECT,
+ NULL,
G_TYPE_NONE, 1,
SOUP_TYPE_SOCKET);
/**
View Lorry Controller Status