2005-07-06 [colin] 1.9.12cvs24

[claws.git] / src / account.c

diff --git a/src/account.c b/src/account.c
index 7fac482da0cc31285fd028b829e827a1ec2fbc03..566fde42521bdda3029e4fd7509f8fd44db5fe67 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -412,7 +412,10 @@ void account_add(void)
                        folder = folder_new(folder_get_class_from_string("news"), ac_prefs->account_name,
                                            ac_prefs->nntp_server);
                }
-
+               if (folder == NULL) {
+                       alertpanel_error(_("Can't create folder."));
+                       return;
+               }
                folder->account = ac_prefs;
                ac_prefs->folder = folder;
                folder_add(folder);
@@ -495,7 +498,8 @@ void account_set_missing_folder(void)
                                folder = folder_new(folder_get_class_from_string("news"), ap->account_name,
                                                    ap->nntp_server);
                        }
-
+                       if (folder == NULL)
+                               return;
                        folder->account = ap;
                        ap->folder = folder;
                        folder_add(folder);
@@ -603,8 +607,6 @@ static void account_edit_create(void)
        GtkWidget *hbox;
        GtkWidget *scrolledwin;
        GtkWidget *list_view;
-       gchar *titles[N_EDIT_ACCOUNT_COLS];
-       gint i;
 
        GtkWidget *vbox2;
        GtkWidget *add_btn;
@@ -674,13 +676,17 @@ static void account_edit_create(void)
        g_signal_connect (G_OBJECT(add_btn), "clicked",
                          G_CALLBACK (account_add), NULL);
 
+#ifdef GTK_STOCK_EDIT
+       edit_btn = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+#else
        edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
+#endif
        gtk_widget_show (edit_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), edit_btn, FALSE, FALSE, 4);
        g_signal_connect (G_OBJECT(edit_btn), "clicked",
                          G_CALLBACK (account_edit_prefs), NULL);
 
-       del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+       del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
        gtk_widget_show (del_btn);
        gtk_box_pack_start (GTK_BOX (vbox2), del_btn, FALSE, FALSE, 4);
        g_signal_connect (G_OBJECT(del_btn), "clicked",
@@ -925,7 +931,6 @@ static void account_clone(GtkWidget *widget, gpointer data)
 static void account_delete(GtkWidget *widget, gpointer data)
 {
        PrefsAccount *ac_prefs;
-       gint account_id;
        GList *list;
        Folder *folder;
  
@@ -1421,7 +1426,6 @@ GtkTreePath *account_list_view_get_selected_account_path(GtkWidget *list_view)
        GtkTreeSelection *selector;
        GtkTreeModel *model;
        GtkTreeIter iter;
-       GtkTreePath *res;
 
        selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));