/pidgin/main: 47cc3f47592c: Fix merged NSS stuff for 3.0.0 (hope...

[Daniel Atallah]

Changeset: 47cc3f47592c35b9f73369b8e830b8c63facd2e1
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2014-11-07 14:27 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/47cc3f47592c

Description:

Fix merged NSS stuff for 3.0.0 (hopefully)

diffstat:

 libpurple/plugins/ssl/nss-prefs.c |  8 ++++----
 libpurple/plugins/ssl/ssl-nss.c   |  1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (38 lines):

diff --git a/libpurple/plugins/ssl/nss-prefs.c b/libpurple/plugins/ssl/nss-prefs.c
--- a/libpurple/plugins/ssl/nss-prefs.c
+++ b/libpurple/plugins/ssl/nss-prefs.c
@@ -317,10 +317,10 @@ get_plugin_pref_frame(PurplePlugin *plug
 
 		ppref = purple_plugin_pref_new_with_name_and_label(MIN_TLS,
 				_("Minimum Version"));
-		purple_plugin_pref_set_type(ppref, PURPLE_PLUGIN_PREF_CHOICE);
+		purple_plugin_pref_set_pref_type(ppref, PURPLE_PLUGIN_PREF_CHOICE);
 		ppref_max = purple_plugin_pref_new_with_name_and_label(MAX_TLS,
 				_("Maximum Version"));
-		purple_plugin_pref_set_type(ppref_max, PURPLE_PLUGIN_PREF_CHOICE);
+		purple_plugin_pref_set_pref_type(ppref_max, PURPLE_PLUGIN_PREF_CHOICE);
 
 		for (tmp_version = supported.min; tmp_version <= supported.max; tmp_version++) {
 			gchar *ver;
@@ -474,8 +474,8 @@ plugin_unload(PurplePlugin *plugin) {
 
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
-	0,   /* page_num (Reserved) */
-	NULL, /* frame (Reserved) */
+	NULL,
+
 	/* Padding */
 	NULL,
 	NULL,
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c
--- a/libpurple/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
@@ -1221,6 +1221,7 @@ static PurpleSslOps ssl_ops =
 	/* padding */
 	NULL,
 	NULL,
+	NULL,
 	NULL
 };