2005-07-15 [paul] 1.9.12cvs57

[claws.git] / src / ssl_manager.c

diff --git a/src/ssl_manager.c b/src/ssl_manager.c
index 90240809d0b206ce2c189110a12b67b4727d6d0f..415cdd3dbce6f4890a07d70506369da587f090d8 100644 (file)
--- a/src/ssl_manager.c
+++ b/src/ssl_manager.c
@@ -53,12 +53,12 @@ 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 void ssl_manager_load_certs     (void);
 static void ssl_manager_double_clicked(GtkTreeView             *list_view,
                                        GtkTreePath             *path,
@@ -71,7 +71,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();
 
@@ -120,6 +120,8 @@ static GtkWidget *ssl_manager_list_view_create      (void)
        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);
@@ -144,7 +146,7 @@ void ssl_manager_create(void)
        GtkWidget *certlist;
        GtkWidget *view_btn;
        GtkWidget *delete_btn;
-       GtkWidget *ok_btn;
+       GtkWidget *close_btn;
 
        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title (GTK_WINDOW(window),
@@ -154,7 +156,7 @@ void ssl_manager_create(void)
        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_ok_cb), NULL);
+                        G_CALLBACK(ssl_manager_close_cb), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT (window);
 
        hbox1 = gtk_hbox_new(FALSE, 6);
@@ -168,9 +170,9 @@ void ssl_manager_create(void)
        g_signal_connect(G_OBJECT(view_btn), "clicked",
                         G_CALLBACK(ssl_manager_view_cb), NULL);
 
-       ok_btn = gtk_button_new_from_stock(GTK_STOCK_OK);
-       g_signal_connect(G_OBJECT(ok_btn), "clicked",
-                        G_CALLBACK(ssl_manager_ok_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();
        
@@ -178,12 +180,12 @@ void ssl_manager_create(void)
        gtk_box_pack_start(GTK_BOX(hbox1), vbox1, TRUE, TRUE, 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), ok_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);
@@ -194,7 +196,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);
                
@@ -317,8 +319,8 @@ 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();
 }
@@ -329,9 +331,7 @@ static void ssl_manager_double_clicked(GtkTreeView          *list_view,
                                        gpointer                 data)
 {
        SSLCertificate *cert;
-       gchar *cmd;
        GtkTreeIter iter;
-       gboolean is_valid;
        GtkTreeModel *model = gtk_tree_view_get_model(list_view);
 
        if (!gtk_tree_model_get_iter(model, &iter, path))
@@ -355,11 +355,9 @@ static void ssl_manager_delete_cb(GtkWidget *widget,
                              gpointer data) 
 {
        SSLCertificate *cert;
-       GList *rowlist;
        int val;
        GtkTreeIter sel;
        GtkTreeModel *model;
-       gchar *action;
 
        if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
                                (GTK_TREE_VIEW(manager.certlist)),
@@ -387,11 +385,8 @@ static void ssl_manager_view_cb(GtkWidget *widget,
                                gpointer data) 
 {
        SSLCertificate *cert;
-       GList *rowlist;
-       int val;
        GtkTreeIter sel;
        GtkTreeModel *model;
-       gchar *action;
 
        if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
                                (GTK_TREE_VIEW(manager.certlist)),