Fri, 07 Nov 2014 14:27:01 -0500
Fix merged NSS stuff for 3.0.0 (hopefully)
| libpurple/plugins/ssl/nss-prefs.c | file | annotate | diff | comparison | revisions | |
| libpurple/plugins/ssl/ssl-nss.c | file | annotate | diff | comparison | revisions |
--- 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,