From 9eabf86eba3ba99962ffce6e786651c7c68e5fb1 Mon Sep 17 00:00:00 2001
From: brianking <brian@mozdev.org>
Date: Tue, 21 Feb 2012 16:24:05 +0100
Subject: [PATCH] Issue #40 : Remove some links in the sidebar, replace with a
 generic profile link

---
 chrome/content/bindings.xml | 16 +++++++++-------
 chrome/content/sidebar.js   |  3 +--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/chrome/content/bindings.xml b/chrome/content/bindings.xml
index 0521f13..cbf62bb 100644
--- a/chrome/content/bindings.xml
+++ b/chrome/content/bindings.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE bindings SYSTEM "chrome://facebook/locale/sidebar.dtd">
+<!DOCTYPE bindings [
+ <!ENTITY % sidebarDTD SYSTEM "chrome://facebook/locale/sidebar.dtd">
+ %sidebarDTD;
+ <!ENTITY % toolbarDTD SYSTEM "chrome://facebook/locale/toolbar.dtd">
+ %toolbarDTD;
+]>
 
 <bindings id="textboxBindings"
           xmlns="http://www.mozilla.org/xbl"
@@ -29,14 +34,11 @@
             <children />
           </xul:label>
           <xul:label xbl:inherits="value=stime" class="stime" />
-          <xul:hbox pack="start" class="facebook-friendlinks" >
-            <xul:label value="&sidebar.friendmessage.label;" xbl:inherits="onclick=msgCmd"
-                       class="facebook-link mini-link" />
-            <xul:label value="-" style="color:#808080; font-size:9px;" />
-            <xul:label value="&sidebar.friendpoke.label;" xbl:inherits="onclick=pokeCmd"
+          <xul:hbox pack="start" align="center" class="facebook-friendlinks" >
+            <xul:label value="&toolbar.links.profile.label;" xbl:inherits="onclick=profileCmd"
                        class="facebook-link mini-link" />
             <xul:label value="-" style="color:#808080; font-size:9px;" />
-            <xul:label value="&sidebar.friendpost.label;" xbl:inherits="onclick=postCmd"
+            <xul:label value="&sidebar.friendmessage.label;" xbl:inherits="onclick=msgCmd"
                        class="facebook-link mini-link" />
           </xul:hbox>
         </xul:vbox>
diff --git a/chrome/content/sidebar.js b/chrome/content/sidebar.js
index 7b37c98..ee1df7b 100755
--- a/chrome/content/sidebar.js
+++ b/chrome/content/sidebar.js
@@ -230,9 +230,8 @@ function CreateFriendNode(list, friend, insertBefore) {
     item.setAttribute('ptime', fbLib.getProfileTime(friend.ptime) );
     item.setAttribute('oncommand', "fbLib.OpenFBUrl('profile.php', '" + friend.id + "', event, null )");
     item.setAttribute('viewUpdCmd', "fbLib.OpenFBUrl('profile.php', '" + friend.id + "', event, {highlight: null} ); return false;");
+    item.setAttribute('profileCmd', "fbLib.OpenFBUrl('profile.php', '" + friend.id + "', event, null )");
     item.setAttribute('msgCmd', "fbLib.OpenNewStyleFBUrl('messages', '" + friend.id + "', event, null )");
-    item.setAttribute('pokeCmd', "fbLib.OpenFBUrl('poke.php', '" + friend.id + "', event, null )");
-    item.setAttribute('postCmd', "fbLib.OpenFBUrl('wallpost.php', '" + friend.id + "', event, null )");
     item.setAttribute('pic', friend.pic);
     list.insertBefore(item, insertBefore);
 }