diff options
| -rw-r--r-- | libsoup/soup-connection.c | 12 | ||||
| -rw-r--r-- | libsoup/soup-session.c | 12 | ||||
| -rw-r--r-- | libsoup/soup-socket.c | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c index 3dff7eca..a3322e39 100644 --- a/libsoup/soup-connection.c +++ b/libsoup/soup-connection.c @@ -437,10 +437,10 @@ set_current_msg (SoupConnection *conn, SoupMessage *msg) } static void -proxy_socket_event (SoupSocket *socket, - GSocketClientEvent event, - GIOStream *connection, - gpointer user_data) +re_emit_socket_event (SoupSocket *socket, + GSocketClientEvent event, + GIOStream *connection, + gpointer user_data) { SoupConnection *conn = user_data; @@ -548,7 +548,7 @@ connect_async_to_uri (SoupConnectionAsyncConnectData *data, SoupURI *uri) g_object_unref (remote_addr); data->event_id = g_signal_connect (priv->socket, "event", - G_CALLBACK (proxy_socket_event), + G_CALLBACK (re_emit_socket_event), data->conn); soup_socket_connect_async (priv->socket, data->cancellable, @@ -659,7 +659,7 @@ soup_connection_connect_sync (SoupConnection *conn, GCancellable *cancellable) g_object_unref (remote_addr); event_id = g_signal_connect (priv->socket, "event", - G_CALLBACK (proxy_socket_event), conn); + G_CALLBACK (re_emit_socket_event), conn); status = soup_socket_connect_sync (priv->socket, cancellable); if (!SOUP_STATUS_IS_SUCCESSFUL (status)) diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c index ea0a16b9..009b6bed 100644 --- a/libsoup/soup-session.c +++ b/libsoup/soup-session.c @@ -1152,10 +1152,10 @@ redirect_handler (SoupMessage *msg, gpointer user_data) } static void -proxy_connection_event (SoupConnection *conn, - GSocketClientEvent event, - GIOStream *connection, - gpointer user_data) +re_emit_connection_event (SoupConnection *conn, + GSocketClientEvent event, + GIOStream *connection, + gpointer user_data) { SoupMessageQueueItem *item = user_data; @@ -1168,7 +1168,7 @@ soup_session_set_item_connection (SoupSession *session, SoupConnection *conn) { if (item->conn) { - g_signal_handlers_disconnect_by_func (item->conn, proxy_connection_event, item); + g_signal_handlers_disconnect_by_func (item->conn, re_emit_connection_event, item); g_object_unref (item->conn); } @@ -1178,7 +1178,7 @@ soup_session_set_item_connection (SoupSession *session, if (item->conn) { g_object_ref (item->conn); g_signal_connect (item->conn, "event", - G_CALLBACK (proxy_connection_event), item); + G_CALLBACK (re_emit_connection_event), item); } } diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c index df9a2109..885d5318 100644 --- a/libsoup/soup-socket.c +++ b/libsoup/soup-socket.c @@ -651,11 +651,11 @@ soup_socket_new (const char *optname1, ...) } static void -proxy_socket_client_event (GSocketClient *client, - GSocketClientEvent event, - GSocketConnectable *connectable, - GIOStream *connection, - gpointer user_data) +re_emit_socket_client_event (GSocketClient *client, + GSocketClientEvent event, + GSocketConnectable *connectable, + GIOStream *connection, + gpointer user_data) { SoupSocket *sock = user_data; @@ -704,7 +704,7 @@ new_socket_client (SoupSocket *sock) GSocketClient *client = g_socket_client_new (); g_signal_connect (client, "event", - G_CALLBACK (proxy_socket_client_event), sock); + G_CALLBACK (re_emit_socket_client_event), sock); if (priv->use_proxy) g_socket_client_add_application_proxy (client, "http"); else |