author | franky |
Sun, 12 May 2019 11:32:30 +0200 | |
changeset 2337 | ffd0e57e9563 |
parent 2268 | f5402d705f67 |
child 2339 | 7f11a567d236 |
permissions | -rw-r--r-- |
279 | 1 |
/* |
2 |
* settings.c -- Configuration stuff |
|
393 | 3 |
* |
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
4 |
* Copyright (C) 2005-2015 Mikael Berthe <mikael@lilotux.net> |
279 | 5 |
* |
6 |
* This program is free software; you can redistribute it and/or modify |
|
7 |
* it under the terms of the GNU General Public License as published by |
|
8 |
* the Free Software Foundation; either version 2 of the License, or (at |
|
9 |
* your option) any later version. |
|
10 |
* |
|
11 |
* This program is distributed in the hope that it will be useful, but |
|
12 |
* WITHOUT ANY WARRANTY; without even the implied warranty of |
|
13 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
14 |
* General Public License for more details. |
|
15 |
* |
|
16 |
* You should have received a copy of the GNU General Public License |
|
2268
f5402d705f67
Fix FSF addresses in all files
Mikael Berthe <mikael@lilotux.net>
parents:
2253
diff
changeset
|
17 |
* along with this program; if not, see <http://www.gnu.org/licenses/>. |
279 | 18 |
*/ |
19 |
||
1598 | 20 |
#include <stdio.h> |
279 | 21 |
#include <stdlib.h> |
1598 | 22 |
#include <string.h> |
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
23 |
#include <sys/stat.h> |
279 | 24 |
|
1607 | 25 |
#include "config.h" |
279 | 26 |
#include "settings.h" |
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
27 |
#include "commands.h" |
378
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
28 |
#include "logprint.h" |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
29 |
#include "otr.h" |
1598 | 30 |
#include "utils.h" |
31 |
#include "xmpp.h" |
|
1653
fca9a4c17432
Improve UI latency and CPU usage
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1611
diff
changeset
|
32 |
#include "main.h" |
279 | 33 |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
34 |
// Maximum line length |
1278
c3107650d165
Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents:
1272
diff
changeset
|
35 |
// (probably best to use the same value as INPUTLINE_LENGTH) |
c3107650d165
Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents:
1272
diff
changeset
|
36 |
#define CONFLINE_LENGTH 1024 |
c3107650d165
Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents:
1272
diff
changeset
|
37 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
38 |
static GHashTable *option; |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
39 |
static GHashTable *alias; |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
40 |
static GHashTable *binding; |
1673 | 41 |
static GHashTable *guards; |
279 | 42 |
|
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
43 |
#ifdef HAVE_GPGME /* PGP settings */ |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
44 |
static GHashTable *pgpopt; |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
45 |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
46 |
typedef struct { |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
47 |
gchar *pgp_keyid; /* KeyId the contact is supposed to use */ |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
48 |
guint pgp_disabled; /* If TRUE, PGP is disabled for outgoing messages */ |
1197 | 49 |
guint pgp_force; /* If TRUE, PGP is used w/o negotiation */ |
2337 | 50 |
} pgpopt_t; |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
51 |
#endif |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
52 |
|
1768
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
53 |
typedef struct { |
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
54 |
settings_guard_t guard; |
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
55 |
} installed_guard_t; |
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
56 |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
57 |
#ifdef HAVE_LIBOTR |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
58 |
static GHashTable *otrpolicy; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
59 |
static enum otr_policy default_policy; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
60 |
#endif |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
61 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
62 |
static inline GHashTable *get_hash(guint type) |
279 | 63 |
{ |
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
64 |
if (type == SETTINGS_TYPE_OPTION) return option; |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
65 |
else if (type == SETTINGS_TYPE_ALIAS) return alias; |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
66 |
else if (type == SETTINGS_TYPE_BINDING) return binding; |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
67 |
#ifdef HAVE_LIBOTR |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
68 |
else if (type == SETTINGS_TYPE_OTR) return otrpolicy; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
69 |
#endif |
279 | 70 |
return NULL; |
71 |
} |
|
72 |
||
73 |
/* -- */ |
|
74 |
||
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
75 |
void settings_init(void) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
76 |
{ |
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
77 |
option = g_hash_table_new_full(&g_str_hash, &g_str_equal, &g_free, &g_free); |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
78 |
alias = g_hash_table_new_full(&g_str_hash, &g_str_equal, &g_free, &g_free); |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
79 |
binding = g_hash_table_new_full(&g_str_hash, &g_str_equal, &g_free, &g_free); |
1768
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
80 |
guards = g_hash_table_new_full(&g_str_hash, &g_str_equal, &g_free, &g_free); |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
81 |
#ifdef HAVE_GPGME |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
82 |
pgpopt = g_hash_table_new(&g_str_hash, &g_str_equal); |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
83 |
#endif |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
84 |
#ifdef HAVE_LIBOTR |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
85 |
otrpolicy = g_hash_table_new(&g_str_hash, &g_str_equal); |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
86 |
#endif |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
87 |
} |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
88 |
|
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
89 |
// settings_get_mcabber_config_dir() |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
90 |
// Returns the mcabber configuration directory. |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
91 |
// The directory is looked up for only once (and the string is never freed, |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
92 |
// but we might change this later). |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
93 |
const gchar *settings_get_mcabber_config_dir(void) |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
94 |
{ |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
95 |
static char *config_dir; |
2253
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
96 |
const char *home_dir; |
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
97 |
GString *sfilename; |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
98 |
FILE *fp; |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
99 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
100 |
if (config_dir) |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
101 |
return config_dir; |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
102 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
103 |
home_dir = getenv("HOME"); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
104 |
if (!home_dir) { |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
105 |
scr_log_print(LPRINT_LOG, "Can't find home dir!"); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
106 |
fprintf(stderr, "Can't find home dir!\n"); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
107 |
return NULL; |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
108 |
} |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
109 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
110 |
sfilename = g_string_new(""); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
111 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
112 |
// First try: $HOME/.mcabber/mcabberrc |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
113 |
g_string_printf(sfilename, "%s/.mcabber/mcabberrc", home_dir); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
114 |
if ((fp = fopen(sfilename->str, "r")) != NULL) { |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
115 |
fclose(fp); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
116 |
config_dir = g_strdup_printf("%s/.mcabber", home_dir); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
117 |
} |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
118 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
119 |
// Second guess: Try to use the XDG standard configuration directory |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
120 |
if (!config_dir) { |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
121 |
char *xdg_config_dir = g_strdup(getenv("XDG_CONFIG_HOME")); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
122 |
if (!xdg_config_dir || !*xdg_config_dir) { |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
123 |
// Free the string if it is non-null but empty |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
124 |
if (xdg_config_dir) g_free(xdg_config_dir); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
125 |
xdg_config_dir = g_strdup_printf("%s/.config", home_dir); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
126 |
} |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
127 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
128 |
if (xdg_config_dir) { |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
129 |
int fd = -1; |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
130 |
struct stat statbuf; |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
131 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
132 |
if (*xdg_config_dir) |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
133 |
fd = stat(xdg_config_dir, &statbuf); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
134 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
135 |
// If the XDG configuration directory exists, see if we can find a |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
136 |
// configuration file for mcabber inside. |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
137 |
if (fd != -1) { |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
138 |
char *xdg_mcabber_dir = g_strdup_printf("%s/mcabber", xdg_config_dir); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
139 |
g_string_printf(sfilename, "%s/mcabberrc", xdg_mcabber_dir); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
140 |
if ((fp = fopen(sfilename->str, "r")) != NULL) { |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
141 |
fclose(fp); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
142 |
config_dir = xdg_mcabber_dir; |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
143 |
} else { |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
144 |
g_free(xdg_mcabber_dir); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
145 |
} |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
146 |
} |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
147 |
g_free(xdg_config_dir); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
148 |
} |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
149 |
} |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
150 |
|
2253
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
151 |
if (!config_dir) |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
152 |
scr_log_print(LPRINT_NORMAL, "Cannot find configuration directory!\n"); |
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
153 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
154 |
g_string_free(sfilename, TRUE); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
155 |
return config_dir; |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
156 |
} |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
157 |
|
1192 | 158 |
// cfg_read_file(filename, mainfile) |
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
159 |
// Read and parse config file "filename". If filename is NULL, |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
160 |
// try to open the configuration file at the default locations. |
1192 | 161 |
// mainfile must be set to TRUE for the startup config file. |
162 |
// If mainfile is TRUE, the permissions of the configuration file will |
|
163 |
// be fixed if they're insecure. |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
164 |
// |
1192 | 165 |
int cfg_read_file(char *filename, guint mainfile) |
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
166 |
{ |
1358 | 167 |
static unsigned int runtime; |
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
168 |
FILE *fp; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
169 |
char *buf; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
170 |
char *line, *eol; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
171 |
unsigned int ln = 0; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
172 |
int err = 0; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
173 |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
174 |
if (!filename) { |
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
175 |
const gchar *mcabber_conf_dir; |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
176 |
gchar *def_filename; |
1192 | 177 |
|
178 |
if (!mainfile) { |
|
179 |
scr_LogPrint(LPRINT_LOGNORM, "No file name provided"); |
|
180 |
return -1; |
|
181 |
} |
|
182 |
||
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
183 |
mcabber_conf_dir = settings_get_mcabber_config_dir(); |
2253
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
184 |
if (!mcabber_conf_dir) { |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
185 |
// Try home directory |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
186 |
const char *home_dir = getenv("HOME"); |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
187 |
if (!home_dir) { |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
188 |
scr_log_print(LPRINT_NORMAL, "Cannot find any configuration file!\n"); |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
189 |
err = -1; |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
190 |
goto cfg_read_file_return; |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
191 |
} |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
192 |
def_filename = g_strdup_printf("%s/.mcabberrc", home_dir); |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
193 |
} else { |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
194 |
def_filename = g_strdup_printf("%s/mcabberrc", mcabber_conf_dir); |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
195 |
} |
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
196 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
197 |
if ((fp = fopen(def_filename, "r")) == NULL) { |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
198 |
fprintf(stderr, "Cannot open config file!\n"); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
199 |
g_free(def_filename); |
1358 | 200 |
err = -1; |
201 |
goto cfg_read_file_return; |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
202 |
} |
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
341
diff
changeset
|
203 |
// Check configuration file permissions |
1358 | 204 |
// As it could contain sensitive data, we make it user-readable only. |
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
205 |
checkset_perm(def_filename, TRUE); |
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
206 |
scr_log_print(LPRINT_LOGNORM, "Reading %s", def_filename); |
2253
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
207 |
|
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
208 |
// Check mcabber directory permissions. |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
209 |
// Here we just warn, we don't change the mode. |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
210 |
if (mcabber_conf_dir) |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
211 |
checkset_perm(mcabber_conf_dir, FALSE); |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2204
diff
changeset
|
212 |
|
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
213 |
g_free(def_filename); |
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
341
diff
changeset
|
214 |
} else { |
1383 | 215 |
// filename was specified |
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
341
diff
changeset
|
216 |
if ((fp = fopen(filename, "r")) == NULL) { |
1192 | 217 |
const char *msg = "Cannot open configuration file"; |
218 |
if (mainfile) |
|
219 |
perror(msg); |
|
220 |
else |
|
221 |
scr_LogPrint(LPRINT_LOGNORM, "%s (%s).", msg, filename); |
|
1358 | 222 |
err = -2; |
223 |
goto cfg_read_file_return; |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
341
diff
changeset
|
224 |
} |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
341
diff
changeset
|
225 |
// Check configuration file permissions (see above) |
1192 | 226 |
// We don't change the permissions if that's not the main file. |
1214
9f5c5f176953
Do not check file permissions when using /source
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
227 |
if (mainfile) |
9f5c5f176953
Do not check file permissions when using /source
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
228 |
checkset_perm(filename, TRUE); |
1192 | 229 |
scr_LogPrint(LPRINT_LOGNORM, "Reading %s", filename); |
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
230 |
} |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
231 |
|
1278
c3107650d165
Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents:
1272
diff
changeset
|
232 |
buf = g_new(char, CONFLINE_LENGTH+1); |
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
233 |
|
1278
c3107650d165
Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents:
1272
diff
changeset
|
234 |
while (fgets(buf+1, CONFLINE_LENGTH, fp) != NULL) { |
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
235 |
// The first char is reserved to add a '/', to make a command line |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
236 |
line = buf+1; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
237 |
ln++; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
238 |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
239 |
// Strip leading spaces |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
240 |
while (isspace(*line)) |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
241 |
line++; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
242 |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
243 |
// Make eol point to the last char of the line |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
244 |
for (eol = line ; *eol ; eol++) |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
245 |
; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
246 |
if (eol > line) |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
247 |
eol--; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
248 |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
249 |
// Strip trailing spaces |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
250 |
while (eol > line && isspace(*eol)) |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
251 |
*eol-- = 0; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
252 |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
253 |
// Ignore empty lines and comments |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
254 |
if ((*line == '\n') || (*line == '\0') || (*line == '#')) |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
255 |
continue; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
256 |
|
1988
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
257 |
// If we aren't in runtime (i.e. startup) we'll only accept "safe" commands |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
258 |
if (!runtime) { |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
259 |
const gchar *cmdend = strchr(line, ' '); |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
260 |
gchar *cmdname = NULL; |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
261 |
gboolean safe; |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
262 |
if (cmdend) |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
263 |
cmdname = g_strndup(line, cmdend - line); |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
264 |
safe = cmd_is_safe(cmdname ? cmdname : line); |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
265 |
g_free(cmdname); |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
266 |
if (!safe) { |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
267 |
scr_log_print(LPRINT_LOGNORM, "Error in configuration file (l. %d): " |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
268 |
"this command can't be used here", ln); |
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
269 |
err++; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
270 |
continue; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
271 |
} |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
272 |
} |
1988
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
273 |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
274 |
// Set the leading COMMAND_CHAR to build a command line |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
275 |
// and process the command |
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
276 |
*(--line) = COMMAND_CHAR; |
2164 | 277 |
process_command(line, TRUE); |
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
278 |
} |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
279 |
g_free(buf); |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
280 |
fclose(fp); |
1192 | 281 |
|
282 |
if (filename) |
|
283 |
scr_LogPrint(LPRINT_LOGNORM, "Loaded %s.", filename); |
|
1358 | 284 |
|
285 |
cfg_read_file_return: |
|
286 |
// If we're done with the main file parsing, we can assume that |
|
287 |
// the next time this function is called will be at run time. |
|
288 |
if (mainfile) |
|
289 |
runtime = TRUE; |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
290 |
return err; |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
291 |
} |
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
292 |
|
280
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
293 |
// parse_assigment(assignment, pkey, pval) |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
294 |
// Read assignment and split it to key, value |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
295 |
// |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
296 |
// If this is an assignment, the function will return TRUE and |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
297 |
// set *pkey and *pval (*pval is set to NULL if value field is empty). |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
298 |
// |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
299 |
// If this isn't a assignment (no = char), the function will set *pval |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
300 |
// to NULL and return FALSE. |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
301 |
// |
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
764
diff
changeset
|
302 |
// The caller should g_free() *pkey and *pval (if not NULL) after use. |
1074
b2fc694a8228
Fix a few memory leaks after calls to parse_assigment()
Mikael Berthe <mikael@lilotux.net>
parents:
1070
diff
changeset
|
303 |
guint parse_assigment(gchar *assignment, gchar **pkey, gchar **pval) |
280
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
304 |
{ |
293
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
305 |
char *key, *val, *t, *p; |
280
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
306 |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
307 |
*pkey = *pval = NULL; |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
308 |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
309 |
key = assignment; |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
310 |
// Remove leading spaces in option name |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
311 |
while ((!isalnum(*key)) && (*key != '=') && *key) { |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
312 |
key++; |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
313 |
} |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
314 |
if (!*key) return FALSE; // Empty assignment |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
315 |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
316 |
if (*key == '=') { |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
317 |
return FALSE; |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
318 |
} |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
319 |
// Ok, key points to the option name |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
320 |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
321 |
for (val = key+1 ; *val && (*val != '=') ; val++) |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
322 |
if (!isalnum(*val) && !isblank(*val) && (*val != '_') && (*val != '-')) { |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
323 |
// Key should only have alnum chars... |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
324 |
return FALSE; |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
325 |
} |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
326 |
// Remove trailing spaces in option name: |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
327 |
for (t = val-1 ; t > key && isblank(*t) ; t--) |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
328 |
; |
293
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
329 |
// Check for embedded whitespace characters |
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
330 |
for (p = key; p < t; p++) { |
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
331 |
if (isblank(*p)) { |
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1673
diff
changeset
|
332 |
// Name should not contain space chars... |
293
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
333 |
return FALSE; |
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
334 |
} |
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
335 |
} |
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
336 |
|
280
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
337 |
*pkey = g_strndup(key, t+1-key); |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
338 |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
339 |
if (!*val) return FALSE; // Not an assignment |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
340 |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
341 |
// Remove leading and trailing spaces in option value: |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
342 |
for (val++; *val && isblank(*val) ; val++) ; |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
343 |
for (t = val ; *t ; t++) ; |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
344 |
for (t-- ; t >= val && isblank(*t) ; t--) ; |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
345 |
|
282
87d6ac21cd1b
Fix "Cannot unset option" bug
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
346 |
if (t < val) return TRUE; // no value (variable reset for example) |
280
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
347 |
|
337
3a25be278864
Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
348 |
// If the value begins and ends with quotes ("), these quotes are |
3a25be278864
Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
349 |
// removed and whitespace is not stripped |
3a25be278864
Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
350 |
if ((t>val) && (*val == '"' && *t == '"')) { |
3a25be278864
Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
351 |
val++; |
3a25be278864
Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
352 |
t--; |
3a25be278864
Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
353 |
} |
280
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
354 |
*pval = g_strndup(val, t+1-val); |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
355 |
return TRUE; |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
356 |
} |
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
357 |
|
1768
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
358 |
gboolean settings_set_guard(const gchar *key, settings_guard_t guard) |
1673 | 359 |
{ |
360 |
if (!guard) |
|
361 |
g_hash_table_remove(guards, key); |
|
1768
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
362 |
else { |
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
363 |
installed_guard_t *iguard = g_hash_table_lookup(guards, key); |
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
364 |
if (iguard) |
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
365 |
return FALSE; |
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
366 |
iguard = g_new(installed_guard_t, 1); |
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
367 |
iguard->guard = guard; |
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
368 |
g_hash_table_insert(guards, g_strdup(key), iguard); |
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
369 |
} |
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
370 |
return TRUE; |
1673 | 371 |
} |
372 |
||
373 |
void settings_del_guard(const gchar *key) |
|
374 |
{ |
|
375 |
settings_set_guard(key, NULL); |
|
376 |
} |
|
377 |
||
378 |
void settings_opt_set_raw(const gchar *key, const gchar *value) |
|
379 |
{ |
|
380 |
if (!value) |
|
381 |
g_hash_table_remove(option, key); |
|
382 |
else |
|
383 |
g_hash_table_insert(option, g_strdup(key), g_strdup(value)); |
|
384 |
} |
|
385 |
||
281
f562b9af2de7
Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents:
280
diff
changeset
|
386 |
void settings_set(guint type, const gchar *key, const gchar *value) |
279 | 387 |
{ |
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
388 |
GHashTable *hash; |
1673 | 389 |
gchar *dup_value = NULL; |
1794
58d1390f28ca
Fix ignore of NULL guard retval (introduced in d80a9e32ab1a)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1768
diff
changeset
|
390 |
installed_guard_t *guard = NULL; |
1673 | 391 |
|
392 |
if (type == SETTINGS_TYPE_OPTION) { |
|
1794
58d1390f28ca
Fix ignore of NULL guard retval (introduced in d80a9e32ab1a)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1768
diff
changeset
|
393 |
guard = g_hash_table_lookup(guards, key); |
1673 | 394 |
if (guard) |
1768
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
395 |
dup_value = guard->guard(key, value); |
1673 | 396 |
} |
279 | 397 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
398 |
hash = get_hash(type); |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
399 |
if (!hash) |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
400 |
return; |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
401 |
|
1673 | 402 |
if (!value && !dup_value) |
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
403 |
g_hash_table_remove(hash, key); |
1673 | 404 |
else if (!guard) |
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
405 |
g_hash_table_insert(hash, g_strdup(key), g_strdup(value)); |
1673 | 406 |
else if (dup_value) |
407 |
g_hash_table_insert(hash, g_strdup(key), dup_value); |
|
408 |
else |
|
409 |
g_hash_table_remove(option, key); |
|
279 | 410 |
} |
411 |
||
281
f562b9af2de7
Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents:
280
diff
changeset
|
412 |
void settings_del(guint type, const gchar *key) |
279 | 413 |
{ |
414 |
settings_set(type, key, NULL); |
|
415 |
} |
|
416 |
||
281
f562b9af2de7
Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents:
280
diff
changeset
|
417 |
const gchar *settings_get(guint type, const gchar *key) |
279 | 418 |
{ |
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
419 |
GHashTable *hash; |
279 | 420 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
421 |
hash = get_hash(type); |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
422 |
if (!hash) |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
423 |
return NULL; |
279 | 424 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
425 |
return g_hash_table_lookup(hash, key); |
279 | 426 |
} |
427 |
||
281
f562b9af2de7
Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents:
280
diff
changeset
|
428 |
int settings_get_int(guint type, const gchar *key) |
279 | 429 |
{ |
281
f562b9af2de7
Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents:
280
diff
changeset
|
430 |
const gchar *setval = settings_get(type, key); |
279 | 431 |
|
432 |
if (setval) return atoi(setval); |
|
433 |
return 0; |
|
434 |
} |
|
435 |
||
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
436 |
// settings_get_status_msg(status) |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
437 |
// Return a string with the current status message: |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
438 |
// - if there is a user-defined message ("message" option), |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
439 |
// return this message |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
440 |
// - if there is a user-defined message for the given status (and no |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
441 |
// generic user message), it is returned |
521 | 442 |
// - if no message is found, return NULL |
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
443 |
const gchar *settings_get_status_msg(enum imstatus status) |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
444 |
{ |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
445 |
const gchar *rstatus = settings_opt_get("message"); |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
446 |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
447 |
if (rstatus) return rstatus; |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
448 |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
449 |
switch(status) { |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
450 |
case available: |
521 | 451 |
rstatus = settings_opt_get("message_avail"); |
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
452 |
break; |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
453 |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
454 |
case freeforchat: |
521 | 455 |
rstatus = settings_opt_get("message_free"); |
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
456 |
break; |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
457 |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
458 |
case dontdisturb: |
521 | 459 |
rstatus = settings_opt_get("message_dnd"); |
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
460 |
break; |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
461 |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
462 |
case notavail: |
521 | 463 |
rstatus = settings_opt_get("message_notavail"); |
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
464 |
break; |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
465 |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
466 |
case away: |
521 | 467 |
rstatus = settings_opt_get("message_away"); |
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
468 |
break; |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
469 |
|
521 | 470 |
default: // offline, invisible |
471 |
break; |
|
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
472 |
} |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
473 |
return rstatus; |
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
474 |
} |
576 | 475 |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
476 |
// settings_foreach(type, pfunction, param) |
1661
64a7428afcb3
Print list of options with '/set'
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1653
diff
changeset
|
477 |
// Call pfunction(key, value, param) for each setting with requested type. |
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
478 |
void settings_foreach(guint type, void (*pfunc)(char *k, char *v, void *param), |
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
479 |
void *param) |
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
480 |
{ |
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
481 |
GHashTable *hash; |
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
482 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
483 |
hash = get_hash(type); |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
484 |
if (!hash) |
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
485 |
return; |
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
486 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
487 |
g_hash_table_foreach(hash, (GHFunc)pfunc, param); |
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
488 |
} |
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
489 |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
490 |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
491 |
// default_muc_nickname() |
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
492 |
// Return the user's default nickname |
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
493 |
// The caller should free the string after use |
1395
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1383
diff
changeset
|
494 |
char *default_muc_nickname(const char *roomid) |
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
495 |
{ |
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
496 |
char *nick; |
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
497 |
|
1598 | 498 |
nick = (char*)xmpp_get_bookmark_nick(roomid); |
1395
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1383
diff
changeset
|
499 |
if (nick) |
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1383
diff
changeset
|
500 |
return g_strdup(nick); |
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1383
diff
changeset
|
501 |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
502 |
// We try the "nickname" option, then the username part of the jid. |
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
503 |
nick = (char*)settings_opt_get("nickname"); |
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
504 |
if (nick) |
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
505 |
return g_strdup(nick); |
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
506 |
|
1611
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1607
diff
changeset
|
507 |
nick = jid_get_username(settings_opt_get("jid")); |
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
508 |
return nick; |
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
509 |
} |
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
510 |
|
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
511 |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
512 |
/* PGP settings */ |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
513 |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
514 |
// settings_pgp_setdisabled(jid, value) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
515 |
// Enable/disable PGP encryption for jid. |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
516 |
// (Set value to TRUE to disable encryption) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
517 |
void settings_pgp_setdisabled(const char *bjid, guint value) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
518 |
{ |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
519 |
#ifdef HAVE_GPGME |
2337 | 520 |
pgpopt_t *pgpdata; |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
521 |
pgpdata = g_hash_table_lookup(pgpopt, bjid); |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
522 |
if (!pgpdata) { |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
523 |
// If value is 0, we do not need to create a structure (that's |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
524 |
// the default value). |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
525 |
if (value) { |
2337 | 526 |
pgpdata = g_new0(pgpopt_t, 1); |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
527 |
pgpdata->pgp_disabled = value; |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
528 |
g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
529 |
} |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
530 |
} else { |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
531 |
pgpdata->pgp_disabled = value; |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
532 |
// We could remove the key/value if pgp_disabled is 0 and |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
533 |
// pgp_keyid is NULL, actually. |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
534 |
} |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
535 |
#endif |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
536 |
} |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
537 |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
538 |
// settings_pgp_getdisabled(jid) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
539 |
// Return TRUE if PGP encryption should be disabled for jid. |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
540 |
guint settings_pgp_getdisabled(const char *bjid) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
541 |
{ |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
542 |
#ifdef HAVE_GPGME |
2337 | 543 |
pgpopt_t *pgpdata; |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
544 |
pgpdata = g_hash_table_lookup(pgpopt, bjid); |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
545 |
if (pgpdata) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
546 |
return pgpdata->pgp_disabled; |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
547 |
else |
1197 | 548 |
return FALSE; // Default: not disabled |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
549 |
#else |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
550 |
return TRUE; // No PGP support, let's say it's disabled. |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
551 |
#endif |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
552 |
} |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
553 |
|
1197 | 554 |
// settings_pgp_setforce(jid, value) |
555 |
// Force (or not) PGP encryption for jid. |
|
556 |
// When value is TRUE, PGP support will be assumed for the remote client. |
|
557 |
void settings_pgp_setforce(const char *bjid, guint value) |
|
558 |
{ |
|
559 |
#ifdef HAVE_GPGME |
|
2337 | 560 |
pgpopt_t *pgpdata; |
1197 | 561 |
pgpdata = g_hash_table_lookup(pgpopt, bjid); |
562 |
if (!pgpdata) { |
|
563 |
// If value is 0, we do not need to create a structure (that's |
|
564 |
// the default value). |
|
565 |
if (value) { |
|
2337 | 566 |
pgpdata = g_new0(pgpopt_t, 1); |
1197 | 567 |
pgpdata->pgp_force = value; |
568 |
g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
|
569 |
} |
|
570 |
} else { |
|
571 |
pgpdata->pgp_force = value; |
|
572 |
} |
|
1565
bff9633e38ee
Fix segfault in command /pgp (reported by Maxim Vuets)
Mikael Berthe <mikael@lilotux.net>
parents:
1519
diff
changeset
|
573 |
if (value && pgpdata && !pgpdata->pgp_keyid) |
1197 | 574 |
scr_LogPrint(LPRINT_NORMAL, "Warning: the Key Id is not set!"); |
575 |
#endif |
|
576 |
} |
|
577 |
||
578 |
// settings_pgp_getforce(jid) |
|
579 |
// Return TRUE if PGP enforcement is set for jid. |
|
580 |
guint settings_pgp_getforce(const char *bjid) |
|
581 |
{ |
|
582 |
#ifdef HAVE_GPGME |
|
2337 | 583 |
pgpopt_t *pgpdata; |
1197 | 584 |
pgpdata = g_hash_table_lookup(pgpopt, bjid); |
585 |
if (pgpdata) |
|
586 |
return pgpdata->pgp_force; |
|
587 |
else |
|
588 |
return FALSE; // Default |
|
589 |
#else |
|
590 |
return FALSE; // No PGP support |
|
591 |
#endif |
|
592 |
} |
|
593 |
||
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
594 |
// settings_pgp_setkeyid(jid, keyid) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
595 |
// Set the PGP KeyId for user jid. |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
596 |
// Use keyid = NULL to erase the previous KeyId. |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
597 |
void settings_pgp_setkeyid(const char *bjid, const char *keyid) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
598 |
{ |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
599 |
#ifdef HAVE_GPGME |
2337 | 600 |
pgpopt_t *pgpdata; |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
601 |
pgpdata = g_hash_table_lookup(pgpopt, bjid); |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
602 |
if (!pgpdata) { |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
603 |
// If keyid is NULL, we do not need to create a structure (that's |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
604 |
// the default value). |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
605 |
if (keyid) { |
2337 | 606 |
pgpdata = g_new0(pgpopt_t, 1); |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
607 |
pgpdata->pgp_keyid = g_strdup(keyid); |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
608 |
g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
609 |
} |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
610 |
} else { |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
611 |
g_free(pgpdata->pgp_keyid); |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
612 |
if (keyid) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
613 |
pgpdata->pgp_keyid = g_strdup(keyid); |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
614 |
else |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
615 |
pgpdata->pgp_keyid = NULL; |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
616 |
// We could remove the key/value if pgp_disabled is 0 and |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
617 |
// pgp_keyid is NULL, actually. |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
618 |
} |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
619 |
#endif |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
620 |
} |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
621 |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
622 |
// settings_pgp_getkeyid(jid) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
623 |
// Get the PGP KeyId for user jid. |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
624 |
const char *settings_pgp_getkeyid(const char *bjid) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
625 |
{ |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
626 |
#ifdef HAVE_GPGME |
2337 | 627 |
pgpopt_t *pgpdata; |
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
628 |
pgpdata = g_hash_table_lookup(pgpopt, bjid); |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
629 |
if (pgpdata) |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
630 |
return pgpdata->pgp_keyid; |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
631 |
#endif |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
632 |
return NULL; |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
633 |
} |
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
634 |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
635 |
/* otr settings */ |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
636 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
637 |
#ifdef HAVE_LIBOTR |
1598 | 638 |
static void remove_default_policies(char *k, char *policy, void *defaultp) |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
639 |
{ |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
640 |
if (*(enum otr_policy *)policy == *(enum otr_policy *)defaultp) { |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
641 |
g_free((enum otr_policy *) policy); |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
642 |
g_hash_table_remove(otrpolicy, k); |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
643 |
} |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
644 |
} |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
645 |
#endif |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
646 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
647 |
void settings_otr_setpolicy(const char *bjid, guint value) |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
648 |
{ |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
649 |
#ifdef HAVE_LIBOTR |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
650 |
enum otr_policy *otrdata; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
651 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
652 |
if (!bjid) { |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
653 |
default_policy = value; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
654 |
/* refresh hash */ |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
655 |
settings_foreach(SETTINGS_TYPE_OTR, &remove_default_policies, &value); |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
656 |
return; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
657 |
} |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
658 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
659 |
otrdata = g_hash_table_lookup(otrpolicy, bjid); |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
660 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
661 |
if (value == default_policy) { |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
662 |
if (otrdata) { |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
663 |
g_free(otrdata); |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
664 |
g_hash_table_remove(otrpolicy, bjid); |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
665 |
} |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
666 |
} else if (otrdata) { |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
667 |
*otrdata = value; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
668 |
} else { |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
669 |
otrdata = g_new(enum otr_policy, 1); |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
670 |
*otrdata = value; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
671 |
g_hash_table_insert(otrpolicy, g_strdup(bjid), otrdata); |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
672 |
} |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
673 |
#endif |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
674 |
} |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
675 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
676 |
guint settings_otr_getpolicy(const char *bjid) |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
677 |
{ |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
678 |
#ifdef HAVE_LIBOTR |
1598 | 679 |
enum otr_policy *otrdata; |
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
680 |
if (!bjid) |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
681 |
return default_policy; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
682 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
683 |
otrdata = g_hash_table_lookup(otrpolicy, bjid); |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
684 |
if (otrdata) |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
685 |
return *otrdata; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
686 |
else |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
687 |
return default_policy; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
688 |
#else |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
689 |
return 0; |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
690 |
#endif |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
691 |
} |
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
692 |
|
1141
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
693 |
guint get_max_history_blocks(void) |
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
694 |
{ |
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
695 |
int max_num_of_blocks = settings_opt_get_int("max_history_blocks"); |
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
696 |
if (max_num_of_blocks < 0) |
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
697 |
max_num_of_blocks = 0; |
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
698 |
else if (max_num_of_blocks == 1) |
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
699 |
max_num_of_blocks = 2; |
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
700 |
return (guint)max_num_of_blocks; |
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
701 |
} |
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
702 |
|
1811 | 703 |
/* vim: set et cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */ |