Mercurial > ~mikael > mcabber > hg
annotate mcabber/mcabber/settings.c @ 2223:965e0282c128
Backed out changeset fa516ef22145
Turns out that in this hash the value pointer is the same as the
key pointer, so there's no need to free both the key and the value.
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Fri, 06 Nov 2015 22:31:40 +0100 |
| parents | ccd4ffa41a1b |
| children | 5a107c907e71 |
| 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; |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
98 char *home_dir; |
|
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 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
153 // Last guess: home directory itself... |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
154 if (!config_dir) { |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
155 g_string_printf(sfilename, "%s/.mcabberrc", home_dir); |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
156 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
|
157 fclose(fp); |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
158 config_dir = g_strdup(home_dir); |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
159 } else { |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
160 scr_log_print(LPRINT_NORMAL, "Cannot find/open any configuration file!\n"); |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
161 } |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
162 } |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
163 |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
164 g_string_free(sfilename, TRUE); |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
165 return config_dir; |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
166 } |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
167 |
| 1192 | 168 // cfg_read_file(filename, mainfile) |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
169 // Read and parse config file "filename". If filename is NULL, |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
170 // try to open the configuration file at the default locations. |
| 1192 | 171 // mainfile must be set to TRUE for the startup config file. |
| 172 // If mainfile is TRUE, the permissions of the configuration file will | |
| 173 // be fixed if they're insecure. | |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
174 // |
| 1192 | 175 int cfg_read_file(char *filename, guint mainfile) |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
176 { |
| 1358 | 177 static unsigned int runtime; |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
178 FILE *fp; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
179 char *buf; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
180 char *line, *eol; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
181 unsigned int ln = 0; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
182 int err = 0; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
183 |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
184 if (!filename) { |
|
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
185 const gchar *mcabber_conf_dir; |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
186 gchar *def_filename; |
| 1192 | 187 |
| 188 if (!mainfile) { | |
| 189 scr_LogPrint(LPRINT_LOGNORM, "No file name provided"); | |
| 190 return -1; | |
| 191 } | |
| 192 | |
|
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
193 mcabber_conf_dir = settings_get_mcabber_config_dir(); |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
194 if (!mcabber_conf_dir) |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
195 return -1; |
|
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 def_filename = g_strdup_printf("%s/mcabberrc", mcabber_conf_dir); |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
198 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
|
199 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
|
200 g_free(def_filename); |
| 1358 | 201 err = -1; |
| 202 goto cfg_read_file_return; | |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
203 } |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
341
diff
changeset
|
204 // Check configuration file permissions |
| 1358 | 205 // 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
|
206 checkset_perm(def_filename, TRUE); |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
207 scr_log_print(LPRINT_LOGNORM, "Reading %s", def_filename); |
| 1358 | 208 // Check mcabber dir. Here we just warn, we don't change the modes. |
|
2204
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
209 checkset_perm(mcabber_conf_dir, FALSE); |
|
ccd4ffa41a1b
Use XDG configuration directory if a config file exists
Mikael Berthe <mikael@lilotux.net>
parents:
2164
diff
changeset
|
210 g_free(def_filename); |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
341
diff
changeset
|
211 } else { |
| 1383 | 212 // filename was specified |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
341
diff
changeset
|
213 if ((fp = fopen(filename, "r")) == NULL) { |
| 1192 | 214 const char *msg = "Cannot open configuration file"; |
| 215 if (mainfile) | |
| 216 perror(msg); | |
| 217 else | |
| 218 scr_LogPrint(LPRINT_LOGNORM, "%s (%s).", msg, filename); | |
| 1358 | 219 err = -2; |
| 220 goto cfg_read_file_return; | |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
341
diff
changeset
|
221 } |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
341
diff
changeset
|
222 // Check configuration file permissions (see above) |
| 1192 | 223 // 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
|
224 if (mainfile) |
|
9f5c5f176953
Do not check file permissions when using /source
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
225 checkset_perm(filename, TRUE); |
| 1192 | 226 scr_LogPrint(LPRINT_LOGNORM, "Reading %s", filename); |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
227 } |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
228 |
|
1278
c3107650d165
Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents:
1272
diff
changeset
|
229 buf = g_new(char, CONFLINE_LENGTH+1); |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
230 |
|
1278
c3107650d165
Allow longer lines in config file
Mikael Berthe <mikael@lilotux.net>
parents:
1272
diff
changeset
|
231 while (fgets(buf+1, CONFLINE_LENGTH, fp) != NULL) { |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
232 // 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
|
233 line = buf+1; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
234 ln++; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
235 |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
236 // Strip leading spaces |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
237 while (isspace(*line)) |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
238 line++; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
239 |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
240 // Make eol point to the last char of the line |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
241 for (eol = line ; *eol ; eol++) |
|
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 if (eol > line) |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
244 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 // Strip trailing spaces |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
247 while (eol > line && isspace(*eol)) |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
248 *eol-- = 0; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
249 |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
250 // Ignore empty lines and comments |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
251 if ((*line == '\n') || (*line == '\0') || (*line == '#')) |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
252 continue; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
253 |
|
1988
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
254 // 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
|
255 if (!runtime) { |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
256 const gchar *cmdend = strchr(line, ' '); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
257 gchar *cmdname = NULL; |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
258 gboolean safe; |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
259 if (cmdend) |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
260 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
|
261 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
|
262 g_free(cmdname); |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
263 if (!safe) { |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
264 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
|
265 "this command can't be used here", ln); |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
266 err++; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
267 continue; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
268 } |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
269 } |
|
1988
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
270 |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
271 // 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
|
272 // and process the command |
|
dd65a18dc480
Add cmd_set_safe() / cmd_is_safe() (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
273 *(--line) = COMMAND_CHAR; |
| 2164 | 274 process_command(line, TRUE); |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
275 } |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
276 g_free(buf); |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
277 fclose(fp); |
| 1192 | 278 |
| 279 if (filename) | |
| 280 scr_LogPrint(LPRINT_LOGNORM, "Loaded %s.", filename); | |
| 1358 | 281 |
| 282 cfg_read_file_return: | |
| 283 // If we're done with the main file parsing, we can assume that | |
| 284 // the next time this function is called will be at run time. | |
| 285 if (mainfile) | |
| 286 runtime = TRUE; | |
|
341
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
287 return err; |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
288 } |
|
dea407d53fe6
Improve configuration file reading
Mikael Berthe <mikael@lilotux.net>
parents:
337
diff
changeset
|
289 |
|
280
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
290 // parse_assigment(assignment, pkey, pval) |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
291 // Read assignment and split it to key, value |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
292 // |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
293 // 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
|
294 // 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
|
295 // |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
296 // 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
|
297 // to NULL and return FALSE. |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
298 // |
|
774
46304b773a44
Remove useless checks before g_free() calls
Mikael Berthe <mikael@lilotux.net>
parents:
764
diff
changeset
|
299 // 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
|
300 guint parse_assigment(gchar *assignment, gchar **pkey, gchar **pval) |
|
280
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
301 { |
|
293
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
302 char *key, *val, *t, *p; |
|
280
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
303 |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
304 *pkey = *pval = NULL; |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
305 |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
306 key = assignment; |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
307 // Remove leading spaces in option name |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
308 while ((!isalnum(*key)) && (*key != '=') && *key) { |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
309 key++; |
|
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 if (!*key) return FALSE; // Empty assignment |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
312 |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
313 if (*key == '=') { |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
314 return FALSE; |
|
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 // Ok, key points to the option name |
|
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 for (val = key+1 ; *val && (*val != '=') ; val++) |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
319 if (!isalnum(*val) && !isblank(*val) && (*val != '_') && (*val != '-')) { |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
320 // Key should only have alnum chars... |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
321 return FALSE; |
|
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 // Remove trailing spaces in option name: |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
324 for (t = val-1 ; t > key && isblank(*t) ; t--) |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
325 ; |
|
293
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
326 // Check for embedded whitespace characters |
|
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
327 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
|
328 if (isblank(*p)) { |
|
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1673
diff
changeset
|
329 // 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
|
330 return FALSE; |
|
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
331 } |
|
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
332 } |
|
d0295e735768
Assignment lvalue (key, option name, alias...) cannnot contain spaces
Mikael Berthe <mikael@lilotux.net>
parents:
288
diff
changeset
|
333 |
|
280
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
334 *pkey = g_strndup(key, t+1-key); |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
335 |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
336 if (!*val) return FALSE; // Not an assignment |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
337 |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
338 // Remove leading and trailing spaces in option value: |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
339 for (val++; *val && isblank(*val) ; val++) ; |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
340 for (t = val ; *t ; t++) ; |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
341 for (t-- ; t >= val && isblank(*t) ; t--) ; |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
342 |
|
282
87d6ac21cd1b
Fix "Cannot unset option" bug
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
343 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
|
344 |
|
337
3a25be278864
Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
345 // 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
|
346 // removed and whitespace is not stripped |
|
3a25be278864
Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
347 if ((t>val) && (*val == '"' && *t == '"')) { |
|
3a25be278864
Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
348 val++; |
|
3a25be278864
Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
349 t--; |
|
3a25be278864
Values can be enclosed by quotes in assignments
Mikael Berthe <mikael@lilotux.net>
parents:
336
diff
changeset
|
350 } |
|
280
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
351 *pval = g_strndup(val, t+1-val); |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
352 return TRUE; |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
353 } |
|
68ce34b4243b
Add parse_assigment() function
Mikael Berthe <mikael@lilotux.net>
parents:
279
diff
changeset
|
354 |
|
1768
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
355 gboolean settings_set_guard(const gchar *key, settings_guard_t guard) |
| 1673 | 356 { |
| 357 if (!guard) | |
| 358 g_hash_table_remove(guards, key); | |
|
1768
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
359 else { |
|
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
360 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
|
361 if (iguard) |
|
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
362 return FALSE; |
|
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
363 iguard = g_new(installed_guard_t, 1); |
|
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
364 iguard->guard = guard; |
|
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
365 g_hash_table_insert(guards, g_strdup(key), iguard); |
|
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
366 } |
|
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
367 return TRUE; |
| 1673 | 368 } |
| 369 | |
| 370 void settings_del_guard(const gchar *key) | |
| 371 { | |
| 372 settings_set_guard(key, NULL); | |
| 373 } | |
| 374 | |
| 375 void settings_opt_set_raw(const gchar *key, const gchar *value) | |
| 376 { | |
| 377 if (!value) | |
| 378 g_hash_table_remove(option, key); | |
| 379 else | |
| 380 g_hash_table_insert(option, g_strdup(key), g_strdup(value)); | |
| 381 } | |
| 382 | |
|
281
f562b9af2de7
Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents:
280
diff
changeset
|
383 void settings_set(guint type, const gchar *key, const gchar *value) |
| 279 | 384 { |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
385 GHashTable *hash; |
| 1673 | 386 gchar *dup_value = NULL; |
|
1794
58d1390f28ca
Fix ignore of NULL guard retval (introduced in d80a9e32ab1a)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1768
diff
changeset
|
387 installed_guard_t *guard = NULL; |
| 1673 | 388 |
| 389 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
|
390 guard = g_hash_table_lookup(guards, key); |
| 1673 | 391 if (guard) |
|
1768
d80a9e32ab1a
Refuse to replace existing guards
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1736
diff
changeset
|
392 dup_value = guard->guard(key, value); |
| 1673 | 393 } |
| 279 | 394 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
395 hash = get_hash(type); |
|
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
396 if (!hash) |
|
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
397 return; |
|
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
398 |
| 1673 | 399 if (!value && !dup_value) |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
400 g_hash_table_remove(hash, key); |
| 1673 | 401 else if (!guard) |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
402 g_hash_table_insert(hash, g_strdup(key), g_strdup(value)); |
| 1673 | 403 else if (dup_value) |
| 404 g_hash_table_insert(hash, g_strdup(key), dup_value); | |
| 405 else | |
| 406 g_hash_table_remove(option, key); | |
| 279 | 407 } |
| 408 | |
|
281
f562b9af2de7
Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents:
280
diff
changeset
|
409 void settings_del(guint type, const gchar *key) |
| 279 | 410 { |
| 411 settings_set(type, key, NULL); | |
| 412 } | |
| 413 | |
|
281
f562b9af2de7
Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents:
280
diff
changeset
|
414 const gchar *settings_get(guint type, const gchar *key) |
| 279 | 415 { |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
416 GHashTable *hash; |
| 279 | 417 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
418 hash = get_hash(type); |
|
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
419 if (!hash) |
|
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
420 return NULL; |
| 279 | 421 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
422 return g_hash_table_lookup(hash, key); |
| 279 | 423 } |
| 424 | |
|
281
f562b9af2de7
Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents:
280
diff
changeset
|
425 int settings_get_int(guint type, const gchar *key) |
| 279 | 426 { |
|
281
f562b9af2de7
Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents:
280
diff
changeset
|
427 const gchar *setval = settings_get(type, key); |
| 279 | 428 |
| 429 if (setval) return atoi(setval); | |
| 430 return 0; | |
| 431 } | |
| 432 | |
|
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
433 // settings_get_status_msg(status) |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
434 // 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
|
435 // - 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
|
436 // return this message |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
437 // - 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
|
438 // generic user message), it is returned |
| 521 | 439 // - 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
|
440 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
|
441 { |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
442 const gchar *rstatus = settings_opt_get("message"); |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
443 |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
444 if (rstatus) return rstatus; |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
445 |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
446 switch(status) { |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
447 case available: |
| 521 | 448 rstatus = settings_opt_get("message_avail"); |
|
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
449 break; |
|
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 case freeforchat: |
| 521 | 452 rstatus = settings_opt_get("message_free"); |
|
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
453 break; |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
454 |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
455 case dontdisturb: |
| 521 | 456 rstatus = settings_opt_get("message_dnd"); |
|
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
457 break; |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
458 |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
459 case notavail: |
| 521 | 460 rstatus = settings_opt_get("message_notavail"); |
|
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
461 break; |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
462 |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
463 case away: |
| 521 | 464 rstatus = settings_opt_get("message_away"); |
|
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
465 break; |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
466 |
| 521 | 467 default: // offline, invisible |
| 468 break; | |
|
294
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
469 } |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
470 return rstatus; |
|
871e53769084
Allow one status message per Jabber status
Mikael Berthe <mikael@lilotux.net>
parents:
293
diff
changeset
|
471 } |
| 576 | 472 |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
473 // settings_foreach(type, pfunction, param) |
|
1661
64a7428afcb3
Print list of options with '/set'
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1653
diff
changeset
|
474 // 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
|
475 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
|
476 void *param) |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
477 { |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
478 GHashTable *hash; |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
479 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
480 hash = get_hash(type); |
|
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
481 if (!hash) |
|
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
482 return; |
|
867
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
483 |
|
1070
9eaacc0ad3a2
Use a hash for settings
Mikael Berthe <mikael@lilotux.net>
parents:
1068
diff
changeset
|
484 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
|
485 } |
|
7f056c566569
Commands /alias & /bind list the key bindings and aliases
Mikael Berthe <mikael@lilotux.net>
parents:
780
diff
changeset
|
486 |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
487 |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
488 // default_muc_nickname() |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
489 // Return the user's default nickname |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
490 // 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
|
491 char *default_muc_nickname(const char *roomid) |
|
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 char *nick; |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
494 |
| 1598 | 495 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
|
496 if (nick) |
|
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1383
diff
changeset
|
497 return g_strdup(nick); |
|
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1383
diff
changeset
|
498 |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
499 // 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
|
500 nick = (char*)settings_opt_get("nickname"); |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
501 if (nick) |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
502 return g_strdup(nick); |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
503 |
|
1611
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1607
diff
changeset
|
504 nick = jid_get_username(settings_opt_get("jid")); |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
505 return nick; |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
506 } |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
967
diff
changeset
|
507 |
|
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
508 |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
509 /* PGP settings */ |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
510 |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
511 // settings_pgp_setdisabled(jid, value) |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
512 // Enable/disable PGP encryption for jid. |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
513 // (Set value to TRUE to disable encryption) |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
514 void settings_pgp_setdisabled(const char *bjid, guint value) |
|
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 #ifdef HAVE_GPGME |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
517 T_pgpopt *pgpdata; |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
518 pgpdata = g_hash_table_lookup(pgpopt, bjid); |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
519 if (!pgpdata) { |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
520 // 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
|
521 // the default value). |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
522 if (value) { |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
523 pgpdata = g_new0(T_pgpopt, 1); |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
524 pgpdata->pgp_disabled = value; |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
525 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
526 } |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
527 } else { |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
528 pgpdata->pgp_disabled = value; |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
529 // 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
|
530 // pgp_keyid is NULL, actually. |
|
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 #endif |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
533 } |
|
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 // settings_pgp_getdisabled(jid) |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
536 // Return TRUE if PGP encryption should be disabled for jid. |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
537 guint settings_pgp_getdisabled(const char *bjid) |
|
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 #ifdef HAVE_GPGME |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
540 T_pgpopt *pgpdata; |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
541 pgpdata = g_hash_table_lookup(pgpopt, bjid); |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
542 if (pgpdata) |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
543 return pgpdata->pgp_disabled; |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
544 else |
| 1197 | 545 return FALSE; // Default: not disabled |
|
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
546 #else |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
547 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
|
548 #endif |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
549 } |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
550 |
| 1197 | 551 // settings_pgp_setforce(jid, value) |
| 552 // Force (or not) PGP encryption for jid. | |
| 553 // When value is TRUE, PGP support will be assumed for the remote client. | |
| 554 void settings_pgp_setforce(const char *bjid, guint value) | |
| 555 { | |
| 556 #ifdef HAVE_GPGME | |
| 557 T_pgpopt *pgpdata; | |
| 558 pgpdata = g_hash_table_lookup(pgpopt, bjid); | |
| 559 if (!pgpdata) { | |
| 560 // If value is 0, we do not need to create a structure (that's | |
| 561 // the default value). | |
| 562 if (value) { | |
| 563 pgpdata = g_new0(T_pgpopt, 1); | |
| 564 pgpdata->pgp_force = value; | |
| 565 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); | |
| 566 } | |
| 567 } else { | |
| 568 pgpdata->pgp_force = value; | |
| 569 } | |
|
1565
bff9633e38ee
Fix segfault in command /pgp (reported by Maxim Vuets)
Mikael Berthe <mikael@lilotux.net>
parents:
1519
diff
changeset
|
570 if (value && pgpdata && !pgpdata->pgp_keyid) |
| 1197 | 571 scr_LogPrint(LPRINT_NORMAL, "Warning: the Key Id is not set!"); |
| 572 #endif | |
| 573 } | |
| 574 | |
| 575 // settings_pgp_getforce(jid) | |
| 576 // Return TRUE if PGP enforcement is set for jid. | |
| 577 guint settings_pgp_getforce(const char *bjid) | |
| 578 { | |
| 579 #ifdef HAVE_GPGME | |
| 580 T_pgpopt *pgpdata; | |
| 581 pgpdata = g_hash_table_lookup(pgpopt, bjid); | |
| 582 if (pgpdata) | |
| 583 return pgpdata->pgp_force; | |
| 584 else | |
| 585 return FALSE; // Default | |
| 586 #else | |
| 587 return FALSE; // No PGP support | |
| 588 #endif | |
| 589 } | |
| 590 | |
|
1065
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
591 // settings_pgp_setkeyid(jid, keyid) |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
592 // Set the PGP KeyId for user jid. |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
593 // Use keyid = NULL to erase the previous KeyId. |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
594 void settings_pgp_setkeyid(const char *bjid, const char *keyid) |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
595 { |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
596 #ifdef HAVE_GPGME |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
597 T_pgpopt *pgpdata; |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
598 pgpdata = g_hash_table_lookup(pgpopt, bjid); |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
599 if (!pgpdata) { |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
600 // 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
|
601 // the default value). |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
602 if (keyid) { |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
603 pgpdata = g_new0(T_pgpopt, 1); |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
604 pgpdata->pgp_keyid = g_strdup(keyid); |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
605 g_hash_table_insert(pgpopt, g_strdup(bjid), pgpdata); |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
606 } |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
607 } else { |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
608 g_free(pgpdata->pgp_keyid); |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
609 if (keyid) |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
610 pgpdata->pgp_keyid = g_strdup(keyid); |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
611 else |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
612 pgpdata->pgp_keyid = NULL; |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
613 // 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
|
614 // pgp_keyid is NULL, actually. |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
615 } |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
616 #endif |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
617 } |
|
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 // settings_pgp_getkeyid(jid) |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
620 // Get the PGP KeyId for user jid. |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
621 const char *settings_pgp_getkeyid(const char *bjid) |
|
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 #ifdef HAVE_GPGME |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
624 T_pgpopt *pgpdata; |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
625 pgpdata = g_hash_table_lookup(pgpopt, bjid); |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
626 if (pgpdata) |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
627 return pgpdata->pgp_keyid; |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
628 #endif |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
629 return NULL; |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
630 } |
|
230dca34dbea
Extand pgp_data structure
Mikael Berthe <mikael@lilotux.net>
parents:
1004
diff
changeset
|
631 |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
632 /* otr settings */ |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
633 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
634 #ifdef HAVE_LIBOTR |
| 1598 | 635 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
|
636 { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
637 if (*(enum otr_policy *)policy == *(enum otr_policy *)defaultp) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
638 g_free((enum otr_policy *) policy); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
639 g_hash_table_remove(otrpolicy, k); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
640 } |
|
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 #endif |
|
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 void settings_otr_setpolicy(const char *bjid, guint value) |
|
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 #ifdef HAVE_LIBOTR |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
647 enum otr_policy *otrdata; |
|
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 if (!bjid) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
650 default_policy = value; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
651 /* refresh hash */ |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
652 settings_foreach(SETTINGS_TYPE_OTR, &remove_default_policies, &value); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
653 return; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
654 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
655 |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
656 otrdata = g_hash_table_lookup(otrpolicy, bjid); |
|
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 if (value == default_policy) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
659 if (otrdata) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
660 g_free(otrdata); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
661 g_hash_table_remove(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 } else if (otrdata) { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
664 *otrdata = value; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
665 } else { |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
666 otrdata = g_new(enum otr_policy, 1); |
|
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 g_hash_table_insert(otrpolicy, g_strdup(bjid), otrdata); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
669 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
670 #endif |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
671 } |
|
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 guint settings_otr_getpolicy(const char *bjid) |
|
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 #ifdef HAVE_LIBOTR |
| 1598 | 676 enum otr_policy *otrdata; |
|
1299
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
677 if (!bjid) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
678 return default_policy; |
|
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 otrdata = g_hash_table_lookup(otrpolicy, bjid); |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
681 if (otrdata) |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
682 return *otrdata; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
683 else |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
684 return default_policy; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
685 #else |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
686 return 0; |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
687 #endif |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
688 } |
|
3b338a5c01fc
OTR support
Frank Zschockelt <mcabber_otr[at]freakysoft.de>
parents:
1278
diff
changeset
|
689 |
|
1141
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
690 guint get_max_history_blocks(void) |
|
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
691 { |
|
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
692 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
|
693 if (max_num_of_blocks < 0) |
|
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
694 max_num_of_blocks = 0; |
|
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
695 else if (max_num_of_blocks == 1) |
|
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
696 max_num_of_blocks = 2; |
|
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
697 return (guint)max_num_of_blocks; |
|
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
698 } |
|
5be2408a6534
Add option "max_history_blocks"
Mikael Berthe <mikael@lilotux.net>
parents:
1074
diff
changeset
|
699 |
| 1811 | 700 /* vim: set et cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */ |