summaryrefslogtreecommitdiff
path: root/gio/src/socket.hg
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2010-05-31 20:45:17 -0400
committerJosé Alburquerque <jaalburqu@svn.gnome.org>2010-05-31 20:45:17 -0400
commit81df82ed68517f9c1def2b2caf5cf9f651f22b5f (patch)
tree19d2f488d0918c75bc3780cb70329534cbfa2073 /gio/src/socket.hg
parentde7e9208edb460830accf5835afcbbf9ac4d212b (diff)
downloadglibmm-81df82ed68517f9c1def2b2caf5cf9f651f22b5f.tar.gz
Wrapped new glib-2.26 methods.
* configure.ac: Bump the glib requirement up to 2.25.7 because of the new methods that are wrapped. * glib/src/glib_docs.xml: * glib/src/glib_functions.defs: Regenerate to get new methods and the docs for them. * glib/src/keyfile.ccg: * glib/src/keyfile.hg (get_boolean): Added method overload (as other get_*() methods have). (get_int64, get_uint64, set_int64, set_uint64): * glib/src/regex.hg (get_compile_flags, get_match_flags): Wrapped new methods. * gio/src/settings.hg: * gio/src/socket.hg: Add some forgotten _IGNORE's and @newin{}'s.
Diffstat (limited to 'gio/src/socket.hg')
-rw-r--r--gio/src/socket.hg5
1 files changed, 5 insertions, 0 deletions
diff --git a/gio/src/socket.hg b/gio/src/socket.hg
index 30df9db3..0320ef8f 100644
--- a/gio/src/socket.hg
+++ b/gio/src/socket.hg
@@ -103,6 +103,11 @@ public:
create(SocketFamily family, SocketType type, SocketProtocol protocol,
const Glib::RefPtr<Cancellable>& cancellable = Glib::RefPtr<Cancellable>());
+ // gmmproc thinks that this function should be wrapped in this class because
+ // its only parameter is a GSocket. In fact, it is wrapped in the
+ // SocketConnection class.
+ _IGNORE(g_socket_connection_factory_create_connection)
+
_WRAP_METHOD_DOCS_ONLY(g_socket_new_from_fd)
/** @throw Glib::Error
*/