about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorMichael Vetter <jubalh@iodoru.org>2020-06-29 19:13:56 +0200
committerMichael Vetter <jubalh@iodoru.org>2020-06-29 19:13:56 +0200
commit31ec640d051b58b13868340741957e4066274b21 (patch)
tree0eec4f4be56a429bc90cacfb1328899981ef9441 /src
parent2c94ee5a88f64332a3f41f41a4d314fc52200e31 (diff)
downloadprofani-tty-31ec640d051b58b13868340741957e4066274b21.tar.gz
Fix omemo otr case
Fix 3afd854dc862696c4842b2ed93efcad44d617910
Diffstat (limited to 'src')
-rw-r--r--src/command/cmd_funcs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 7d779e87..bd4dc95f 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -2187,12 +2187,13 @@ cmd_msg(ProfWin *window, const char *const command, gchar **args)
         }
         ui_focus_win((ProfWin*)chatwin);
 
+#ifdef HAVE_OMEMO
         gboolean is_otr_secure = FALSE;
+
 #ifdef HAVE_LIBOTR
         is_otr_secure = otr_is_secure(barejid);
 #endif // HAVE_LIBOTR
 
-#ifdef HAVE_OMEMO
         if (omemo_automatic_start(barejid) && is_otr_secure) {
             win_println(window, THEME_DEFAULT, "!", "Chat could be either OMEMO or OTR encrypted. Use '/omemo start %s' or '/otr start %s' to start a session.", usr, usr);
             return TRUE;
#n141'>141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183
garam <vc@akkartik.com>  2020-01-16 18:31:12 -0800

5897 - rename comparison instructions' href='/akkartik/mu/commit/082slurp.subx?h=hlt&id=6070c23e5e1c60d3bb169e43bddfa59b1d322427'>6070c23e ^
c2a74205 ^
33352536 ^
6070c23e ^
c2a74205 ^

33352536 ^

c2a74205 ^


33352536 ^



c2a74205 ^
33352536 ^

c2a74205 ^


33352536 ^
c2a74205 ^
33352536 ^


6070c23e ^
c2a74205 ^
71eb22a5 ^
33352536 ^

2a2a5b1e ^
33352536 ^
c2a74205 ^
33352536 ^
c2a74205 ^
33352536 ^
c2a74205 ^


33352536 ^
c2a74205 ^
33352536 ^
c2a74205 ^
33352536 ^




7a583220 ^
33352536 ^

c2a74205 ^









33352536 ^
c2a74205 ^
33352536 ^
7dac9ade ^
c2a74205 ^









33352536 ^
686a52bd ^
c2a74205 ^
686a52bd ^
c2a74205 ^


33352536 ^
c2a74205 ^





33352536 ^
c2a74205 ^






33352536 ^
c2a74205 ^
33352536 ^
c2a74205 ^





33352536 ^
c2a74205 ^







33352536 ^
c2a74205 ^



1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158