Changeset 29ff5c2 for protocols/purple/purple.c

Timestamp:

2015-11-21T00:01:50Z (8 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feat/hip-cat

File:

• protocols/purple/purple.c (modified) (3 diffs)

protocols/purple/purple.c

@@ -113 +113 @@
            servers anyway! */
         if (!dir_fixed) {
+                PurpleCertificatePool *pool;
                 irc_t *irc = acc->bee->ui_data;
                 char *dir;
@@ -122 +123 @@
                 purple_blist_load();
                 purple_prefs_load();
+
+                if (proxytype == PROXY_SOCKS4A) {
+                        /* do this here after loading prefs. yes, i know, it sucks */
+                        purple_prefs_set_bool("/purple/proxy/socks4_remotedns", TRUE);
+                }
+
+                /* re-create the certificate cache directory */
+                pool = purple_certificate_find_pool("x509", "tls_peers");
+                dir = purple_certificate_pool_mkpath(pool, NULL);
+                purple_build_dir(dir, 0700);
+
                 dir_fixed = TRUE;
         }
@@ -1404 +1416 @@
                 PurpleProxyInfo *pi = purple_global_proxy_get_info();
                 switch (proxytype) {
+                case PROXY_SOCKS4A:
                 case PROXY_SOCKS4:
                         purple_proxy_info_set_type(pi, PURPLE_PROXY_SOCKS4);