Merge branch 'twitter_log' into patched-master

1 files changed, 5 insertions, 18 deletions

diff --git a/protocols/twitter/twitter_lib.c b/protocols/twitter/twitter_lib.c
index bffd61aa..a1e969a1 100644
--- a/protocols/twitter/twitter_lib.c
+++ b/protocols/twitter/twitter_lib.c
@@ -835,25 +835,12 @@ static char *twitter_msg_add_id(struct im_connection *ic,
 
 	if (set_getbool(&ic->acc->set, "show_ids")) {
 		if (reply_to != -1) {
-			if (td->long_ids) {
-				return g_strdup_printf("\002[\002%04x->%04x\002]\002 %s%s",
-						txs->from_filter ? td->filter_log_id : td->log_id,
-						reply_to, prefix, txs->text);
-			} else {
-				return g_strdup_printf("\002[\002%02x->%02x\002]\002 %s%s",
-						txs->from_filter ? td->filter_log_id : td->log_id,
-						reply_to, prefix, txs->text);
-			}
+			return g_strdup_printf("\002[\002%0*x->%0*x\002]\002 %s%s",
+			                       td->id_length, td->log_id, td->id_length,
+					       reply_to, prefix, txs->text);
 		} else {
-			if (td->long_ids) {
-				return g_strdup_printf("\002[\002%04x\002]\002 %s%s",
-						txs->from_filter ? td->filter_log_id : td->log_id,
-						prefix, txs->text);
-			} else {
-				return g_strdup_printf("\002[\002%02x\002]\002 %s%s",
-						txs->from_filter ? td->filter_log_id : td->log_id,
-						prefix, txs->text);
-			}
+			return g_strdup_printf("\002[\002%0*x\002]\002 %s%s",
+			                       td->id_length, td->log_id, prefix, txs->text);
 		}
 	} else {
 		if (*prefix) {