Remove function dwb_init_vars, call setter functions on init instead

1 files changed, 14 insertions, 16 deletions

diff --git a/src/config.h b/src/config.h
index 82992e54..554f0bf0 100644
--- a/src/config.h
+++ b/src/config.h
@@ -813,7 +813,7 @@ static WebSettings DWB_SETTINGS[] = {
   { { "enable-plugins",			                     "Whether to enable plugins", },                                                 
     SETTING_BUILTIN,  BOOLEAN, { .b = true              }, (S_Func) dwb_webkit_setting,  },
   { { "enable-private-browsing",			           "Whether to enable private browsing mode", },                                        
-    SETTING_BUILTIN,  BOOLEAN, { .b = false             }, (S_Func) dwb_set_private_browsing,  },
+    SETTING_BUILTIN | SETTING_ONINIT,  BOOLEAN, { .b = false             }, (S_Func) dwb_set_private_browsing,  },
   { { "enable-scripts",			                     "Enable embedded scripting languages", },                                                  
     SETTING_PER_VIEW,  BOOLEAN, { .b = true              }, (S_Func) dwb_set_scripts,  },
   { { "enable-site-specific-quirks",			       "Enable site-specific compatibility workarounds", },                                    
@@ -875,13 +875,13 @@ static WebSettings DWB_SETTINGS[] = {
   { { "ssl-ca-cert",                               "Path to ssl-certificate", },                                          
     SETTING_GLOBAL,      CHAR,    { .p = NULL            },   (S_Func) dwb_soup_init_session_features,  },
   { { "cookies-store-policy",                                  "Whether to store cookies", },                                     
-    SETTING_GLOBAL,      CHAR, { .p = "session"             }, (S_Func) dwb_set_cookies,  },
+    SETTING_GLOBAL | SETTING_ONINIT,      CHAR, { .p = "session"             }, (S_Func) dwb_set_cookies,  },
   { { "cookies-accept-policy",                     "Cookies to accept, always never or nothirdparty", },                                     
     SETTING_GLOBAL,      CHAR, { .p = "always"          }, (S_Func) dwb_set_cookie_accept_policy,  },
   { { "background-tabs",			                     "Whether to open tabs in background", },                                 
-    SETTING_GLOBAL,      BOOLEAN,    { .b = false         }, (S_Func) dwb_set_background_tab,  },
+    SETTING_GLOBAL | SETTING_ONINIT,      BOOLEAN,    { .b = false         }, (S_Func) dwb_set_background_tab,  },
   { { "scroll-step",			                     "Whether to open tabs in background", },                                 
-    SETTING_GLOBAL,      DOUBLE,    { .d = 0         }, (S_Func) dwb_init_vars,  },
+    SETTING_GLOBAL | SETTING_ONINIT,      DOUBLE,    { .d = 0         }, (S_Func) dwb_set_scroll_step,  },
 
   { { "foreground-color",                         "Foreground color of the active tab", },                              
     SETTING_GLOBAL,  COLOR_CHAR, { .p = "#ffffff"         },    (S_Func) dwb_reload_layout,   },
@@ -971,9 +971,9 @@ static WebSettings DWB_SETTINGS[] = {
   { { "hint-opacity",                            "The opacity of hints", },                                     
     SETTING_PER_VIEW,  DOUBLE, { .d = 0.8         },          (S_Func) dwb_reload_scripts,  },
   { { "auto-completion",                         "Show possible shortcuts", },                                
-    SETTING_GLOBAL,  BOOLEAN, { .b = false         },     (S_Func)completion_set_autcompletion,  },
+    SETTING_GLOBAL | SETTING_ONINIT,  BOOLEAN, { .b = false         },     (S_Func)completion_set_autcompletion,  },
   { { "startpage",                               "The default homepage", },                                        
-    SETTING_GLOBAL,  CHAR,    { .p = "dwb:bookmarks" },        (S_Func)dwb_set_startpage,  }, 
+    SETTING_GLOBAL | SETTING_ONINIT,  CHAR,    { .p = "dwb:bookmarks" },        (S_Func)dwb_set_startpage,  }, 
   { { "single-instance",                         "Whether to have only on instance", },                                         
     SETTING_GLOBAL,  BOOLEAN,    { .b = true },          NULL,  }, 
   { { "save-session",                            "Whether to automatically save sessions", },                                       
@@ -997,24 +997,22 @@ static WebSettings DWB_SETTINGS[] = {
     SETTING_GLOBAL,  BOOLEAN, { .b = false         },    NULL,  },
 
   { { "complete-history",                        "Whether to complete browsing history with tab", },                              
-    SETTING_GLOBAL,  BOOLEAN, { .b = true         },     (S_Func)dwb_init_vars,  },
+    SETTING_GLOBAL,  BOOLEAN, { .b = true         },     NULL,  },
   { { "complete-bookmarks",                        "Whether to complete bookmarks with tab", },                                     
-    SETTING_GLOBAL,  BOOLEAN, { .b = true         },     (S_Func)dwb_init_vars,  },
+    SETTING_GLOBAL,  BOOLEAN, { .b = true         },     NULL,  },
   { { "complete-searchengines",                   "Whether to complete searchengines with tab", },                                     
-    SETTING_GLOBAL,  BOOLEAN, { .b = false         },     (S_Func)dwb_init_vars,  },
-  { { "complete-commands",                        "Whether to complete the command history", },                                     
-    SETTING_GLOBAL,  BOOLEAN, { .b = true         },     (S_Func)dwb_init_vars,  },
+    SETTING_GLOBAL,  BOOLEAN, { .b = false         },     NULL,  },
   { { "complete-userscripts",                        "Whether to complete userscripts", },                                     
-    SETTING_GLOBAL,  BOOLEAN, { .b = false         },     (S_Func)dwb_init_vars,  },
+    SETTING_GLOBAL,  BOOLEAN, { .b = false         },     NULL,  },
 
   { { "default-width",                           "Default width of the window", },                                           
     SETTING_GLOBAL,  INTEGER, { .i = 800          }, NULL,  },
   { { "default-height",                          "Default height of the window", },                                           
     SETTING_GLOBAL,  INTEGER, { .i = 600          }, NULL,  },
   { { "message-delay",                           "Time in seconds, messages are shown", },                                           
-    SETTING_GLOBAL,  INTEGER, { .i = 2          }, (S_Func) dwb_set_message_delay,  },
+    SETTING_GLOBAL | SETTING_ONINIT,  INTEGER, { .i = 2          }, (S_Func) dwb_set_message_delay,  },
   { { "history-length",                          "Length of the browsing history", },                                          
-    SETTING_GLOBAL,  INTEGER, { .i = 500          }, (S_Func) dwb_set_history_length,  },
+    SETTING_GLOBAL | SETTING_ONINIT,  INTEGER, { .i = 500          }, (S_Func) dwb_set_history_length,  },
   { { "navigation-history-max",                          "Length of the navigation history", },                                          
     SETTING_GLOBAL,  INTEGER, { .i = 500          }, (S_Func) NULL,  },
   { { "scrollbars",                                  "Whether scrollbars should be enabled", },     
@@ -1034,9 +1032,9 @@ static WebSettings DWB_SETTINGS[] = {
   { { "plugin-blocker",                         "Whether to block flash plugins and replace them with a clickable element", },                   
     SETTING_PER_VIEW,  BOOLEAN, { .b = true }, (S_Func)dwb_set_plugin_blocker,   }, 
   { { "auto-insert-mode",                         "Whether go automatically in insert mode if input or textarea has focus", },                   
-    SETTING_GLOBAL,  BOOLEAN, { .b = false }, (S_Func)dwb_set_auto_insert_mode,   }, 
+    SETTING_GLOBAL | SETTING_ONINIT,  BOOLEAN, { .b = false }, (S_Func)dwb_set_auto_insert_mode,   }, 
   { { "tabbar-visible",                         "Number of seconds the tabbar is shown when switching tabs", },                   
-    SETTING_GLOBAL,  INTEGER, { .i = 2 }, (S_Func)dwb_set_tabbar_delay,   }, 
+    SETTING_GLOBAL | SETTING_ONINIT,  INTEGER, { .i = 2 }, (S_Func)dwb_set_tabbar_delay,   }, 
   { { "new-tab-position-policy",                         "Number of seconds the tabbar is shown when switching tabs", },                   
     SETTING_GLOBAL | SETTING_ONINIT,  CHAR, { .p = "right" }, (S_Func)dwb_set_new_tab_position_policy,   }, 
 };/*}}}*/