/pidgin/main: a61e614c743d: Port PurpleRequest API to use GTlsCe...

[Mike Ruprecht]

Changeset: a61e614c743d459178977a1f337baefd6a2a9c86
Author:	 Mike Ruprecht <cmaiku at gmail.com>
Date:	 2016-01-31 00:21 -0600
Branch:	 purple-ssl-to-gio
URL: https://hg.pidgin.im/pidgin/main/rev/a61e614c743d

Description:

Port PurpleRequest API to use GTlsCertificate instead of PurpleCertificate

diffstat:

 libpurple/request.c |   8 ++++----
 libpurple/request.h |  10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (90 lines):

diff --git a/libpurple/request.c b/libpurple/request.c
--- a/libpurple/request.c
+++ b/libpurple/request.c
@@ -125,7 +125,7 @@ struct _PurpleRequestField
 
 		struct
 		{
-			PurpleCertificate *cert;
+			GTlsCertificate *cert;
 		} certificate;
 
 		struct
@@ -1954,7 +1954,7 @@ purple_request_field_account_get_filter(
 }
 
 PurpleRequestField *
-purple_request_field_certificate_new(const char *id, const char *text, PurpleCertificate *cert)
+purple_request_field_certificate_new(const char *id, const char *text, GTlsCertificate *cert)
 {
 	PurpleRequestField *field;
 
@@ -1969,7 +1969,7 @@ purple_request_field_certificate_new(con
 	return field;
 }
 
-PurpleCertificate *
+GTlsCertificate *
 purple_request_field_certificate_get_value(const PurpleRequestField *field)
 {
 	g_return_val_if_fail(field != NULL, NULL);
@@ -2475,7 +2475,7 @@ purple_request_folder(void *handle, cons
 void *
 purple_request_certificate(void *handle, const char *title,
                                   const char *primary, const char *secondary,
-                                  PurpleCertificate *cert,
+                                  GTlsCertificate *cert,
                                   const char *ok_text, GCallback ok_cb,
                                   const char *cancel_text, GCallback cancel_cb,
                                   void *user_data)
diff --git a/libpurple/request.h b/libpurple/request.h
--- a/libpurple/request.h
+++ b/libpurple/request.h
@@ -29,10 +29,10 @@
  */
 
 #include <stdlib.h>
+#include <gio/gio.h>
 #include <glib-object.h>
 #include <glib.h>
 
-#include "certificate.h"
 #include "conversation.h"
 #include "request-datasheet.h"
 
@@ -1793,7 +1793,7 @@ PurpleFilterAccountFunc purple_request_f
  */
 PurpleRequestField *purple_request_field_certificate_new(const char *id,
 														 const char *text,
-														 PurpleCertificate *cert);
+														 GTlsCertificate *cert);
 
 /**
  * purple_request_field_certificate_get_value:
@@ -1803,7 +1803,7 @@ PurpleRequestField *purple_request_field
  *
  * Returns: The certificate.
  */
-PurpleCertificate *purple_request_field_certificate_get_value(
+GTlsCertificate *purple_request_field_certificate_get_value(
 		const PurpleRequestField *field);
 
 /**************************************************************************/
@@ -2252,7 +2252,7 @@ purple_request_folder(void *handle, cons
  * @primary:       The main point of the message, or %NULL if you're
  *                 feeling enigmatic.
  * @secondary:     Secondary information, or %NULL if there is none.
- * @cert:          The #PurpleCertificate associated with this request.
+ * @cert:          The #GTlsCertificate associated with this request.
  * @ok_text:       The text for the <literal>OK</literal> button, which may not
  *                 be %NULL.
  * @ok_cb:         The callback for the <literal>OK</literal> button, which may
@@ -2270,7 +2270,7 @@ purple_request_folder(void *handle, cons
  * Returns: A UI-specific handle.
  */
 void *purple_request_certificate(void *handle, const char *title,
-	const char *primary, const char *secondary, PurpleCertificate *cert,
+	const char *primary, const char *secondary, GTlsCertificate *cert,
 	const char *ok_text, GCallback ok_cb,
 	const char *cancel_text, GCallback cancel_cb,
 	void *user_data);