diff options
author | DuClare <akarinotengoku@gmail.com> | 2009-05-15 16:33:15 +0300 |
---|---|---|
committer | DuClare <akarinotengoku@gmail.com> | 2009-05-15 16:33:15 +0300 |
commit | 5703e7d3d290047cd855e80f700d29d10fa1a0a1 (patch) | |
tree | 78c4e0c8934855343b6ab5d676d5e5de9bb0f9ce /uzbl.c | |
parent | d039532cedb274eca3135a9a5a91946d87f1da9a (diff) |
Remove deprecated code.
Diffstat (limited to 'uzbl.c')
-rw-r--r-- | uzbl.c | 48 |
1 files changed, 0 insertions, 48 deletions
@@ -147,11 +147,6 @@ itos(int val) { return g_strdup(tmp); } -static char * -str_replace (const char* search, const char* replace, const char* string) { - return g_strjoinv (replace, g_strsplit(string, search, -1)); -} - static sigfunc* setup_signal(int signr, sigfunc *shandler) { struct sigaction nh, oh; @@ -1420,7 +1415,6 @@ settings_init () { char *saveptr; State *s = &uzbl.state; Network *n = &uzbl.net; - Behaviour *b = &uzbl.behave; if (!s->config_file) { const char* XDG_CONFIG_HOME = getenv ("XDG_CONFIG_HOME"); @@ -1469,48 +1463,6 @@ settings_init () { printf ("No configuration.\n"); } - if (res) { - b->reset_command_mode = g_key_file_get_boolean (config, "behavior", "reset_command_mode", NULL); - } - - printf ("Reset mode: %s\n" , (b->reset_command_mode ? "TRUE" : "FALSE")); - - /* networking options */ - if (res) { - n->useragent = g_key_file_get_value (config, "network", "user-agent", NULL); - } - - if(n->useragent){ - char* newagent = malloc(1024); - - strcpy(newagent, str_replace("%webkit-major%", itos(WEBKIT_MAJOR_VERSION), n->useragent)); - strcpy(newagent, str_replace("%webkit-minor%", itos(WEBKIT_MINOR_VERSION), newagent)); - strcpy(newagent, str_replace("%webkit-micro%", itos(WEBKIT_MICRO_VERSION), newagent)); - - if (uname (&s->unameinfo) == -1) { - printf("Error getting uname info. Not replacing system-related user agent variables.\n"); - } else { - strcpy(newagent, str_replace("%sysname%", s->unameinfo.sysname, newagent)); - strcpy(newagent, str_replace("%nodename%", s->unameinfo.nodename, newagent)); - strcpy(newagent, str_replace("%kernrel%", s->unameinfo.release, newagent)); - strcpy(newagent, str_replace("%kernver%", s->unameinfo.version, newagent)); - strcpy(newagent, str_replace("%arch-system%", s->unameinfo.machine, newagent)); - - #ifdef _GNU_SOURCE - strcpy(newagent, str_replace("%domainname%", s->unameinfo.domainname, newagent)); - #endif - } - - strcpy(newagent, str_replace("%arch-uzbl%", ARCH, newagent)); - strcpy(newagent, str_replace("%commit%", COMMIT, newagent)); - - n->useragent = malloc(1024); - strcpy(n->useragent, newagent); - g_object_set(G_OBJECT(n->soup_session), SOUP_SESSION_USER_AGENT, n->useragent, NULL); - } - - printf("User-agent: %s\n", n->useragent? n->useragent : "default"); - g_signal_connect(n->soup_session, "request-queued", G_CALLBACK(handle_cookies), NULL); } |