Package: irssi-plugin-xmpp / 0.53-1~bpo8+1

singpolyma-0015-Format-keyID-the-same-everywhere.patch Patch series | download
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
From 12e4ec8e61c59380c7dd92baae1df9747cdc29df Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Sun, 24 Apr 2011 14:48:45 -0500
Subject: [PATCH 15/18] Format keyID the same everywhere

---
 src/fe-common/fe-rosters.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- a/src/fe-common/fe-rosters.c
+++ b/src/fe-common/fe-rosters.c
@@ -133,7 +133,7 @@
 static void
 show_begin_of_roster(XMPP_SERVER_REC *server)
 {
-	char *show, *status, *priority, *text, *resources;
+	char *show, *status, *priority, *text, *resources, *pgp_keyid;
 
 	g_return_if_fail(IS_XMPP_SERVER(server));
 	show = (server->show == XMPP_PRESENCE_AVAILABLE) ? NULL :
@@ -145,9 +145,12 @@
 	    format_get_text(MODULE_NAME, NULL, server, NULL,
 	        XMPPTXT_FORMAT_RESOURCE_STATUS, server->away_reason);
 	priority = g_strdup_printf("%d", server->priority);
+	pgp_keyid = !settings_get_str("xmpp_pgp") ? NULL : \
+	    format_get_text(MODULE_NAME, NULL, server, NULL,
+	        XMPPTXT_FORMAT_PGP_KEYID, settings_get_str("xmpp_pgp"));
 	text = format_get_text(MODULE_NAME, NULL, server, NULL,
 	    XMPPTXT_FORMAT_RESOURCE, show,  server->resource, priority,
-	    status, settings_get_str("xmpp_pgp"));
+	    status, pgp_keyid);
 	g_free(show);
 	g_free(status);
 	g_free(priority);