Skip to content

Bug 17833: Do not merge contacts (first commit) #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
azadi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug 17833: Do not merge contacts (first commit) #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions projects/instantbird/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ input_files:
- filename: trac-16489.patch
- filename: trac-17896.patch
- filename: trac-17494.patch
- filename: trac-17833-merge-contact.patch
- filename: version.patch
- filename: search-context-menu.patch
- filename: search-preferences-xul.patch
Expand Down
28 changes: 28 additions & 0 deletions projects/instantbird/trac-17833-merge-contact.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/chat/components/src/imContacts.js b/chat/components/src/imContacts.js
--- a/chat/components/src/imContacts.js
+++ b/chat/components/src/imContacts.js
@@ -588,23 +588,7 @@
this._buddies.every(function(b) b._empty),

mergeContact: function(aContact) {
- // Avoid merging the contact with itself or merging into an
- // already removed contact.
- if (aContact.id == this.id || !(this.id in ContactsById))
- throw Components.results.NS_ERROR_INVALID_ARG;
-
- this._ensureNotDummy();
- let contact = ContactsById[aContact.id]; // remove XPConnect wrapper
-
- // Copy all the contact-only tags first, otherwise they would be lost.
- for each (let tag in contact.getTags())
- if (!contact._isTagInherited(tag))
- this.addTag(tag);
-
- // Adopt each buddy. Removing the last one will delete the contact.
- for each (let buddy in contact.getBuddies())
- buddy.contact = this;
- this._updatePreferredBuddy();
+ return;
},
moveBuddyBefore: function(aBuddy, aBeforeBuddy) {
let buddy = BuddiesById[aBuddy.id]; // remove XPConnect wrapper