pidgin/pidgin

Fix merged NSS stuff for 3.0.0 (hopefully)

2014-11-07, Daniel Atallah
47cc3f47592c
Parents 3b264e3c6710
Children fc685cb00ff0
Fix merged NSS stuff for 3.0.0 (hopefully)
2 files changed, 5 insertions(+), 4 deletions(-)
  • +4 -4
    libpurple/plugins/ssl/nss-prefs.c
  • +1 -0
    libpurple/plugins/ssl/ssl-nss.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,
    --- 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
    };