Fix a Coverity warning caused by previous commits.

[claws.git] / src / prefs_gtk.c

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index 68840bf0f435ce34d28bfb3086f4f1b33159b696..44b6f4facf1ab24895171741ab7e272fceb07bc7 100644 (file)
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -324,7 +324,6 @@ gint prefs_write_param(PrefParam *param, FILE *fp)
        for (i = 0; param[i].name != NULL; i++) {
                switch (param[i].type) {
                case P_STRING:
-               case P_PASSWORD:
                {
                        gchar *tmp = NULL;
 
@@ -346,6 +345,8 @@ gint prefs_write_param(PrefParam *param, FILE *fp)
                        g_free(tmp);
                        break;
                }
+               case P_PASSWORD:
+                       return 0; /* Passwords are written to password store. */
                case P_INT:
                        g_snprintf(buf, sizeof(buf), "%s=%d\n", param[i].name,
                                   *((gint *)param[i].data));
@@ -630,17 +631,14 @@ void prefs_set_data_from_entry(PrefParam *pparam)
                g_free(*str);
                *str = entry_str[0] ? g_strdup(entry_str) : NULL;
                break;
+       case P_PASSWORD:
+               break;
        case P_USHORT:
                *((gushort *)pparam->data) = atoi(entry_str);
                break;
        case P_INT:
                *((gint *)pparam->data) = atoi(entry_str);
                break;
-       case P_PASSWORD:
-               str = (gchar **)pparam->data;
-               g_free(*str);
-               *str = password_encrypt(entry_str, NULL);
-               break;
        default:
                g_warning("Invalid PrefType for GtkEntry widget: %d",
                          pparam->type);
@@ -668,7 +666,6 @@ void prefs_set_escaped_data_from_entry(PrefParam *pparam)
 void prefs_set_entry(PrefParam *pparam)
 {
        gchar **str;
-
        cm_return_if_fail(*pparam->widget != NULL);
 
        switch (pparam->type) {
@@ -685,11 +682,6 @@ void prefs_set_entry(PrefParam *pparam)
                gtk_entry_set_text(GTK_ENTRY(*pparam->widget),
                                   itos(*((gushort *)pparam->data)));
                break;
-       case P_PASSWORD:
-               str = (gchar **)pparam->data;
-               gtk_entry_set_text(GTK_ENTRY(*pparam->widget),
-                               password_decrypt(*str, NULL));
-               break;
        default:
                g_warning("Invalid PrefType for GtkEntry widget: %d",
                          pparam->type);
@@ -724,7 +716,6 @@ void prefs_set_data_from_text(PrefParam *pparam)
 
        switch (pparam->type) {
        case P_STRING:
-       case P_PASSWORD:
                str = (gchar **)pparam->data;
                g_free(*str);
                if (GTK_IS_EDITABLE(*pparam->widget)) {   /* need? */
@@ -797,7 +788,6 @@ void prefs_set_text(PrefParam *pparam)
 
        switch (pparam->type) {
        case P_STRING:
-       case P_PASSWORD:
                str = (gchar **)pparam->data;
                if (*str) {
                        bufp = buf = alloca(strlen(*str) + 1);