author | Myhailo Danylenko <isbear@ukrpost.net> |
Sat, 28 Jul 2012 19:04:29 +0300 | |
changeset 34 | 94b6e4aa74a3 |
parent 31 | e02c22bf6115 |
permissions | -rw-r--r-- |
30
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
1 |
# HG changeset patch |
31
e02c22bf6115
Add update-pc & .pc in cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
30
diff
changeset
|
2 |
# Parent b5ea7efbf1f97502016888c5c7f463bae703c13e |
30
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
3 |
Fix some compiler warnings |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
4 |
|
31
e02c22bf6115
Add update-pc & .pc in cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
30
diff
changeset
|
5 |
diff -r b5ea7efbf1f9 mcabber/mcabber/commands.c |
e02c22bf6115
Add update-pc & .pc in cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
30
diff
changeset
|
6 |
--- a/mcabber/mcabber/commands.c Thu Jul 19 08:03:37 2012 +0300 |
e02c22bf6115
Add update-pc & .pc in cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
30
diff
changeset
|
7 |
+++ b/mcabber/mcabber/commands.c Thu Jul 19 08:04:52 2012 +0300 |
30
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
8 |
@@ -1949,13 +1949,11 @@ |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
9 |
enum imstatus rstatus; |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
10 |
const char *rst_msg; |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
11 |
time_t rst_time; |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
12 |
- struct pgp_data *rpgp; |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
13 |
|
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
14 |
rprio = buddy_getresourceprio(bud, p_res->data); |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
15 |
rstatus = buddy_getstatus(bud, p_res->data); |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
16 |
rst_msg = buddy_getstatusmsg(bud, p_res->data); |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
17 |
rst_time = buddy_getstatustime(bud, p_res->data); |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
18 |
- rpgp = buddy_resource_pgp(bud, p_res->data); |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
19 |
|
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
20 |
snprintf(buffer, 4095, "Resource: [%c] (%d) %s", imstatus2char[rstatus], |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
21 |
rprio, (char*)p_res->data); |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
22 |
@@ -1974,6 +1972,8 @@ |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
23 |
0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
24 |
} |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
25 |
#ifdef HAVE_GPGME |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
26 |
+ struct pgp_data *rpgp = buddy_resource_pgp(bud, p_res->data); |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
27 |
+ |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
28 |
if (rpgp && rpgp->sign_keyid) { |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
29 |
snprintf(buffer, 4095, "PGP key id: %s", rpgp->sign_keyid); |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
30 |
scr_WriteIncomingMessage(bjid, buffer, |
31
e02c22bf6115
Add update-pc & .pc in cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
30
diff
changeset
|
31 |
diff -r b5ea7efbf1f9 mcabber/mcabber/xmpp_helper.c |
e02c22bf6115
Add update-pc & .pc in cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
30
diff
changeset
|
32 |
--- a/mcabber/mcabber/xmpp_helper.c Thu Jul 19 08:03:37 2012 +0300 |
e02c22bf6115
Add update-pc & .pc in cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
30
diff
changeset
|
33 |
+++ b/mcabber/mcabber/xmpp_helper.c Thu Jul 19 08:04:52 2012 +0300 |
30
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
34 |
@@ -22,6 +22,7 @@ |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
35 |
|
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
36 |
#include <string.h> |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
37 |
#include <stdlib.h> |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
38 |
+#include <stdio.h> // snprintf |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
39 |
|
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
40 |
#include "xmpp_helper.h" |
40e67d6d2c13
Update cmake, fix some warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
41 |
#include "settings.h" |