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