[tor-commits] [tor-messenger-build/master] Make the patch names more descriptive
sukhbir at torproject.org
sukhbir at torproject.org
Sat Apr 25 13:40:47 UTC 2015
commit ac0645aaadd50e4e8cf6ea5a55296878be4d7e93
Author: Sukhbir Singh <sukhbir at torproject.org>
Date: Sat Apr 25 09:42:16 2015 -0400
Make the patch names more descriptive
---
projects/instantbird/account-picture.patch | 30 +++++++++++++++++++++++++++
projects/instantbird/config | 6 +++---
projects/instantbird/disable-links.patch | 22 ++++++++++++++++++++
projects/instantbird/links.patch | 22 --------------------
projects/instantbird/picture.patch | 30 ---------------------------
projects/instantbird/show-traffic-tor.patch | 25 ++++++++++++++++++++++
projects/instantbird/trafficinfo.patch | 25 ----------------------
7 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/projects/instantbird/account-picture.patch b/projects/instantbird/account-picture.patch
new file mode 100644
index 0000000..14a3ed3
--- /dev/null
+++ b/projects/instantbird/account-picture.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Sukhbir Singh <sukhbir at torproject.org>
+# Date 1415618519 18000
+# Node ID 6193b9d64e63818366e61126625727543fb81d3f
+# Parent 09d259c6155857eda3d4488c68a4a9d8d851138f
+Disable the account picture dialog
+
+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">
+ <stack id="statusImageStack">
+ <!-- The box around the user icon is a workaround for bug 955673. -->
+ <box id="userIconHolder">
+- <image id="userIcon" role="button" popup="changeUserIconPanel"
+- aria-label="&userIcon.label;" tooltiptext="&userIcon.label;"/>
++ <image id="userIcon" role="button"/>
+ </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">
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 6911882..9e1565e 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -62,9 +62,9 @@ input_files:
- filename: xmpp.patch
- filename: gtalk-resource.patch
- filename: accountcreation.patch
- - filename: links.patch
- - filename: picture.patch
- - filename: trafficinfo.patch
+ - filename: disable-links.patch
+ - filename: account-picture.patch
+ - filename: show-traffic-tor.patch
- filename: theme-extension-update.patch
- filename: installer.patch
- filename: cert_override.txt
diff --git a/projects/instantbird/disable-links.patch b/projects/instantbird/disable-links.patch
new file mode 100644
index 0000000..d90b0a7
--- /dev/null
+++ b/projects/instantbird/disable-links.patch
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User Sukhbir Singh <sukhbir at torproject.org>
+# Date 1415125946 -19800
+# Wed Nov 05 00:02:26 2014 +0530
+# Node ID fe384d60035532dd4b81248a345525359ea2f98f
+# Parent 947732f86131ec2882340344ba0c29cc9943de48
+Remove formatting for URLs in chat window
+
+diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm
+--- a/chat/modules/imContentSink.jsm
++++ b/chat/modules/imContentSink.jsm
+@@ -58,10 +58,6 @@
+ attrs: { },
+
+ tags: {
+- 'a': {
+- 'title': true,
+- 'href': kAllowedURLs
+- },
+ 'br': true,
+ 'p': true
+ },
diff --git a/projects/instantbird/links.patch b/projects/instantbird/links.patch
deleted file mode 100644
index d90b0a7..0000000
--- a/projects/instantbird/links.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Sukhbir Singh <sukhbir at torproject.org>
-# Date 1415125946 -19800
-# Wed Nov 05 00:02:26 2014 +0530
-# Node ID fe384d60035532dd4b81248a345525359ea2f98f
-# Parent 947732f86131ec2882340344ba0c29cc9943de48
-Remove formatting for URLs in chat window
-
-diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm
---- a/chat/modules/imContentSink.jsm
-+++ b/chat/modules/imContentSink.jsm
-@@ -58,10 +58,6 @@
- attrs: { },
-
- tags: {
-- 'a': {
-- 'title': true,
-- 'href': kAllowedURLs
-- },
- 'br': true,
- 'p': true
- },
diff --git a/projects/instantbird/picture.patch b/projects/instantbird/picture.patch
deleted file mode 100644
index 14a3ed3..0000000
--- a/projects/instantbird/picture.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Sukhbir Singh <sukhbir at torproject.org>
-# Date 1415618519 18000
-# Node ID 6193b9d64e63818366e61126625727543fb81d3f
-# Parent 09d259c6155857eda3d4488c68a4a9d8d851138f
-Disable the account picture dialog
-
-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">
- <stack id="statusImageStack">
- <!-- The box around the user icon is a workaround for bug 955673. -->
- <box id="userIconHolder">
-- <image id="userIcon" role="button" popup="changeUserIconPanel"
-- aria-label="&userIcon.label;" tooltiptext="&userIcon.label;"/>
-+ <image id="userIcon" role="button"/>
- </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">
diff --git a/projects/instantbird/show-traffic-tor.patch b/projects/instantbird/show-traffic-tor.patch
new file mode 100644
index 0000000..c571b79
--- /dev/null
+++ b/projects/instantbird/show-traffic-tor.patch
@@ -0,0 +1,25 @@
+diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul
+index 5fa5b82..46447ff 100644
+--- a/im/content/accountWizard.xul
++++ b/im/content/accountWizard.xul
+@@ -39,6 +39,8 @@
+ <description class="top-proto-description" value="&accountProtocolShowMore.description;"/>
+ </richlistitem>
+ </richlistbox>
++ <separator class="thin"/>
++ <description>&accountProtocolInfo.label3;</description>
+ </wizardpage>
+
+ <wizardpage id="accountprotocol" pageid="accountprotocol" next="accountusername"
+diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd
+index 43d0f19..5492985 100644
+--- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd
++++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd
+@@ -6,6 +6,7 @@
+
+ <!ENTITY accountProtocolTitle.label "Protocol">
+ <!ENTITY accountProtocolInfo.label2 "Please choose the protocol of your IM account.">
++<!ENTITY accountProtocolInfo.label3 "All traffic will be routed over the Tor network.">
+ <!ENTITY accountProtocolGetMore.label "Get more…">
+ <!ENTITY accountProtocolShowMore.label "Show all protocols">
+ <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols">
diff --git a/projects/instantbird/trafficinfo.patch b/projects/instantbird/trafficinfo.patch
deleted file mode 100644
index c571b79..0000000
--- a/projects/instantbird/trafficinfo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul
-index 5fa5b82..46447ff 100644
---- a/im/content/accountWizard.xul
-+++ b/im/content/accountWizard.xul
-@@ -39,6 +39,8 @@
- <description class="top-proto-description" value="&accountProtocolShowMore.description;"/>
- </richlistitem>
- </richlistbox>
-+ <separator class="thin"/>
-+ <description>&accountProtocolInfo.label3;</description>
- </wizardpage>
-
- <wizardpage id="accountprotocol" pageid="accountprotocol" next="accountusername"
-diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd
-index 43d0f19..5492985 100644
---- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd
-+++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd
-@@ -6,6 +6,7 @@
-
- <!ENTITY accountProtocolTitle.label "Protocol">
- <!ENTITY accountProtocolInfo.label2 "Please choose the protocol of your IM account.">
-+<!ENTITY accountProtocolInfo.label3 "All traffic will be routed over the Tor network.">
- <!ENTITY accountProtocolGetMore.label "Get more…">
- <!ENTITY accountProtocolShowMore.label "Show all protocols">
- <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols">
More information about the tor-commits
mailing list