diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-12-13 06:21:16 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-12-13 06:21:16 +0000 |
| commit | aae887a3faf1afb0c8b4760e16fa3480d920e086 (patch) | |
| tree | 7312f53bf4dd8219dc63023061ee1c57d810afae | |
| parent | 3c6ddfce94cf486d7b4ff27035299f6b384f3559 (diff) | |
ssl_manager_verify_cert(): follow comply_gnome_hig setting.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1419 ee746299-78ed-0310-b773-934348b2243d
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.ja | 5 | ||||
| -rw-r--r-- | src/sslmanager.c | 15 |
3 files changed, 21 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2006-12-13 + * src/sslmanager.c: ssl_manager_verify_cert(): follow comply_gnome_hig + setting. + +2006-12-13 + * libsylph/socket.c: Unix: reload /etc/resolv.conf if it has been modified. diff --git a/ChangeLog.ja b/ChangeLog.ja index f72006bd..4374ac47 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,10 @@ 2006-12-13 + * src/sslmanager.c: ssl_manager_verify_cert(): comply_gnome_hig + の設定に従うようにした。 + +2006-12-13 + * libsylph/socket.c: /etc/resolv.conf が変更されていれば再読み込み するようにした。 diff --git a/src/sslmanager.c b/src/sslmanager.c index 5e01bbb9..cfdeee6e 100644 --- a/src/sslmanager.c +++ b/src/sslmanager.c @@ -37,6 +37,7 @@ #include "ssl.h" #include "sslmanager.h" #include "manage_window.h" +#include "prefs_common.h" gint ssl_manager_verify_cert(SockInfo *sockinfo, const gchar *hostname, X509 *server_cert, glong verify_result) @@ -134,10 +135,16 @@ gint ssl_manager_verify_cert(SockInfo *sockinfo, const gchar *hostname, } #endif - gtk_dialog_add_buttons(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); + if (prefs_common.comply_gnome_hig) + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_OK, + NULL); + else + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + GTK_STOCK_OK, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + NULL); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); gtk_widget_show_all(dialog); |