2006-08-16 [colin] 2.4.0cvs54
[claws.git] / src / ssl_manager.c
index 889e569c625f706200382eb28820d20ee1bd674f..c80d80350fbf497b602ff1264a652bccf0f4b136 100644 (file)
@@ -1,6 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * This file Copyright (C) 2002-2005 Colin Leroy <colin@colino.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -23,6 +24,8 @@
 #ifdef USE_OPENSSL
 #include <gtk/gtkwidget.h>
 #include <glib.h>
+#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 #include <sys/types.h>
 #include <dirent.h>
 
 #include "manage_window.h"
 #include "utils.h"
 #include "mainwindow.h"
-#include "intl.h"
 #include "gtksctree.h"
 #include "alertpanel.h"
 #include "sslcertwindow.h"
+#include "prefs_common.h"
+
+enum {
+       SSL_MANAGER_HOST,
+       SSL_MANAGER_PORT,
+       SSL_MANAGER_CERT,
+       N_SSL_MANAGER_COLUMNS
+};
+
 
 static struct SSLManager
 {
@@ -44,13 +55,19 @@ static struct SSLManager
        GtkWidget *certlist;
        GtkWidget *view_btn;
        GtkWidget *delete_btn;
-       GtkWidget *ok_btn;
+       GtkWidget *close_btn;
 } manager;
 
 static void ssl_manager_view_cb                (GtkWidget *widget, gpointer data);
 static void ssl_manager_delete_cb      (GtkWidget *widget, gpointer data);
-static void ssl_manager_ok_cb          (GtkWidget *widget, gpointer data);
+static void ssl_manager_close_cb       (GtkWidget *widget, gpointer data);
+static gboolean key_pressed            (GtkWidget *widget, GdkEventKey *event,
+                                        gpointer data);
 static void ssl_manager_load_certs     (void);
+static void ssl_manager_double_clicked(GtkTreeView             *list_view,
+                                       GtkTreePath             *path,
+                                       GtkTreeViewColumn       *column,
+                                       gpointer                 data);
 
 void ssl_manager_open(MainWindow *mainwin)
 {
@@ -58,7 +75,7 @@ void ssl_manager_open(MainWindow *mainwin)
                ssl_manager_create();
 
        manage_window_set_transient(GTK_WINDOW(manager.window));
-       gtk_widget_grab_focus(manager.ok_btn);
+       gtk_widget_grab_focus(manager.close_btn);
 
        ssl_manager_load_certs();
 
@@ -66,6 +83,65 @@ void ssl_manager_open(MainWindow *mainwin)
 
 }
 
+static GtkListStore* ssl_manager_create_data_store(void)
+{
+       return gtk_list_store_new(N_SSL_MANAGER_COLUMNS,
+                                 G_TYPE_STRING,
+                                 G_TYPE_STRING,
+                                 G_TYPE_POINTER,
+                                 -1);
+}
+
+static void ssl_manager_create_list_view_columns(GtkWidget *list_view)
+{
+       GtkTreeViewColumn *column;
+       GtkCellRenderer *renderer;
+
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Server"),
+                renderer,
+                "text", SSL_MANAGER_HOST,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
+
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Port"),
+                renderer,
+                "text", SSL_MANAGER_PORT,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
+}
+
+static GtkWidget *ssl_manager_list_view_create (void)
+{
+       GtkTreeView *list_view;
+       GtkTreeSelection *selector;
+       GtkTreeModel *model;
+
+       model = GTK_TREE_MODEL(ssl_manager_create_data_store());
+       list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
+       g_object_unref(model);  
+       
+       gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model),
+                                             0, GTK_SORT_ASCENDING);
+       gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+       
+       selector = gtk_tree_view_get_selection(list_view);
+       gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
+
+       g_signal_connect(G_OBJECT(list_view), "row_activated",
+                        G_CALLBACK(ssl_manager_double_clicked),
+                        list_view);
+
+       /* create the columns */
+       ssl_manager_create_list_view_columns(GTK_WIDGET(list_view));
+
+       return GTK_WIDGET(list_view);
+
+}
+
 void ssl_manager_create(void) 
 {
        GtkWidget *window;
@@ -74,53 +150,48 @@ void ssl_manager_create(void)
        GtkWidget *certlist;
        GtkWidget *view_btn;
        GtkWidget *delete_btn;
-       GtkWidget *ok_btn;
-       gchar *titles[2];
+       GtkWidget *close_btn;
 
-       window = gtk_window_new (GTK_WINDOW_DIALOG);
+       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title (GTK_WINDOW(window),
                              _("Saved SSL Certificates"));
+
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-       gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
-       gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
-       gtk_signal_connect (GTK_OBJECT(window), "delete_event",
-                           GTK_SIGNAL_FUNC(ssl_manager_ok_cb), NULL);
+       gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+       gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(ssl_manager_close_cb), NULL);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(key_pressed), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT (window);
+
+       hbox1 = gtk_hbox_new(FALSE, 6);
+       vbox1 = gtk_vbox_new(FALSE, 0);
+       delete_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+       
+       g_signal_connect(G_OBJECT(delete_btn), "clicked",
+                        G_CALLBACK(ssl_manager_delete_cb), NULL);
+
+       view_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
+       g_signal_connect(G_OBJECT(view_btn), "clicked",
+                        G_CALLBACK(ssl_manager_view_cb), NULL);
+
+       close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+       g_signal_connect(G_OBJECT(close_btn), "clicked",
+                        G_CALLBACK(ssl_manager_close_cb), NULL);
+
+       certlist = ssl_manager_list_view_create();
        
-       hbox1 = gtk_hbox_new(FALSE,2);
-       vbox1 = gtk_vbox_new(FALSE,0);
-       delete_btn = gtk_button_new_with_label(_("Delete"));
-       gtk_signal_connect (GTK_OBJECT(delete_btn), "clicked",
-                           GTK_SIGNAL_FUNC(ssl_manager_delete_cb), NULL);
-       view_btn = gtk_button_new_with_label(_("View"));
-       gtk_signal_connect (GTK_OBJECT(view_btn), "clicked",
-                           GTK_SIGNAL_FUNC(ssl_manager_view_cb), NULL);
-       ok_btn = gtk_button_new_with_label(_("OK"));
-       gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
-                           GTK_SIGNAL_FUNC(ssl_manager_ok_cb), NULL);
-       gtk_widget_set_usize(ok_btn, 80, -1);
-       gtk_widget_set_usize(delete_btn, 80, -1);
-       gtk_widget_set_usize(view_btn, 80, -1);
-
-       titles[0] = _("Server");
-       titles[1] = _("Port");
-       certlist = gtk_sctree_new_with_titles(2, 3, titles);
-       gtk_clist_column_titles_show(GTK_CLIST(certlist));
-       gtk_clist_set_column_width(GTK_CLIST(certlist), 0, 220);
-       gtk_clist_set_selection_mode(GTK_CLIST(certlist), GTK_SELECTION_SINGLE);
-       gtk_widget_set_usize(certlist, 300, 200);
-       gtk_signal_connect (GTK_OBJECT(certlist), "open_row",
-                           GTK_SIGNAL_FUNC(ssl_manager_view_cb), NULL);
        gtk_box_pack_start(GTK_BOX(hbox1), certlist, TRUE, TRUE, 0);
-       gtk_box_pack_start(GTK_BOX(hbox1), vbox1, TRUE, TRUE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox1), view_btn, FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox1), delete_btn, FALSE, FALSE, 0);
-       gtk_box_pack_end(GTK_BOX(vbox1), ok_btn, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox1), vbox1, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox1), view_btn, FALSE, FALSE, 4);
+       gtk_box_pack_start(GTK_BOX(vbox1), delete_btn, FALSE, FALSE, 4);
+       gtk_box_pack_end(GTK_BOX(vbox1), close_btn, FALSE, FALSE, 4);
        
        gtk_widget_show(certlist);
        gtk_widget_show(hbox1);
        gtk_widget_show(vbox1);
-       gtk_widget_show(ok_btn);
+       gtk_widget_show(close_btn);
        gtk_widget_show(delete_btn);
        gtk_widget_show(view_btn);
        gtk_container_add(GTK_CONTAINER (window), hbox1);
@@ -131,7 +202,7 @@ void ssl_manager_create(void)
        manager.certlist = certlist;
        manager.view_btn = view_btn;
        manager.delete_btn = delete_btn;
-       manager.ok_btn = ok_btn;
+       manager.close_btn = close_btn;
 
        gtk_widget_show(window);
                
@@ -176,25 +247,57 @@ static char *get_port(char *str)
        return ret;
        
 }
+
+static void ssl_manager_list_view_insert_cert(GtkWidget *list_view,
+                                                 GtkTreeIter *row_iter,
+                                                 gchar *host, 
+                                                 gchar *port,
+                                                 SSLCertificate *cert) 
+{
+       GtkTreeIter iter;
+       GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model
+                                       (GTK_TREE_VIEW(list_view)));
+
+       if (row_iter == NULL) {
+               /* append new */
+               gtk_list_store_append(list_store, &iter);
+               gtk_list_store_set(list_store, &iter,
+                                  SSL_MANAGER_HOST, host,
+                                  SSL_MANAGER_PORT, port,
+                                  SSL_MANAGER_CERT, cert,
+                                  -1);
+       } else {
+               gtk_list_store_set(list_store, row_iter,
+                                  SSL_MANAGER_HOST, host,
+                                  SSL_MANAGER_PORT, port,
+                                  SSL_MANAGER_CERT, cert,
+                                  -1);
+       }
+}
+
 static void ssl_manager_load_certs (void) 
 {
        DIR *dir;
        struct dirent *d;
        gchar *path;
        int row = 0;
+       GtkListStore *store;
+
+       store = GTK_LIST_STORE(gtk_tree_view_get_model
+                               (GTK_TREE_VIEW(manager.certlist)));
+
+       gtk_list_store_clear(store);
 
        path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, 
                          "certs", G_DIR_SEPARATOR_S, NULL);
 
-       gtk_clist_clear(GTK_CLIST(manager.certlist));
-
        if((dir = opendir(path)) == NULL) {
                perror("opendir");
                return;
        }
        
        while ((d = readdir(dir)) != NULL) {
-               gchar *server, *port, *text[2];
+               gchar *server, *port;
                SSLCertificate *cert;
 
                if(!strstr(d->d_name, ".cert")) 
@@ -203,15 +306,14 @@ static void ssl_manager_load_certs (void)
                server = get_server(d->d_name);
                port = get_port(d->d_name);
                
-               text[0] = g_strdup(server);
-               text[1] = g_strdup(port);
-               gtk_clist_append(GTK_CLIST(manager.certlist), text);
+               
                cert = ssl_certificate_find_lookup(server, atoi(port), FALSE);
-               gtk_clist_set_row_data(GTK_CLIST(manager.certlist), row, cert);
+               
+               ssl_manager_list_view_insert_cert(manager.certlist, NULL, 
+                                                 server, port, cert);
+               
                g_free(server);
                g_free(port);
-               g_free(text[0]);
-               g_free(text[1]);
                row++;
        }
        closedir(dir);
@@ -223,57 +325,96 @@ void ssl_manager_close(void)
        gtk_widget_hide(manager.window);
 }
 
-static void ssl_manager_ok_cb(GtkWidget *widget, 
-                             gpointer data) 
+static void ssl_manager_close_cb(GtkWidget *widget,
+                                gpointer data) 
 {
        ssl_manager_close();
 }
-static void ssl_manager_view_cb(GtkWidget *widget, 
-                             gpointer data) 
+
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+       if (event && event->keyval == GDK_Escape)
+               ssl_manager_close();
+       return FALSE;
+}
+
+static void ssl_manager_double_clicked(GtkTreeView             *list_view,
+                                       GtkTreePath             *path,
+                                       GtkTreeViewColumn       *column,
+                                       gpointer                 data)
 {
        SSLCertificate *cert;
-       GList *rowlist;
-       
-       rowlist = GTK_CLIST(manager.certlist)->selection;
-       if (!rowlist) 
+       GtkTreeIter iter;
+       GtkTreeModel *model = gtk_tree_view_get_model(list_view);
+
+       if (!gtk_tree_model_get_iter(model, &iter, path))
                return;
-       
-       cert = gtk_ctree_node_get_row_data
-                       (GTK_CTREE(manager.certlist),
-                        GTK_CTREE_NODE(rowlist->data));
-       
+
+       gtk_tree_model_get(model, &iter, 
+                          SSL_MANAGER_CERT, &cert,
+                          -1);
+
        if (!cert)
                return;
 
        sslcertwindow_show_cert(cert);
-       
-       
+
+       return;
 }
+
+
+
 static void ssl_manager_delete_cb(GtkWidget *widget, 
                              gpointer data) 
 {
        SSLCertificate *cert;
-       GList *rowlist;
        int val;
-       
-       rowlist = GTK_CLIST(manager.certlist)->selection;
-       if (!rowlist) 
+       GtkTreeIter sel;
+       GtkTreeModel *model;
+
+       if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
+                               (GTK_TREE_VIEW(manager.certlist)),
+                               &model, &sel))
                return;
        
-       cert = gtk_ctree_node_get_row_data
-                       (GTK_CTREE(manager.certlist),
-                        GTK_CTREE_NODE(rowlist->data));
-       
+       gtk_tree_model_get(model, &sel,
+                          SSL_MANAGER_CERT, &cert,
+                          -1);
        if (!cert)
                return;
-       val = alertpanel(_("Delete certificate"), 
-                            _("Do you really want to delete this certificate?"),
-                            _("Yes"), _("+No"), NULL);
-       if (val != G_ALERTDEFAULT)
+
+       val = alertpanel_full(_("Delete certificate"),
+                             _("Do you really want to delete this certificate?"),
+                             GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, FALSE,
+                             NULL, ALERT_WARNING, G_ALERTDEFAULT);
+
+                            
+       if (val != G_ALERTALTERNATE)
                return;
        
        ssl_certificate_delete_from_disk(cert);
        ssl_certificate_destroy(cert);
-       gtk_ctree_remove_node(GTK_CTREE(manager.certlist), GTK_CTREE_NODE(rowlist->data));
+       gtk_list_store_remove(GTK_LIST_STORE(model), &sel);
+}
+
+static void ssl_manager_view_cb(GtkWidget *widget, 
+                               gpointer data) 
+{
+       SSLCertificate *cert;
+       GtkTreeIter sel;
+       GtkTreeModel *model;
+
+       if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
+                               (GTK_TREE_VIEW(manager.certlist)),
+                               &model, &sel))
+               return;
+       
+       gtk_tree_model_get(model, &sel,
+                          SSL_MANAGER_CERT, &cert,
+                          -1);
+       if (!cert)
+               return;
+
+       sslcertwindow_show_cert(cert);
 }
 #endif