From 074b9faee0efafa2917e39257ab94f95fb6960b0 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 11 Nov 2009 18:00:58 -0500
Subject: Remove alt text on avatar url (so pidgin doesn't show it) surround
 notice_id with [], looks nicer

---
 lib/jabber.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/jabber.php')

diff --git a/lib/jabber.php b/lib/jabber.php
index 73f2ec660..23c2e0d94 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -176,7 +176,7 @@ function jabber_format_entry($profile, $notice)
     $xs = new XMLStringer();
     $xs->elementStart('html', array('xmlns' => 'http://jabber.org/protocol/xhtml-im'));
     $xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml'));
-    $xs->element("img", array('src'=> $profile->avatarUrl(AVATAR_MINI_SIZE) , 'alt' => $profile->nickname));
+    $xs->element("img", array('src'=> $profile->avatarUrl(AVATAR_MINI_SIZE)));
     $xs->element('a', array('href' => $profile->profileurl),
                  $profile->nickname);
     $xs->text(": ");
@@ -185,11 +185,11 @@ function jabber_format_entry($profile, $notice)
     } else {
         $xs->raw(common_render_content($notice->content, $notice));
     }
-    $xs->raw(" ");
+    $xs->text(" ");
     $xs->element('a', array(
         'href'=>common_local_url('conversation',
             array('id' => $notice->conversation)).'#notice-'.$notice->id
-         ),sprintf(_('notice id: %s'),$notice->id));
+         ),sprintf(_('[%s]'),$notice->id));
     $xs->elementEnd('body');
     $xs->elementEnd('html');
 
-- 
cgit v1.2.3-54-g00ecf


From 59e8896212a8d5e5ceed37162b8d38abc0de0e4b Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 11 Nov 2009 18:03:07 -0500
Subject: Add the [noticeid] to the end of text only jabber messages

---
 lib/jabber.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/jabber.php')

diff --git a/lib/jabber.php b/lib/jabber.php
index 23c2e0d94..a8e295ea5 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -481,5 +481,5 @@ function jabber_public_notice($notice)
 
 function jabber_format_notice(&$profile, &$notice)
 {
-    return $profile->nickname . ': ' . $notice->content;
+    return $profile->nickname . ': ' . $notice->content . ' [' . $notice->id . ']';
 }
-- 
cgit v1.2.3-54-g00ecf