[glibmm] TlsConnection: Correct its base class derivation.
- From: José Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] TlsConnection: Correct its base class derivation.
- Date: Fri, 22 Mar 2013 04:54:39 +0000 (UTC)
commit f568a3030c8711d1f2f1269ab13c31382b5bb6c7
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Fri Mar 22 00:01:23 2013 -0400
TlsConnection: Correct its base class derivation.
* gio/src/tlsconnection.hg: The class should derive from
Gio::IOStream, not Glib::Object as in the C API. Also add the
get_peer_certificate() methods.
ChangeLog | 8 ++++++++
gio/src/tlsconnection.hg | 12 +++++++-----
2 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9ca161c..44beab3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2013-03-21 José Alburquerque <jaalburquerque gmail com>
+ TlsConnection: Correct its base class derivation.
+
+ * gio/src/tlsconnection.hg: The class should derive from
+ Gio::IOStream, not Glib::Object as in the C API. Also add the
+ get_peer_certificate() methods.
+
+2013-03-21 José Alburquerque <jaalburquerque gmail com>
+
TlsCertificate: Wrap its single virtual function.
* gio/src/tlscertificate.hg: Wrap the "verify" virtual function. Also
diff --git a/gio/src/tlsconnection.hg b/gio/src/tlsconnection.hg
index 0c5e670..cc4519b 100644
--- a/gio/src/tlsconnection.hg
+++ b/gio/src/tlsconnection.hg
@@ -15,12 +15,12 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <glibmm/object.h>
+#include <giomm/iostream.h>
#include <giomm/tlscertificate.h>
#include <giomm/asyncresult.h>
_DEFS(giomm,gio)
-_PINCLUDE(glibmm/private/object_p.h)
+_PINCLUDE(giomm/private/iostream_p.h)
namespace Gio
{
@@ -28,7 +28,6 @@ namespace Gio
_WRAP_ENUM(TlsRehandshakeMode,GTlsRehandshakeMode)
class Cancellable;
-class IOStream;
class TlsDatabase;
class TlsInteraction;
@@ -39,9 +38,9 @@ class TlsInteraction;
* server-side TLS, respectively.
* @newin{2,36}
*/
-class TlsConnection : public Glib::Object
+class TlsConnection : public IOStream
{
- _CLASS_GOBJECT(TlsConnection, GTlsConnection, G_TLS_CONNECTION, Glib::Object, GObject)
+ _CLASS_GOBJECT(TlsConnection, GTlsConnection, G_TLS_CONNECTION, IOStream, GIOStream)
protected:
_CTOR_DEFAULT
@@ -52,6 +51,9 @@ public:
_WRAP_METHOD(Glib::RefPtr<TlsCertificate> get_certificate(), g_tls_connection_get_certificate)
_WRAP_METHOD(Glib::RefPtr<const TlsCertificate> get_certificate() const, g_tls_connection_get_certificate,
constversion)
+ _WRAP_METHOD(Glib::RefPtr<TlsCertificate> get_peer_certificate(), g_tls_connection_get_peer_certificate)
+ _WRAP_METHOD(Glib::RefPtr<const TlsCertificate> get_peer_certificate() const,
g_tls_connection_get_peer_certificate, constversion)
+
_WRAP_METHOD(TlsCertificateFlags get_peer_certificate_errors() const,
g_tls_connection_get_peer_certificate_errors)
_WRAP_METHOD(void set_require_close_notify(bool require_close_notify),
g_tls_connection_set_require_close_notify)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]