diff options
Diffstat (limited to 'libpurple/plugins')
| -rw-r--r-- | libpurple/plugins/autoaccept.c | 2 | ||||
| -rw-r--r-- | libpurple/plugins/codeinline.c | 2 | ||||
| -rw-r--r-- | libpurple/plugins/newline.c | 2 | ||||
| -rw-r--r-- | libpurple/plugins/offlinemsg.c | 2 | ||||
| -rw-r--r-- | libpurple/plugins/perl/common/Server.xs | 27 | ||||
| -rw-r--r-- | libpurple/plugins/ssl/ssl-gnutls.c | 6 |
6 files changed, 23 insertions, 18 deletions
diff --git a/libpurple/plugins/autoaccept.c b/libpurple/plugins/autoaccept.c index a2f6d66a8a..4112c34237 100644 --- a/libpurple/plugins/autoaccept.c +++ b/libpurple/plugins/autoaccept.c @@ -21,7 +21,7 @@ #define PLUGIN_ID "core-plugin_pack-autoaccept" #define PLUGIN_NAME N_("Autoaccept") -#define PLUGIN_STATIC_NAME "Autoaccept" +#define PLUGIN_STATIC_NAME Autoaccept #define PLUGIN_SUMMARY N_("Auto-accept file transfer requests from selected users.") #define PLUGIN_DESCRIPTION N_("Auto-accept file transfer requests from selected users.") #define PLUGIN_AUTHOR "Sadrul H Chowdhury <sadrul@users.sourceforge.net>" diff --git a/libpurple/plugins/codeinline.c b/libpurple/plugins/codeinline.c index 79bc314ebd..7493e0fdb2 100644 --- a/libpurple/plugins/codeinline.c +++ b/libpurple/plugins/codeinline.c @@ -95,4 +95,4 @@ static PurplePluginInfo info = { } -PURPLE_INIT_PLUGIN(urlcatcher, init_plugin, info) +PURPLE_INIT_PLUGIN(codeinline, init_plugin, info) diff --git a/libpurple/plugins/newline.c b/libpurple/plugins/newline.c index 2d7c089f24..25ba535140 100644 --- a/libpurple/plugins/newline.c +++ b/libpurple/plugins/newline.c @@ -133,4 +133,4 @@ init_plugin(PurplePlugin *plugin) { purple_prefs_add_bool("/plugins/core/newline/chat", TRUE); } -PURPLE_INIT_PLUGIN(lastseen, init_plugin, info) +PURPLE_INIT_PLUGIN(newline, init_plugin, info) diff --git a/libpurple/plugins/offlinemsg.c b/libpurple/plugins/offlinemsg.c index b301255743..bcc16b3171 100644 --- a/libpurple/plugins/offlinemsg.c +++ b/libpurple/plugins/offlinemsg.c @@ -21,7 +21,7 @@ #define PLUGIN_ID "core-plugin_pack-offlinemsg" #define PLUGIN_NAME N_("Offline Message Emulation") -#define PLUGIN_STATIC_NAME "offlinemsg" +#define PLUGIN_STATIC_NAME offlinemsg #define PLUGIN_SUMMARY N_("Save messages sent to an offline user as pounce.") #define PLUGIN_DESCRIPTION N_("Save messages sent to an offline user as pounce.") #define PLUGIN_AUTHOR "Sadrul H Chowdhury <sadrul@users.sourceforge.net>" diff --git a/libpurple/plugins/perl/common/Server.xs b/libpurple/plugins/perl/common/Server.xs index 11f56d077f..4fe496f746 100644 --- a/libpurple/plugins/perl/common/Server.xs +++ b/libpurple/plugins/perl/common/Server.xs @@ -122,29 +122,28 @@ serv_got_typing_stopped(gc, name) Purple::Connection gc const char *name -void -serv_join_chat(con, components) - Purple::Connection con - SV * components -INIT: - HV * t_HV; - HE * t_HE; - SV * t_SV; - GHashTable * t_GHash; +void +serv_join_chat(conn, components) + Purple::Connection conn + HV * components +PREINIT: + HE *t_HE; + SV *t_SV; I32 len; + GHashTable *t_GHash; char *t_key, *t_value; CODE: - t_HV = (HV *)SvRV(components); t_GHash = g_hash_table_new(g_str_hash, g_str_equal); - for (t_HE = hv_iternext(t_HV); t_HE != NULL; t_HE = hv_iternext(t_HV) ) { + for (t_HE = hv_iternext(components); t_HE != NULL; + t_HE = hv_iternext(components)) { t_key = hv_iterkey(t_HE, &len); - t_SV = *hv_fetch(t_HV, t_key, len, 0); - t_value = SvPVutf8_nolen(t_SV); + t_SV = *hv_fetch(components, t_key, len, 0); + t_value = SvPVutf8_nolen(t_SV); g_hash_table_insert(t_GHash, t_key, t_value); } - serv_join_chat(con, t_GHash); + serv_join_chat(conn, t_GHash); void serv_move_buddy(buddy, group1, group2) diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c index beb5c01599..de4908eec1 100644 --- a/libpurple/plugins/ssl/ssl-gnutls.c +++ b/libpurple/plugins/ssl/ssl-gnutls.c @@ -256,7 +256,13 @@ ssl_gnutls_connect(PurpleSslConnection *gsc) gsc->private_data = gnutls_data; gnutls_init(&gnutls_data->session, GNUTLS_CLIENT); +#ifdef HAVE_GNUTLS_PRIORITY_FUNCS + if (gnutls_priority_set_direct(gnutls_data->session, + "NORMAL:%SSL3_RECORD_VERSION", NULL)) + gnutls_priority_set_direct(gnutls_data->session, "NORMAL", NULL); +#else gnutls_set_default_priority(gnutls_data->session); +#endif gnutls_certificate_type_set_priority(gnutls_data->session, cert_type_priority); |