commit 677b8d1fb001dac1c4ac972e6bc7ae2e88d9a6f0 Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Mar 19 07:45:12 2016 -0400

Rebase account-picture.patch --- projects/instantbird/account-picture.patch | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/projects/instantbird/account-picture.patch b/projects/instantbird/account-picture.patch index 300ecc6..77274d1 100644 --- a/projects/instantbird/account-picture.patch +++ b/projects/instantbird/account-picture.patch @@ -1,12 +1,7 @@ diff --git a/im/content/blist.xul b/im/content/blist.xul --- a/im/content/blist.xul +++ b/im/content/blist.xul -@@ -109,18 +109,17 @@ - </menupopup> - </popupset> - - <toolbox id="mainToolbox"> - <toolbar id="statusArea"> +@@ -114,8 +114,7 @@ <stack id="statusImageStack"> <!-- The box around the user icon is a workaround for bug 955673. --> <box id="userIconHolder"> @@ -16,8 +11,3 @@ diff --git a/im/content/blist.xul b/im/content/blist.xul </box> <panel id="changeUserIconPanel" type="arrow" align="center" - onpopupshowing="buddyList.updateUserIconPanelItems();" - onpopuphiding="buddyList.stopWebcamStream();"> - <deck id="userIconPanel"> - <vbox class="userIconPanelMenu"> - <stack id="userIconPanelStack" flex="1">