← Back to branch summary

~ubuntu-branches/ubuntu/wily/pianobar/wily-proposed

« back to all changes in this revision

Viewing changes to src/settings.c

  • Committer: Package Import Robot
  • Author(s): Luke Faraone
  • Date: 2011-11-16 14:26:36 UTC
  • mfrom: (1.3.6)
  • Revision ID: package-import@ubuntu.com-20111116142636-x2v716fs6wrybq46
Tags: 2011.11.11-1
http://bugs.debian.org/648209
https://launchpad.net/bugs/887886
* New upstream version 
  - SSL support and XMLRPC api version compatibility (v33) 
    (closes: #648209, LP: #887886)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/settings.c
93
93
        free (settings->npStationFormat);
94
94
        free (settings->listSongFormat);
95
95
        free (settings->fifo);
 
96
        free (settings->tlsCaPath);
96
97
        for (size_t i = 0; i < MSG_COUNT; i++) {
97
98
                free (settings->msgFormat[i].prefix);
98
99
                free (settings->msgFormat[i].postfix);
131
132
        settings->listSongFormat = strdup ("%i) %a - %t%r");
132
133
        settings->fifo = malloc (PATH_MAX * sizeof (*settings->fifo));
133
134
        BarGetXdgConfigDir (PACKAGE "/ctl", settings->fifo, PATH_MAX);
 
135
        settings->tlsCaPath = strdup ("/etc/ssl/certs/ca-certificates.crt");
134
136
 
135
137
        settings->msgFormat[MSG_NONE].prefix = NULL;
136
138
        settings->msgFormat[MSG_NONE].postfix = NULL;
239
241
                } else if (streq ("fifo", key)) {
240
242
                        free (settings->fifo);
241
243
                        settings->fifo = strdup (val);
 
244
                } else if (streq ("tls_ca_path", key)) {
 
245
                        free (settings->tlsCaPath);
 
246
                        settings->tlsCaPath = strdup (val);
242
247
                } else if (strncmp (formatMsgPrefix, key,
243
248
                                strlen (formatMsgPrefix)) == 0) {
244
249
                        static const char *mapping[] = {"none", "info", "nowplaying",