Change signal name to redirectpgriffis/redirection-signal

6 files changed, 37 insertions, 37 deletions

diff --git a/libsoup/soup-message-private.h b/libsoup/soup-message-private.h
index dc5a284e..d0fd78eb 100644
--- a/libsoup/soup-message-private.h
+++ b/libsoup/soup-message-private.h
@@ -106,9 +106,9 @@ void soup_message_finished          (SoupMessage *msg);
 gboolean soup_message_authenticate  (SoupMessage *msg,
 				     SoupAuth    *auth,
 				     gboolean     retrying);
-SoupMessageRedirectionFlags soup_message_redirection (SoupMessage *msg,
-                                                      GUri        *location,
-                                                      guint        redirect_count);
+SoupMessageRedirectFlags soup_message_redirect (SoupMessage *msg,
+                                                GUri        *location,
+                                                guint        redirect_count);
 
 gboolean soup_message_disables_feature (SoupMessage *msg,
 					gpointer     feature);
diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c
index 198a5134..e2613ca3 100644
--- a/libsoup/soup-message.c
+++ b/libsoup/soup-message.c
@@ -113,7 +113,7 @@ enum {
 	AUTHENTICATE,
 	NETWORK_EVENT,
 	ACCEPT_CERTIFICATE,
-        REDIRECTION,
+        REDIRECT,
 
 	LAST_SIGNAL
 };
@@ -593,7 +593,7 @@ soup_message_class_init (SoupMessageClass *message_class)
 			      G_TYPE_TLS_CERTIFICATE_FLAGS);
 
 	/**
-	 * SoupMessage::redirection:
+	 * SoupMessage::redirect:
 	 * @msg: the message
 	 * @location: the new redirected location
          * @redirect_count: count of redirects for @msg
@@ -604,16 +604,16 @@ soup_message_class_init (SoupMessageClass *message_class)
          * You can call soup_message_get_uri() to access the pre-redirect
          * URI.
          *
-	 * Returns: a #SoupMessageRedirectionFlags
+	 * Returns: a #SoupMessageRedirectFlags
 	 */
-	signals[REDIRECTION] =
-		g_signal_new ("redirection",
+	signals[REDIRECT] =
+		g_signal_new ("redirect",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      redirection_accumulator, NULL,
 			      NULL,
-			      SOUP_TYPE_MESSAGE_REDIRECTION_FLAGS, 2,
+			      SOUP_TYPE_MESSAGE_REDIRECT_FLAGS, 2,
 			      G_TYPE_URI,
                               G_TYPE_UINT);
 
@@ -2221,26 +2221,26 @@ soup_message_is_options_ping (SoupMessage *msg)
 }
 
 /**
- * SoupMessageRedirectionFlags:
- * @SOUP_MESSAGE_REDIRECTION_DEFAULT: The session will handled redirects
+ * SoupMessageRedirectFlags:
+ * @SOUP_MESSAGE_REDIRECT_DEFAULT: The session will handled redirects
  *   as normal. That is allowing them over safe methods.
- * @SOUP_MESSAGE_REDIRECTION_BLOCK: Override the default behavior preventing
+ * @SOUP_MESSAGE_REDIRECT_BLOCK: Override the default behavior preventing
  *   the redirect.
- * @SOUP_MESSAGE_REDIRECTION_ALLOW_UNSAFE_METHOD: Override the default behavior
+ * @SOUP_MESSAGE_REDIRECT_ALLOW_UNSAFE_METHOD: Override the default behavior
  *   allowing redirects over unsafe methods such as DELETE.
- * @SOUP_MESSAGE_REDIRECTION_ALLOW_REDIRECT_COUNT: Override the default behavior
+ * @SOUP_MESSAGE_REDIRECT_ALLOW_REDIRECT_COUNT: Override the default behavior
  *   ignoring the limit of number of redirects.
  *
- * Values returned by the #SoupMessage::redirection handler to alter the behavior
+ * Values returned by the #SoupMessage::redirect handler to alter the behavior
  * of redirects.
  **/
 
-SoupMessageRedirectionFlags
-soup_message_redirection (SoupMessage *msg, GUri *location, guint redirect_count)
+SoupMessageRedirectFlags
+soup_message_redirect (SoupMessage *msg, GUri *location, guint redirect_count)
 {
-        SoupMessageRedirectionFlags behavior = SOUP_MESSAGE_REDIRECTION_DEFAULT;
+        SoupMessageRedirectFlags behavior = SOUP_MESSAGE_REDIRECT_DEFAULT;
 
-	g_signal_emit (msg, signals[REDIRECTION], 0, location, redirect_count,
+	g_signal_emit (msg, signals[REDIRECT], 0, location, redirect_count,
 		       &behavior);
 
 	return behavior;
@@ -2252,10 +2252,10 @@ redirection_accumulator (GSignalInvocationHint *ihint,
                          const GValue          *handler_return,
                          gpointer               user_data)
 {
-        SoupMessageRedirectionFlags value;
+        SoupMessageRedirectFlags value;
 
         value = g_value_get_flags (handler_return);
         g_value_set_flags (return_accu, value);
 
-        return value == SOUP_MESSAGE_REDIRECTION_DEFAULT;
+        return value == SOUP_MESSAGE_REDIRECT_DEFAULT;
 }
\ No newline at end of file
diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h
index a4eb45d7..4c9aef19 100644
--- a/libsoup/soup-message.h
+++ b/libsoup/soup-message.h
@@ -162,10 +162,10 @@ SOUP_AVAILABLE_IN_ALL
 SoupMessageHeaders *soup_message_get_response_headers (SoupMessage  *msg);
 
 typedef enum {
-        SOUP_MESSAGE_REDIRECTION_DEFAULT = 0,
-        SOUP_MESSAGE_REDIRECTION_BLOCK = (1 << 1),
-        SOUP_MESSAGE_REDIRECTION_ALLOW_UNSAFE_METHOD = (1 << 2),
-        SOUP_MESSAGE_REDIRECTION_ALLOW_REDIRECT_COUNT = (1 << 3),
-} SoupMessageRedirectionFlags;
+        SOUP_MESSAGE_REDIRECT_DEFAULT = 0,
+        SOUP_MESSAGE_REDIRECT_BLOCK = (1 << 1),
+        SOUP_MESSAGE_REDIRECT_ALLOW_UNSAFE_METHOD = (1 << 2),
+        SOUP_MESSAGE_REDIRECT_ALLOW_REDIRECT_COUNT = (1 << 3),
+} SoupMessageRedirectFlags;
 
 G_END_DECLS
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 2ba7ab00..e8ffba14 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -849,7 +849,7 @@ redirect_handler (SoupMessage *msg,
 {
 	SoupMessageQueueItem *item = user_data;
 	SoupSession *session = item->session;
-        SoupMessageRedirectionFlags redirection_flags;
+        SoupMessageRedirectFlags redirection_flags;
 
         if (!SOUP_STATUS_IS_REDIRECTION (soup_message_get_status (msg)))
                 return;
@@ -858,16 +858,16 @@ redirect_handler (SoupMessage *msg,
 	if (!new_uri)
 		return;
 
-        redirection_flags = soup_message_redirection (msg, new_uri, item->resend_count + 1);
+        redirection_flags = soup_message_redirect (msg, new_uri, item->resend_count + 1);
 
-        if (redirection_flags & SOUP_MESSAGE_REDIRECTION_BLOCK) {
+        if (redirection_flags & SOUP_MESSAGE_REDIRECT_BLOCK) {
                 item->state = SOUP_MESSAGE_FINISHING;
                 soup_session_kick_queue (session);
                 g_uri_unref (new_uri);
                 return;
         }
 
-        if (!(redirection_flags & SOUP_MESSAGE_REDIRECTION_ALLOW_UNSAFE_METHOD) &&
+        if (!(redirection_flags & SOUP_MESSAGE_REDIRECT_ALLOW_UNSAFE_METHOD) &&
             !SOUP_SESSION_WOULD_REDIRECT_AS_GET (session, msg) &&
 	    !SOUP_SESSION_WOULD_REDIRECT_AS_SAFE (session, msg)) {
                 g_uri_unref (new_uri);
@@ -889,7 +889,7 @@ redirect_handler (SoupMessage *msg,
 	g_uri_unref (new_uri);
 
 	soup_session_requeue_item (session, item,
-                                   redirection_flags & SOUP_MESSAGE_REDIRECTION_ALLOW_REDIRECT_COUNT,
+                                   redirection_flags & SOUP_MESSAGE_REDIRECT_ALLOW_REDIRECT_COUNT,
                                    &item->error);
 }
 
diff --git a/tests/hsts-test.c b/tests/hsts-test.c
index d7e766bc..c5dbfcf1 100644
--- a/tests/hsts-test.c
+++ b/tests/hsts-test.c
@@ -105,10 +105,10 @@ server_callback  (SoupServer        *server,
 	}
 }
 
-static SoupMessageRedirectionFlags
+static SoupMessageRedirectFlags
 redirection_callback (SoupMessage *msg, GUri *location, guint redirect_count, gpointer user_data)
 {
-        return SOUP_MESSAGE_REDIRECTION_BLOCK;
+        return SOUP_MESSAGE_REDIRECT_BLOCK;
 }
 
 static void
@@ -119,7 +119,7 @@ session_get_uri (SoupSession *session, const char *uri, SoupStatus expected_stat
 	GError *error = NULL;
 
 	msg = soup_message_new ("GET", uri);
-        g_signal_connect (msg, "redirection", G_CALLBACK (redirection_callback), NULL);
+        g_signal_connect (msg, "redirect", G_CALLBACK (redirection_callback), NULL);
 	body = soup_test_session_send (session, msg, NULL, &error);
 	if (expected_status == SOUP_STATUS_NONE)
 		g_assert_error (error, G_TLS_ERROR, G_TLS_ERROR_BAD_CERTIFICATE);
diff --git a/tests/redirect-test.c b/tests/redirect-test.c
index 90649d31..5793821c 100644
--- a/tests/redirect-test.c
+++ b/tests/redirect-test.c
@@ -323,7 +323,7 @@ server2_callback (SoupServer        *server,
 	soup_server_message_set_status (msg, SOUP_STATUS_OK, NULL);
 }
 
-static SoupMessageRedirectionFlags
+static SoupMessageRedirectFlags
 redirection_callback (SoupMessage *msg, GUri *location, guint redirect_count, gpointer user_data)
 {
         GUri *old_uri = soup_message_get_uri (msg);
@@ -333,7 +333,7 @@ redirection_callback (SoupMessage *msg, GUri *location, guint redirect_count, gp
         g_assert_false (soup_uri_equal (old_uri, location));
 
         *handled = TRUE;
-        return SOUP_MESSAGE_REDIRECTION_BLOCK;
+        return SOUP_MESSAGE_REDIRECT_BLOCK;
 }
 
 static void
@@ -344,7 +344,7 @@ do_msg_redirection_signal_test (void)
         gboolean handled = FALSE;
         GError *error = NULL;
 
-        g_signal_connect (msg, "redirection", G_CALLBACK (redirection_callback), &handled);
+        g_signal_connect (msg, "redirect", G_CALLBACK (redirection_callback), &handled);
 
 	GBytes *body = soup_test_session_async_send (async_session, msg, NULL, &error);