pidgin3: comparison libpurple/proxy.c

-:511c384038d7
+:901dfa763f15
 #include "proxy.h"
 #include "util.h"
 struct _PurpleProxyInfo
 {
-	PurpleProxyType type;   /**< The proxy type.  */
+	PurpleProxyType type; /* The proxy type.  */
-	char *host;           /**< The host.        */
+	char *host;           /* The host.        */
-	int   port;           /**< The port number. */
+	int   port;           /* The port number. */
-	char *username;       /**< The username.    */
+	char *username;       /* The username.    */
-	char *password;       /**< The password.    */
+	char *password;       /* The password.    */
 };
 struct _PurpleProxyConnectData {
 	void *handle;
 	PurpleProxyConnectFunction connect_cb;
 	int socket_type;
 	guint inpa;
 	PurpleProxyInfo *gpi;
 	PurpleDnsQueryData *query_data;
-	/**
+	/*
 	 * This contains alternating length/char* values.  The char*
 	 * values need to be freed when removed from the linked list.
 	 */
 	GSList *hosts;
 	{ "gconftool-2 -g /system/http_proxy/port", "gsettings get org.gnome.system.proxy.http port"},
 	{ "gconftool-2 -g /system/http_proxy/authentication_user", "gsettings get org.gnome.system.proxy.http authentication-user" },
 	{ "gconftool-2 -g /system/http_proxy/authentication_password", "gsettings get org.gnome.system.proxy.http authentication-password" },
 };
-/**
+/*
+* purple_gnome_proxy_get_parameter:
+* @parameter:     One of the GNOME_PROXY_x constants defined above
+* @gnome_version: GNOME2_CMDS or GNOME3_CMDS
+*
 * This is a utility function used to retrieve proxy parameter values from
 * GNOME 2/3 environment.
 *
-* @param parameter	One of the GNOME_PROXY_x constants defined above
+* Returns: The value of requested proxy parameter
-* @param gnome_version GNOME2_CMDS or GNOME3_CMDS
-*
-* @return The value of requested proxy parameter
 */
 static char *
 purple_gnome_proxy_get_parameter(guint8 parameter, guint8 gnome_version)
 {
 	gchar *param, *err;
 /**************************************************************************
 * Proxy API
 **************************************************************************/
-/**
+/*
 * Whoever calls this needs to have called
 * purple_proxy_connect_data_disconnect() beforehand.
 */
 static void
 purple_proxy_connect_data_destroy(PurpleProxyConnectData *connect_data)
 	g_free(connect_data->host);
 	g_free(connect_data);
 }
-/**
+/*
+* purple_proxy_connect_data_disconnect:
+* @error_message: An error message explaining why the connection
+*        failed.  This will be passed to the callback function
+*        specified in the call to purple_proxy_connect().  If the
+*        connection was successful then pass in null.
+*
 * Free all information dealing with a connection attempt and
 * reset the connect_data to prepare for it to try to connect
 * to another IP address.
 *
 * If an error message is passed in, then we know the connection
 * attempt failed.  If the connection attempt failed and
 * connect_data->hosts is not empty then we try the next IP address.
 * If the connection attempt failed and we have no more hosts
 * try try then we call the callback with the given error message,
 * then destroy the connect_data.
-*
-* @param error_message An error message explaining why the connection
-*        failed.  This will be passed to the callback function
-*        specified in the call to purple_proxy_connect().  If the
-*        connection was successful then pass in null.
 */
 static void
 purple_proxy_connect_data_disconnect(PurpleProxyConnectData *connect_data, const gchar *error_message)
 {
 	if (connect_data->child != NULL)
 			purple_proxy_connect_data_destroy(connect_data);
 		}
 	}
 }
-/**
+/*
 * This calls purple_proxy_connect_data_disconnect(), but it lets you
 * specify the error_message using a printf()-like syntax.
 */
 static void
 purple_proxy_connect_data_disconnect_formatted(PurpleProxyConnectData *connect_data, const char *format, ...)
 		 */
 		purple_timeout_add(10, clean_connect, connect_data);
 	}
 }
-/**
+/*
 * This is a utility function used by the HTTP, SOCKS4 and SOCKS5
 * connect functions.  It writes data from a buffer to a socket.
 * When all the data is written it sets up a watcher to read a
 * response and call a specified function.
 */
 	purple_input_remove(connect_data->inpa);
 	connect_data->inpa = purple_input_add(connect_data->fd,
 			PURPLE_INPUT_READ, connect_data->read_cb, connect_data);
 }
-/**
+/*
 * We're using an HTTP proxy for a non-port 80 tunnel.  Read the
 * response to the CONNECT request.
 */
 static void
 http_canread(gpointer data, gint source, PurpleInputCondition cond)
 		s5_canwrite(connect_data, connect_data->fd, PURPLE_INPUT_WRITE);
 	}
 }
-/**
+/*
 * This function attempts to connect to the next IP address in the list
 * of IP addresses returned to us by purple_dnsquery_a() and attempts
 * to connect to each one.  This is called after the hostname is
 * resolved, and each time a connection attempt fails (assuming there
 * is another IP address to try).

Mercurial > pidgin3 / file comparison

comparison: libpurple/proxy.c

libpurple/proxy.c