# HG changeset patch # User Will Thompson # Date 1194893954 0 # Node ID 675fbb9a402e121ac08dd1b328ff7fbfacac8ab4 # Parent d78e440584e08cbfd4abf29303f71601e6a00596# Parent 11101e8c57934eb41db9bad8d9db805f89744d2a merge of '42565dfdfb1d0477d08281c1c37e99bba59c56fc' and '50186cf4da94766e7f15dc727898da51f906c649' diff -r d78e440584e0 -r 675fbb9a402e pidgin/gtkblist.c --- a/pidgin/gtkblist.c Mon Nov 12 17:13:44 2007 +0000 +++ b/pidgin/gtkblist.c Mon Nov 12 18:59:14 2007 +0000 @@ -4469,6 +4469,15 @@ g_hash_table_remove(gtkblist->connection_errors, account); } +#define SSL_FAQ_URI "http://d.pidgin.im/wiki/FAQssl" + +static void +ssl_faq_clicked_cb(GtkButton *button, + PurpleAccount *account) +{ + purple_notify_uri(NULL, SSL_FAQ_URI); +} + static void add_generic_error_dialog(PurpleAccount *account, const PurpleConnectionErrorInfo *err) @@ -4498,6 +4507,26 @@ g_object_set_data(G_OBJECT(mini_dialog), OBJECT_DATA_KEY_ACCOUNT, account); + if(err->type == PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT) { + GtkWidget *faq_button = gtk_button_new(); + GtkWidget *faq_label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(faq_label), + "" SSL_FAQ_URI ""); +#if GTK_CHECK_VERSION(2,6,0) + g_object_set(G_OBJECT(faq_label), "ellipsize", + PANGO_ELLIPSIZE_MIDDLE, NULL); +#endif + gtk_container_add(GTK_CONTAINER(faq_button), faq_label); + gtk_button_set_relief(GTK_BUTTON(faq_button), GTK_RELIEF_NONE); + + g_signal_connect(faq_button, "clicked", + (GCallback)ssl_faq_clicked_cb, account); + + gtk_box_pack_start(PIDGIN_MINI_DIALOG(mini_dialog)->contents, + faq_button, FALSE, FALSE, 0); + } + g_signal_connect_after(mini_dialog, "destroy", (GCallback)generic_error_destroy_cb, account);