projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the new g_strv_contains
[platform/upstream/glib.git]
/
gio
/
gsocketconnectable.c
diff --git
a/gio/gsocketconnectable.c
b/gio/gsocketconnectable.c
index
3bad099
..
79901aa
100644
(file)
--- a/
gio/gsocketconnectable.c
+++ b/
gio/gsocketconnectable.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
*/
#include "config.h"
@@
-26,6
+24,7
@@
/**
* SECTION:gsocketconnectable
* @short_description: Interface for potential socket endpoints
/**
* SECTION:gsocketconnectable
* @short_description: Interface for potential socket endpoints
+ * @include: gio/gio.h
*
* Objects that describe one or more potential socket endpoints
* implement #GSocketConnectable. Callers can then use
*
* Objects that describe one or more potential socket endpoints
* implement #GSocketConnectable. Callers can then use
@@
-33,7
+32,7
@@
* to try out each socket address in turn until one succeeds, as shown
* in the sample code below.
*
* to try out each socket address in turn until one succeeds, as shown
* in the sample code below.
*
- * |[
+ * |[
<!-- language="C" -->
* MyConnectionType *
* connect_to_host (const char *hostname,
* guint16 port,
* MyConnectionType *
* connect_to_host (const char *hostname,
* guint16 port,
@@
-46,14
+45,13
@@
* GSocketAddress *sockaddr;
* GError *conn_error = NULL;
*
* GSocketAddress *sockaddr;
* GError *conn_error = NULL;
*
- * addr = g_network_address_new (
"www.gnome.org", 80
);
+ * addr = g_network_address_new (
hostname, port
);
* enumerator = g_socket_connectable_enumerate (addr);
* g_object_unref (addr);
*
* enumerator = g_socket_connectable_enumerate (addr);
* g_object_unref (addr);
*
- * /<!-- -->* Try each sockaddr until we succeed. Record the first
- * * connection error, but not any further ones (since they'll probably
- * * be basically the same as the first).
- * *<!-- -->/
+ * // Try each sockaddr until we succeed. Record the first connection error,
+ * // but not any further ones (since they'll probably be basically the same
+ * // as the first).
* while (!conn && (sockaddr = g_socket_address_enumerator_next (enumerator, cancellable, error))
* {
* conn = connect_to_sockaddr (sockaddr, conn_error ? NULL : &conn_error);
* while (!conn && (sockaddr = g_socket_address_enumerator_next (enumerator, cancellable, error))
* {
* conn = connect_to_sockaddr (sockaddr, conn_error ? NULL : &conn_error);
@@
-65,18
+63,15
@@
* {
* if (conn_error)
* {
* {
* if (conn_error)
* {
- * /<!-- -->* We couldn't connect to the first address, but we succeeded
- * * in connecting to a later address.
- * *<!-- -->/
+ * // We couldn't connect to the first address, but we succeeded
+ * // in connecting to a later address.
* g_error_free (conn_error);
* }
* return conn;
* }
* else if (error)
* {
* g_error_free (conn_error);
* }
* return conn;
* }
* else if (error)
* {
- * /<!-- -->* Either the initial lookup failed, or else the caller
- * * cancelled us.
- * *<!-- -->/
+ * /// Either initial lookup failed, or else the caller cancelled us.
* if (conn_error)
* g_error_free (conn_error);
* return NULL;
* if (conn_error)
* g_error_free (conn_error);
* return NULL;
@@
-105,7
+100,7
@@
g_socket_connectable_default_init (GSocketConnectableInterface *iface)
*
* Creates a #GSocketAddressEnumerator for @connectable.
*
*
* Creates a #GSocketAddressEnumerator for @connectable.
*
- * Return
value
: (transfer full): a new #GSocketAddressEnumerator.
+ * Return
s
: (transfer full): a new #GSocketAddressEnumerator.
*
* Since: 2.22
*/
*
* Since: 2.22
*/
@@
-126,14
+121,14
@@
g_socket_connectable_enumerate (GSocketConnectable *connectable)
* @connectable: a #GSocketConnectable
*
* Creates a #GSocketAddressEnumerator for @connectable that will
* @connectable: a #GSocketConnectable
*
* Creates a #GSocketAddressEnumerator for @connectable that will
- * return #GProxyAddress
<!-- -->
es for addresses that you must connect
+ * return #GProxyAddresses for addresses that you must connect
* to via a proxy.
*
* If @connectable does not implement
* g_socket_connectable_proxy_enumerate(), this will fall back to
* calling g_socket_connectable_enumerate().
*
* to via a proxy.
*
* If @connectable does not implement
* g_socket_connectable_proxy_enumerate(), this will fall back to
* calling g_socket_connectable_enumerate().
*
- * Return
value
: (transfer full): a new #GSocketAddressEnumerator.
+ * Return
s
: (transfer full): a new #GSocketAddressEnumerator.
*
* Since: 2.26
*/
*
* Since: 2.26
*/