From 55158767cc49119fdf976e1616a610e7dd5a5117 Mon Sep 17 00:00:00 2001 From: James Booth Date: Wed, 26 Aug 2015 23:23:12 +0100 Subject: Renamed enc_message parameter for incoming messages --- src/event/server_events.c | 14 +++++++------- src/event/server_events.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/event/server_events.c b/src/event/server_events.c index e8d2bbcf..7fb2427c 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -193,9 +193,9 @@ sv_ev_incoming_carbon(char *barejid, char *resource, char *message) #ifdef HAVE_LIBGPGME static void -_sv_ev_incoming_pgp(ProfChatWin *chatwin, gboolean new_win, char *barejid, char *resource, char *message, char *enc_message) +_sv_ev_incoming_pgp(ProfChatWin *chatwin, gboolean new_win, char *barejid, char *resource, char *message, char *pgp_message) { - char *decrypted = p_gpg_decrypt(enc_message); + char *decrypted = p_gpg_decrypt(pgp_message); if (decrypted) { if (chatwin->enc_mode == PROF_ENC_NONE) { win_println((ProfWin*)chatwin, 0, "PGP encryption enabled."); @@ -239,7 +239,7 @@ _sv_ev_incoming_plain(ProfChatWin *chatwin, gboolean new_win, char *barejid, cha } void -sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_message) +sv_ev_incoming_message(char *barejid, char *resource, char *message, char *pgp_message) { gboolean new_win = FALSE; ProfChatWin *chatwin = wins_get_chat(barejid); @@ -252,11 +252,11 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_m // OTR suported, PGP supported #ifdef HAVE_LIBOTR #ifdef HAVE_LIBGPGME - if (enc_message) { + if (pgp_message) { if (chatwin->enc_mode == PROF_ENC_OTR) { win_println((ProfWin*)chatwin, 0, "PGP encrypted message received whilst in OTR session."); } else { // PROF_ENC_NONE, PROF_ENC_PGP - _sv_ev_incoming_pgp(chatwin, new_win, barejid, resource, message, enc_message); + _sv_ev_incoming_pgp(chatwin, new_win, barejid, resource, message, pgp_message); } } else { if (chatwin->enc_mode == PROF_ENC_PGP) { @@ -281,8 +281,8 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_m // OTR unsupported, PGP supported #ifndef HAVE_LIBOTR #ifdef HAVE_LIBGPGME - if (enc_message) { - _sv_ev_incoming_pgp(chatwin, new_win, barejid, resource, message, enc_message); + if (pgp_message) { + _sv_ev_incoming_pgp(chatwin, new_win, barejid, resource, message, pgp_message); } else { _sv_ev_incoming_plain(chatwin, new_win, barejid, resource, message); } diff --git a/src/event/server_events.h b/src/event/server_events.h index 4a3f86c2..12d7ffa5 100644 --- a/src/event/server_events.h +++ b/src/event/server_events.h @@ -50,7 +50,7 @@ void sv_ev_room_history(const char * const room_jid, const char * const nick, GDateTime *timestamp, const char * const message); void sv_ev_room_message(const char * const room_jid, const char * const nick, const char * const message); -void sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_message); +void sv_ev_incoming_message(char *barejid, char *resource, char *message, char *pgp_message); void sv_ev_incoming_private_message(const char * const fulljid, char *message); void sv_ev_delayed_message(char *fulljid, char *message, GDateTime *timestamp); void sv_ev_delayed_private_message(const char * const fulljid, char *message, GDateTime *timestamp); -- cgit 1.4.1-2-gfad0 /akkartik/mu/blame/html/nqueens.mu.html?h=hlt&id=61c025b11ed4ddd002f09f061fd77c75d8b6d0ba'>^ 
4bb57a55 ^

2f02189d ^


e5c11a51 ^

2f02189d ^



4a39d12d ^



4c4d325c ^

2f02189d ^

805d58c6 ^

fe8bf967 ^

4bb57a55 ^

805d58c6 ^


4bb57a55 ^



805d58c6 ^

2f02189d ^






e5c11a51 ^























2f02189d ^



e5c11a51 ^

2f02189d ^

947c639e ^





b301e0c0 ^

947c639e ^




b301e0c0 ^

947c639e ^

4a48bedc ^

947c639e ^



805d58c6 ^




947c639e ^




805d58c6 ^

b301e0c0 ^

805d58c6 ^


947c639e ^




805d58c6 ^


b301e0c0 ^

805d58c6 ^

b301e0c0 ^

805d58c6 ^

b301e0c0 ^


805d58c6 ^




c0d61295 ^







b301e0c0 ^

c0d61295 ^

4a48bedc ^

b301e0c0 ^

c0d61295 ^

b301e0c0 ^

c0d61295 ^


b301e0c0 ^

c0d61295 ^

4a48bedc ^

c0d61295 ^


805d58c6 ^

b301e0c0 ^

805d58c6 ^



b301e0c0 ^

805d58c6 ^

c0d61295 ^

f0c55e6b ^

c0d61295 ^


b301e0c0 ^

c0d61295 ^

4a48bedc ^

c0d61295 ^



805d58c6 ^

b301e0c0 ^

805d58c6 ^




b301e0c0 ^


805d58c6 ^


b301e0c0 ^

805d58c6 ^

c0d61295 ^

f0c55e6b ^

c0d61295 ^


b301e0c0 ^


c0d61295 ^


2f02189d ^




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
159

160
161

162
163
164
165