remove prototype for soup_signal_connect_once, which is only used by

	* libsoup/soup-misc.h: remove prototype for
	soup_signal_connect_once, which is only used by soup-connection
	now, and will go away once that code is rewritten.

	* libsoup/soup-connection.c: prototype it here now (the definition
	is still in soup-misc.c)

svn path=/trunk/; revision=1081

diff --git a/ChangeLog b/ChangeLog
index b8a39ce..da1bf10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-02-09  Dan Winship  <danw@gnome.org>
 
+       * libsoup/soup-misc.h: remove prototype for
+       soup_signal_connect_once, which is only used by soup-connection
+       now, and will go away once that code is rewritten.
+
+       * libsoup/soup-connection.c: prototype it here now (the definition
+       is still in soup-misc.c)
+
+2008-02-09  Dan Winship  <danw@gnome.org>
+
        * libsoup/soup-auth-manager-ntlm.c: mark the DES magic number
        arrays const
 

diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c
index 03965bb..bcb8b94 100644 (file)
--- a/libsoup/soup-connection.c
+++ b/libsoup/soup-connection.c
@@ -457,6 +457,10 @@ socket_connect_result (SoupSocket *sock, guint status, gpointer user_data)
                       proxified_status (priv, status));
 }
 
+/* from soup-misc.c... will eventually go away */
+guint soup_signal_connect_once  (gpointer instance, const char *detailed_signal,
+                                GCallback c_handler, gpointer data);
+
 /**
  * soup_connection_connect_async:
  * @conn: the connection

diff --git a/libsoup/soup-misc.c b/libsoup/soup-misc.c
index 79a7399..60cc07c 100644 (file)
--- a/libsoup/soup-misc.c
+++ b/libsoup/soup-misc.c
@@ -84,19 +84,12 @@ signal_once_metamarshal (GClosure *closure, GValue *return_value,
        g_slice_free (SoupSignalOnceData, ssod);
 }
 
-/**
- * soup_signal_connect_once:
- * @instance: an object
- * @detailed_signal: "signal-name" or "signal-name::detail" to connect to
- * @c_handler: the #GCallback to connect
- * @data: data to pass to @c_handler calls
- *
- * Connects a #GCallback function to a signal as with
- * g_signal_connect(), but automatically removes the signal handler
- * after its first invocation.
- *
- * Return value: the signal handler id
- **/
+/* No longer prototyped in soup-misc.h, because it's only used by
+ * soup-connection.c, and will be going away once that usage is removed.
+ */
+guint soup_signal_connect_once  (gpointer instance, const char *detailed_signal,
+                                GCallback c_handler, gpointer data);
+
 guint
 soup_signal_connect_once (gpointer instance, const char *detailed_signal,
                          GCallback c_handler, gpointer data)

diff --git a/libsoup/soup-misc.h b/libsoup/soup-misc.h
index 20583fc..b869054 100644 (file)
--- a/libsoup/soup-misc.h
+++ b/libsoup/soup-misc.h
@@ -26,15 +26,12 @@ GSource           *soup_add_timeout          (GMainContext *async_context,
 
 /* Misc utils */
 
-guint              soup_signal_connect_once  (gpointer      instance,
-                                             const char   *detailed_signal,
-                                             GCallback     c_handler,
-                                             gpointer      data);
-
 guint              soup_str_case_hash        (gconstpointer key);
 gboolean           soup_str_case_equal       (gconstpointer v1,
                                              gconstpointer v2);
 
+/* SSL stuff */
+
 extern const gboolean soup_ssl_supported;
 
 #define SOUP_SSL_ERROR soup_ssl_error_quark()