* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+/* alfons - all folder item specific settings should migrate into
+ * folderlist.xml!!! the old folderitemrc file will only serve for a few
+ * versions (for compatibility) */
+
#include "intl.h"
#include "defs.h"
#include "folder.h"
GtkWidget *checkbtn_request_return_receipt;
GtkWidget *checkbtn_default_to;
GtkWidget *entry_default_to;
+ GtkWidget *checkbtn_folder_chmod;
+ GtkWidget *entry_folder_chmod;
};
static PrefParam param[] = {
NULL, NULL, NULL},
{"sort_descending", "FALSE", &tmp_prefs.sort_descending, P_BOOL,
NULL, NULL, NULL},
- {"enable_thread", "TRUE", &tmp_prefs.enable_thread, P_BOOL,
- NULL, NULL, NULL},
+ /*{"enable_thread", "TRUE", &tmp_prefs.enable_thread, P_BOOL,
+ NULL, NULL, NULL},*/
{"kill_score", "-9999", &tmp_prefs.kill_score, P_INT,
NULL, NULL, NULL},
{"important_score", "1", &tmp_prefs.important_score, P_INT,
NULL, NULL, NULL},
+ /* MIGRATION */
{"request_return_receipt", "", &tmp_prefs.request_return_receipt, P_BOOL,
NULL, NULL, NULL},
{"enable_default_to", "", &tmp_prefs.enable_default_to, P_BOOL,
NULL, NULL, NULL},
{"default_to", "", &tmp_prefs.default_to, P_STRING,
NULL, NULL, NULL},
+ {"enable_folder_chmod", "", &tmp_prefs.enable_folder_chmod, P_BOOL,
+ NULL, NULL, NULL},
+ {"folder_chmod", "", &tmp_prefs.folder_chmod, P_INT,
+ NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
void prefs_folder_item_cancel_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog);
void prefs_folder_item_ok_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog);
void prefs_folder_item_default_to_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog);
+void prefs_folder_item_folder_chmod_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog);
+gint prefs_folder_item_chmod_mode(gchar *folder_chmod);
void prefs_folder_item_read_config(FolderItem * item)
{
prefs_read_config(param, id, FOLDERITEM_RC);
g_free(id);
- * item->prefs = tmp_prefs;
+ *item->prefs = tmp_prefs;
+
+ /* MIGRATION */
+ item->ret_rcpt = tmp_prefs.request_return_receipt ? TRUE : FALSE;
}
void prefs_folder_item_save_config(FolderItem * item)
prefs_save_config(param, id, FOLDERITEM_RC);
g_free(id);
+
+ /* MIGRATION: make sure migrated items are not saved
+ */
}
void prefs_folder_item_set_config(FolderItem * item,
tmp_prefs.request_return_receipt = FALSE;
tmp_prefs.enable_default_to = FALSE;
tmp_prefs.default_to = NULL;
+ tmp_prefs.enable_folder_chmod = FALSE;
+ tmp_prefs.folder_chmod = 0;
* prefs = tmp_prefs;
void prefs_folder_item_free(PrefsFolderItem * prefs)
{
- g_free(prefs->default_to);
+ if (prefs->default_to)
+ g_free(prefs->default_to);
if (prefs->scoring != NULL)
prefs_scoring_free(prefs->scoring);
g_free(prefs);
return GTK_SORT_ASCENDING;
}
+#define SAFE_STRING(str) \
+ (str) ? (str) : ""
+
void prefs_folder_item_create(FolderItem *item) {
struct PrefsFolderItemDialog *dialog;
GtkWidget *window;
GtkWidget *checkbtn_request_return_receipt;
GtkWidget *checkbtn_default_to;
GtkWidget *entry_default_to;
+ GtkWidget *checkbtn_folder_chmod;
+ GtkWidget *entry_folder_chmod;
dialog = g_new0(struct PrefsFolderItemDialog, 1);
dialog->item = item;
PACK_CHECK_BUTTON(vbox, checkbtn_request_return_receipt,
_("Request Return Receipt"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_request_return_receipt),
- item->prefs->request_return_receipt);
+ item->ret_rcpt ? TRUE : FALSE);
/* Default To */
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show(entry_default_to);
gtk_box_pack_start(GTK_BOX(hbox), entry_default_to, FALSE, FALSE, 0);
gtk_editable_set_editable(GTK_EDITABLE(entry_default_to), item->prefs->enable_default_to);
- gtk_entry_set_text(GTK_ENTRY(entry_default_to), item->prefs->default_to);
+ gtk_entry_set_text(GTK_ENTRY(entry_default_to), SAFE_STRING(item->prefs->default_to));
+
+ /* Folder chmod */
+ hbox = gtk_hbox_new(FALSE, 8);
+ gtk_widget_show(hbox);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+ PACK_CHECK_BUTTON(hbox, checkbtn_folder_chmod,
+ _("Folder chmod: "));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_chmod), item->prefs->enable_folder_chmod);
+ gtk_signal_connect(GTK_OBJECT(checkbtn_folder_chmod), "toggled",
+ GTK_SIGNAL_FUNC(prefs_folder_item_folder_chmod_cb), dialog);
+
+ entry_folder_chmod = gtk_entry_new();
+ gtk_widget_show(entry_folder_chmod);
+ gtk_box_pack_start(GTK_BOX(hbox), entry_folder_chmod, FALSE, FALSE, 0);
+ gtk_editable_set_editable(GTK_EDITABLE(entry_folder_chmod), item->prefs->enable_folder_chmod);
+ if (item->prefs->folder_chmod) {
+ gint tmp;
+ gint mult;
+ gint count = 0;
+ char buf[64]; /* plenty enough for an integer */
+
+ tmp = item->prefs->folder_chmod;
+ while (tmp && (count < sizeof(buf) - 1)) {
+ mult = tmp / 8;
+ buf[count++] = '0' + (tmp - mult * 8);
+ tmp /= 8;
+ }
+ buf[count] = '\0';
+ gtk_entry_set_text(GTK_ENTRY(entry_folder_chmod), buf);
+ }
dialog->window = window;
dialog->checkbtn_request_return_receipt = checkbtn_request_return_receipt;
dialog->checkbtn_default_to = checkbtn_default_to;
dialog->entry_default_to = entry_default_to;
+ dialog->checkbtn_folder_chmod = checkbtn_folder_chmod;
+ dialog->entry_folder_chmod = entry_folder_chmod;
gtk_widget_show(window);
}
prefs->request_return_receipt =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_request_return_receipt));
+ /* MIGRATION */
+ dialog->item->ret_rcpt = prefs->request_return_receipt;
+
prefs->enable_default_to =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_default_to));
g_free(prefs->default_to);
prefs->default_to =
gtk_editable_get_chars(GTK_EDITABLE(dialog->entry_default_to), 0, -1);
+ prefs->enable_folder_chmod =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_folder_chmod));
+ prefs->folder_chmod = prefs_folder_item_chmod_mode(
+ gtk_editable_get_chars(GTK_EDITABLE(dialog->entry_folder_chmod),
+ 0, -1));
prefs_folder_item_save_config(dialog->item);
prefs_folder_item_destroy(dialog);
gtk_editable_set_editable(GTK_EDITABLE(dialog->entry_default_to),
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_default_to)));
}
+
+void prefs_folder_item_folder_chmod_cb(GtkWidget *widget, struct PrefsFolderItemDialog *dialog) {
+ gtk_editable_set_editable(GTK_EDITABLE(dialog->entry_folder_chmod),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbtn_folder_chmod)));
+}
+
+gint prefs_folder_item_chmod_mode(gchar *folder_chmod) {
+ gint newmode = 0;
+ gchar *tmp;
+
+ if (folder_chmod) {
+ newmode = strtol(folder_chmod, &tmp, 8);
+ if (!(*(folder_chmod) && !(*tmp)))
+ newmode = 0;
+ }
+
+ return newmode;
+}
projects / claws.git / blobdiff