2007-07-19 [colin] 2.10.0cvs47

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 904f955ea5375e3c58c458c040eceb6d7159602d..dee8f3bbc13af7828da9b8f290fdeacf73d27d15 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -4,7 +4,7 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -139,6 +139,10 @@ static PrefParam param_os_specific[] = {
  */
 
 static PrefParam param[] = {
+#ifdef MAEMO
+       {"data_root", "", &prefs_common.data_root, P_STRING,
+        NULL, NULL, NULL},
+#endif
        /* Receive */
        {"use_ext_inc", "FALSE", &prefs_common.use_extinc, P_BOOL,
         NULL, NULL, NULL},
@@ -425,12 +429,14 @@ static PrefParam param[] = {
 #endif
        {"toolbar_detachable", "FALSE", &prefs_common.toolbar_detachable, P_BOOL,
         NULL, NULL, NULL},
+#ifndef MAEMO
        {"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
         NULL, NULL, NULL},
-#ifndef MAEMO
        {"show_searchbar", "TRUE", &prefs_common.show_searchbar, P_BOOL,
         NULL, NULL, NULL},
 #else
+       {"show_statusbar", "FALSE", &prefs_common.show_statusbar, P_BOOL,
+        NULL, NULL, NULL},
        {"show_searchbar", "FALSE", &prefs_common.show_searchbar, P_BOOL,
         NULL, NULL, NULL},
 #endif
@@ -457,6 +463,8 @@ static PrefParam param[] = {
         &prefs_common.summary_col_visible[S_COL_SCORE], P_BOOL, NULL, NULL, NULL},
        {"summary_col_show_locked", "FALSE",
         &prefs_common.summary_col_visible[S_COL_LOCKED], P_BOOL, NULL, NULL, NULL},
+       {"summary_col_show_tags", "FALSE",
+        &prefs_common.summary_col_visible[S_COL_TAGS], P_BOOL, NULL, NULL, NULL},
 
        {"summary_col_pos_mark", "0",
          &prefs_common.summary_col_pos[S_COL_MARK], P_INT, NULL, NULL, NULL},
@@ -480,6 +488,8 @@ static PrefParam param[] = {
         &prefs_common.summary_col_pos[S_COL_LOCKED], P_INT, NULL, NULL, NULL},
        {"summary_col_pos_to", "10",
          &prefs_common.summary_col_pos[S_COL_TO], P_INT, NULL, NULL, NULL},
+       {"summary_col_pos_tags", "11",
+         &prefs_common.summary_col_pos[S_COL_TAGS], P_INT, NULL, NULL, NULL},
 
        {"summary_col_size_mark", "10",
         &prefs_common.summary_col_size[S_COL_MARK], P_INT, NULL, NULL, NULL},
@@ -513,6 +523,8 @@ static PrefParam param[] = {
         &prefs_common.summary_col_size[S_COL_SCORE], P_INT, NULL, NULL, NULL},
        {"summary_col_size_locked", "13",
         &prefs_common.summary_col_size[S_COL_LOCKED], P_INT, NULL, NULL, NULL},
+       {"summary_col_size_tags", "150",
+        &prefs_common.summary_col_size[S_COL_TAGS], P_INT, NULL, NULL, NULL},
 
        /* Widget size */
        {"folderwin_x", "16", &prefs_common.folderwin_x, P_INT,
@@ -797,11 +809,29 @@ static PrefParam param[] = {
        {"important_score", "1", &prefs_common.important_score, P_INT,
         NULL, NULL, NULL},
 
-    {"clip_log", "TRUE", &prefs_common.cliplog, P_BOOL,
+       {"clip_log", "TRUE", &prefs_common.cliplog, P_BOOL,
         NULL, NULL, NULL},
        {"log_length", "500", &prefs_common.loglength, P_INT,
         NULL, NULL, NULL},
-
+#ifndef MAEMO
+       {"enable_log_standard", "TRUE", &prefs_common.enable_log_standard, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_warning", "TRUE", &prefs_common.enable_log_warning, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_error", "TRUE", &prefs_common.enable_log_error, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_status", "TRUE", &prefs_common.enable_log_status, P_BOOL,
+        NULL, NULL, NULL},
+#else
+       {"enable_log_standard", "FALSE", &prefs_common.enable_log_standard, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_warning", "FALSE", &prefs_common.enable_log_warning, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_error", "FALSE", &prefs_common.enable_log_error, P_BOOL,
+        NULL, NULL, NULL},
+       {"enable_log_status", "FALSE", &prefs_common.enable_log_status, P_BOOL,
+        NULL, NULL, NULL},
+#endif
        {"log_msg_color", "#00af00", &prefs_common.log_msg_color, P_COLOR,
         NULL, NULL, NULL},
        {"log_warn_color", "#af0000", &prefs_common.log_warn_color, P_COLOR,
@@ -870,6 +900,11 @@ static PrefParam param[] = {
        {"actionswin_height", "-1", &prefs_common.actionswin_height, P_INT,
         NULL, NULL, NULL},
 
+       {"tagswin_width", "486", &prefs_common.tagswin_width, P_INT,
+        NULL, NULL, NULL},
+       {"tagswin_height", "-1", &prefs_common.tagswin_height, P_INT,
+        NULL, NULL, NULL},
+
        {"addressbookwin_width", "520", &prefs_common.addressbookwin_width, P_INT,
         NULL, NULL, NULL},
        {"addressbookwin_height", "-1", &prefs_common.addressbookwin_height, P_INT,
@@ -1329,6 +1364,33 @@ gboolean prefs_common_unsafe_ssl_certs(void)
        return prefs_common.unsafe_ssl_certs;
 }
 
+gboolean prefs_common_enable_log_standard(void)
+{
+       return prefs_common.enable_log_standard;
+}
+
+gboolean prefs_common_enable_log_warning(void)
+{
+       return prefs_common.enable_log_warning;
+}
+gboolean prefs_common_enable_log_error(void)
+{
+       return prefs_common.enable_log_error;
+}
+gboolean prefs_common_enable_log_status(void)
+{
+       return prefs_common.enable_log_status;
+}
+
+#ifdef MAEMO
+const gchar *prefs_common_get_data_root(void)
+{
+       if (prefs_common.data_root && *prefs_common.data_root)
+               return prefs_common.data_root;
+       else
+               return NULL;
+}
+#endif
 /**
    return the translated name of a header, if the translate_header option is
    set, otherwise return the untranslated header name (header_name itself).