# HG changeset patch
# User Daniel Atallah <datallah@pidgin.im>
# Date 1415388421 18000
# Node ID 47cc3f47592c35b9f73369b8e830b8c63facd2e1
# Parent  3b264e3c6710945b0e2de494abe0ceb203ea6419
Fix merged NSS stuff for 3.0.0 (hopefully)

diff -r 3b264e3c6710 -r 47cc3f47592c libpurple/plugins/ssl/nss-prefs.c
--- a/libpurple/plugins/ssl/nss-prefs.c	Fri Nov 07 14:17:07 2014 -0500
+++ b/libpurple/plugins/ssl/nss-prefs.c	Fri Nov 07 14:27:01 2014 -0500
@@ -317,10 +317,10 @@
 
 		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 @@
 
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
-	0,   /* page_num (Reserved) */
-	NULL, /* frame (Reserved) */
+	NULL,
+
 	/* Padding */
 	NULL,
 	NULL,
diff -r 3b264e3c6710 -r 47cc3f47592c libpurple/plugins/ssl/ssl-nss.c
--- a/libpurple/plugins/ssl/ssl-nss.c	Fri Nov 07 14:17:07 2014 -0500
+++ b/libpurple/plugins/ssl/ssl-nss.c	Fri Nov 07 14:27:01 2014 -0500
@@ -1221,6 +1221,7 @@
 	/* padding */
 	NULL,
 	NULL,
+	NULL,
 	NULL
 };