summaryrefslogtreecommitdiff
path: root/gio/src/resolver.hg
diff options
context:
space:
mode:
authorMarcin Kolny <marcin.kolny@gmail.com>2015-08-08 14:45:12 +0200
committerMarcin Kolny <marcin.kolny@gmail.com>2015-08-08 14:45:59 +0200
commit0d5f63b18f5766760cf39e82ee11482984e0a938 (patch)
treee3f74b9b37e7618c92840024077dff43e6d08f0d /gio/src/resolver.hg
parentdce7a844e48a582e42eb2b60eef5c1f2527540ac (diff)
parentd94115843f38967b5e883f5f7d8057882ae364cb (diff)
downloadglibmm-0d5f63b18f5766760cf39e82ee11482984e0a938.tar.gz
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'gio/src/resolver.hg')
-rw-r--r--gio/src/resolver.hg5
1 files changed, 0 insertions, 5 deletions
diff --git a/gio/src/resolver.hg b/gio/src/resolver.hg
index 9fa83abe..a958b07f 100644
--- a/gio/src/resolver.hg
+++ b/gio/src/resolver.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
/* Copyright (C) 2009 jonathon jongsma
*
* This library is free software; you can redistribute it and/or
@@ -69,9 +67,6 @@ public:
// g_resolver_free_addresses is just a C convenience function
_IGNORE(g_resolver_free_addresses)
- // g_resolver_get_serial() is private API.
- _IGNORE(g_resolver_get_serial)
-
#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<InetAddress> >',`$2($3, Glib::OWNERSHIP_DEEP)')
_WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<InetAddress> > lookup_by_name(const Glib::ustring& hostname, const Glib::RefPtr<Cancellable>& cancellable{?}), g_resolver_lookup_by_name, errthrow)