From: Colin Leroy Date: Sun, 17 Jul 2005 11:19:18 +0000 (+0000) Subject: 2005-07-17 [colin] 1.9.12cvs73 X-Git-Tag: rel_1_9_13~20 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=2f55cee211785f8966656335cdf2306652491600 2005-07-17 [colin] 1.9.12cvs73 * src/gtk/sslcertwindow.c Use a gtkExpander --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 29d9ea63c..c5eb71e79 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2005-07-17 [colin] 1.9.12cvs73 + + * src/gtk/sslcertwindow.c + Use a gtkExpander + 2005-07-17 [colin] 1.9.12cvs72 * src/plugins/pgpcore/Makefile.am diff --git a/PATCHSETS b/PATCHSETS index 926aafe90..dbafa93d6 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -667,3 +667,4 @@ ( cvs diff -u -r 1.61.2.32 -r 1.61.2.33 src/account.c; cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/action.c; cvs diff -u -r 1.60.2.19 -r 1.60.2.20 src/addressbook.c; cvs diff -u -r 1.382.2.142 -r 1.382.2.143 src/compose.c; cvs diff -u -r 1.26.2.17 -r 1.26.2.18 src/foldersel.c; cvs diff -u -r 1.207.2.45 -r 1.207.2.46 src/folderview.c; cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/html.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/imap_gtk.c; cvs diff -u -r 1.115.2.44 -r 1.115.2.45 src/main.c; cvs diff -u -r 1.274.2.45 -r 1.274.2.46 src/mainwindow.c; cvs diff -u -r 1.94.2.56 -r 1.94.2.57 src/messageview.c; cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/mh_gtk.c; cvs diff -u -r 1.83.2.34 -r 1.83.2.35 src/mimeview.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/news_gtk.c; cvs diff -u -r 1.105.2.27 -r 1.105.2.28 src/prefs_account.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_send.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_summaries.c; cvs diff -u -r 1.150.2.30 -r 1.150.2.31 src/procmsg.c; cvs diff -u -r 1.395.2.93 -r 1.395.2.94 src/summaryview.c; cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/common/defs.h; cvs diff -u -r 1.36.2.36 -r 1.36.2.37 src/common/utils.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/xml.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/passphrase.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/select-keys.c; ) > 1.9.12cvs70.patchset ( cvs diff -u -r 1.654.2.705 -r 1.654.2.706 configure.ac; ) > 1.9.12cvs71.patchset ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/Makefile.am; ) > 1.9.12cvs72.patchset +( cvs diff -u -r 1.9.2.3 -r 1.9.2.4 src/gtk/sslcertwindow.c; ) > 1.9.12cvs73.patchset diff --git a/configure.ac b/configure.ac index 47b4f47ca..0a640aad6 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=72 +EXTRA_VERSION=73 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c index e828a6543..62ddd9bee 100644 --- a/src/gtk/sslcertwindow.c +++ b/src/gtk/sslcertwindow.c @@ -33,8 +33,6 @@ #include "alertpanel.h" #include "hooks.h" -static void toggle_cert_cb(GtkWidget *widget, - gpointer data); gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert); gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCertificate *new_cert); @@ -232,21 +230,6 @@ void sslcertwindow_show_cert(SSLCertificate *cert) g_free(buf); } -static void toggle_cert_cb(GtkWidget *widget, - gpointer data) -{ - GtkWidget *cert_widget = GTK_WIDGET(data); - GtkWidget *box = widget->parent; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) { - if(cert_widget->parent == NULL) { - gtk_box_pack_start(GTK_BOX(box), cert_widget, TRUE, TRUE, 0); - gtk_widget_show(cert_widget); - } else - gtk_widget_show(cert_widget); - } else - gtk_widget_hide(cert_widget); -} - gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert) { gchar *buf, *sig_status; @@ -275,12 +258,10 @@ gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert) g_free(buf); g_free(sig_status); - button = gtk_toggle_button_new_with_label(_("View certificate")); + button = gtk_expander_new_with_mnemonic(_("_View certificate")); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); cert_widget = cert_presenter(cert); - g_signal_connect(G_OBJECT(button), "toggled", - G_CALLBACK(toggle_cert_cb), cert_widget); - + gtk_container_add(GTK_CONTAINER(button), cert_widget); val = alertpanel_with_type(_("Unknown SSL Certificate"), NULL, _("Accept and save"), _("Cancel connection"), NULL, vbox, ALERT_QUESTION); return (val == G_ALERTDEFAULT); @@ -328,10 +309,9 @@ gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCertificate g_free(buf); g_free(sig_status); - button = gtk_toggle_button_new_with_label(_("View certificates")); + button = gtk_expander_new_with_mnemonic(_("_View certificates")); gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0); - g_signal_connect(G_OBJECT(button), "toggled", - G_CALLBACK(toggle_cert_cb), vbox); + gtk_container_add(GTK_CONTAINER(button), vbox); val = alertpanel_with_type(_("Changed SSL Certificate"), NULL, _("Accept and save"), _("Cancel connection"), NULL, vbox2, ALERT_WARNING);