mcabber: mcabber/src/jabglue.c comparison

comparison mcabber/src/jabglue.c @ 1399:187985455020

Correctly display PGP-encoded messages with a subject Minor style change

author	Mikael Berthe <mikael@lilotux.net>
date	Thu, 13 Dec 2007 22:36:04 +0100
parents	5f91bac887ee
children	f89844a0448a

comparison

equal deleted inserted replaced

-:f8321420ed7a
+:187985455020
 tv.tv_usec = 0;
 time(&now);
 if (KeepaliveDelay) {
-if (now >= LastPingTime + (time_t)KeepaliveDelay) {
+if (now >= LastPingTime + (time_t)KeepaliveDelay)
 tv.tv_sec = 0;
-} else {
+else
 tv.tv_sec = LastPingTime + (time_t)KeepaliveDelay - now;
-}
 }
 // Check auto-away timeout
 tmout = scr_GetAutoAwayTimeout(now);
-if (tv.tv_sec > tmout) {
+if (tv.tv_sec > tmout)
 tv.tv_sec = tmout;
-}
 #if defined JEP0022 || defined JEP0085
 // Check composing timeout
 tmout = scr_GetChatStatesTimeout(now);
-if (tv.tv_sec > tmout) {
+if (tv.tv_sec > tmout)
 tv.tv_sec = tmout;
-}
 #endif
 if (!tv.tv_sec)
 tv.tv_usec = 350000;
 srand(now);
 msg_idn += 1U + (unsigned int) (9.0 * (rand() / (RAND_MAX + 1.0)));
 return g_strdup_printf("%u%d", msg_idn, (int)(now%10L));
 }
-//  jb_send_msg(jid, text, type, subject, msgid, *encrypted)
+//  jb_send_msg(jid, text, type, subject, msgid, *encrypted, type_overwrite)
 // When encrypted is not NULL, the function set *encrypted to 1 if the
 // message has been PGP-encrypted.  If encryption enforcement is set and
 // encryption fails, *encrypted is set to -1.
 void jb_send_msg(const char *fjid, const char *text, int type,
 const char *subject, const char *msgid, gint *encrypted,
 }
 #endif
 }
 static void gotmessage(char *type, const char *from, const char *body,
-const char *enc, time_t timestamp,
+const char *enc, const char *subject, time_t timestamp,
 xmlnode xmldata_signed)
 {
 char *bjid;
 const char *rname, *s;
 char *decrypted_pgp = NULL;
 // System messages (from our server) are allowed.
 if (!settings_opt_get_int("block_unsubscribed") ||
 (roster_getsubscription(bjid) & sub_from) ||
 (type && strcmp(type, "chat")) ||
 ((s = settings_opt_get("server")) != NULL && !strcasecmp(bjid, s))) {
+gchar *fullbody = NULL;
+if (subject) {
+if (body)
+fullbody = g_strdup_printf("[%s]\n%s", subject, body);
+else
+fullbody = g_strdup_printf("[%s]\n", subject);
+body = fullbody;
+}
 hk_message_in(bjid, rname, timestamp, body, type,
 ((decrypted_pgp || otr_msg) ? TRUE : FALSE));
+g_free(fullbody);
 } else {
 scr_LogPrint(LPRINT_LOGNORM, "Blocked a message from <%s>", bjid);
 }
 gotmessage_return:
 {
 char *p, *r, *s;
 xmlnode x;
 char *body = NULL;
 char *enc = NULL;
-char *chatmsg = NULL;
+char *subject = NULL;
 time_t timestamp = 0L;
 body = xmlnode_get_tag_data(xmldata, "body");
+x = xml_get_xmlns(xmldata, NS_ENCRYPTED);
+if (x && (p = xmlnode_get_data(x)) != NULL)
+enc = p;
 p = xmlnode_get_tag_data(xmldata, "subject");
 if (p != NULL) {
-if (type && !strcmp(type, TMSG_GROUPCHAT)) {  // Room topic
+if (!type || strcmp(type, TMSG_GROUPCHAT)) {  // Chat message
+subject = p;
+} else {                                      // Room topic
 GSList *roombuddy;
 gchar *mbuf;
 gchar *subj = p;
 // Get the room (s) and the nickname (r)
 s = g_strdup(from);
 hlog_write_message(s, 0, -1, mbuf);
 g_free(s);
 g_free(mbuf);
 // The topic is displayed in the chat status line, so refresh now.
 scr_UpdateChatStatus(TRUE);
-} else {                                      // Chat message
+}
-if (body)
-chatmsg = g_strdup_printf("[%s]\n%s", p, body);
-else
-chatmsg = g_strdup_printf("[%s]\n", p);
-body = chatmsg;
-}
-}
-// Not used yet...
-x = xml_get_xmlns(xmldata, NS_ENCRYPTED);
-if (x && (p = xmlnode_get_data(x)) != NULL) {
-enc = p;
 }
 // Timestamp?
 timestamp = xml_get_timestamp(xmldata);
 chatstates_reset_probed(from);
 #endif
 } else {
 handle_state_events(from, xmldata);
 }
-if (from && body)
+if (from && (body || subject))
-gotmessage(type, from, body, enc, timestamp,
+gotmessage(type, from, body, enc, subject, timestamp,
 xml_get_xmlns(xmldata, NS_SIGNED));
 if (from) {
 x = xml_get_xmlns(xmldata, "http://jabber.org/protocol/muc#user");
 if (x && !strcmp(xmlnode_get_name(x), "x"))
 got_muc_message(from, x);
 }
-g_free(chatmsg);
 }
 static void handle_state_events(char *from, xmlnode xmldata)
 {
 #if defined JEP0022 || defined JEP0085

Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/jabglue.c @ 1399:187985455020