auth: move cookie file to ~/.config/pulse/cookie

[pulseaudio] / src / utils / pax11publish.c

diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index 6600363b1613c27f7b0dc523e74e7dc2903b563a..0f9a030e08c0a6a61658876cb68cff8d27b04f2f 100644 (file)
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -25,17 +25,16 @@
 
 #include <stdio.h>
 #include <getopt.h>
-#include <string.h>
 #include <assert.h>
 #include <locale.h>
 
 #include <xcb/xcb.h>
 
 #include <pulse/util.h>
-#include <pulse/i18n.h>
 #include <pulse/client-conf.h>
 
 #include <pulsecore/core-util.h>
+#include <pulsecore/i18n.h>
 #include <pulsecore/log.h>
 #include <pulsecore/authkey.h>
 #include <pulsecore/native-common.h>
@@ -49,7 +48,9 @@ int main(int argc, char *argv[]) {
     enum { DUMP, EXPORT, IMPORT, REMOVE } mode = DUMP;
 
     setlocale(LC_ALL, "");
+#ifdef ENABLE_NLS
     bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR);
+#endif
 
     while ((c = getopt(argc, argv, "deiD:S:O:I:c:hr")) != -1) {
         switch (c) {
@@ -194,7 +195,7 @@ int main(int argc, char *argv[]) {
 
             pa_client_conf_free(conf);
 
-            if (pa_authkey_load_auto(cookie_file, cookie, sizeof(cookie)) < 0) {
+            if (pa_authkey_load_auto(cookie_file, cookie, TRUE, sizeof(cookie)) < 0) {
                 fprintf(stderr, _("Failed to load cookie data\n"));
                 goto finish;
             }