diff options
| author | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2008-10-31 07:59:46 +0000 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2008-10-31 07:59:46 +0000 |
| commit | d3cc5bf24a5f759be9b7a83e12e8229196ca8e34 (patch) | |
| tree | 71a090201ae21d68b0825085fefebf9bc2748fb0 /libpurple/plugins/ssl/ssl-nss.c | |
| parent | 65a637da9cd60700ec178cde1ed3dd24e0695f46 (diff) | |
| parent | 7902d6c9d6e8608a7147949eaa1838206a3b14ea (diff) | |
| download | pidgin-sadrul.struct.hiding.tar.gz | |
propagate from branch 'im.pidgin.pidgin' (head 328a7b5211ba8112c8978d5b81f5e39bf2ce2596)sadrul.struct.hiding
to branch 'local.struct.hiding' (head ee0f2a4594bf5beb531faa4978a7a450903a6017)
Diffstat (limited to 'libpurple/plugins/ssl/ssl-nss.c')
| -rw-r--r-- | libpurple/plugins/ssl/ssl-nss.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c index 01469a96f7..216227389a 100644 --- a/libpurple/plugins/ssl/ssl-nss.c +++ b/libpurple/plugins/ssl/ssl-nss.c @@ -29,8 +29,6 @@ #define SSL_NSS_PLUGIN_ID "ssl-nss" -#ifdef HAVE_NSS - #undef HAVE_LONG_LONG /* Make Mozilla less angry. If angry, Mozilla SMASH! */ #include <nspr.h> @@ -891,13 +889,10 @@ static PurpleSslOps ssl_ops = NULL }; -#endif /* HAVE_NSS */ - static gboolean plugin_load(PurplePlugin *plugin) { -#ifdef HAVE_NSS if (!purple_ssl_get_ops()) { purple_ssl_set_ops(&ssl_ops); } @@ -909,22 +904,17 @@ plugin_load(PurplePlugin *plugin) purple_certificate_register_scheme(&x509_nss); return TRUE; -#else - return FALSE; -#endif } static gboolean plugin_unload(PurplePlugin *plugin) { -#ifdef HAVE_NSS if (purple_ssl_get_ops() == &ssl_ops) { purple_ssl_set_ops(NULL); } /* Unregister our X.509 functions */ purple_certificate_unregister_scheme(&x509_nss); -#endif return TRUE; } |