[Pkg-mozext-commits] [gcontactsync] 37/88: Issue #14: Fully remove support for unsupported import sources

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository gcontactsync.

commit 50d563c974f5b94c7421c8147404e6004aff21d4
Author: Josh Geenen <joshgeenen at gmail.com>
Date:   Sun Jan 26 14:55:44 2014 -0600

    Issue #14: Fully remove support for unsupported import sources
---
 src/content/Import.js        | 26 +-------------------------
 src/content/Overlay.xul      | 34 ----------------------------------
 src/locale/en-US/overlay.dtd |  5 -----
 3 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/src/content/Import.js b/src/content/Import.js
index 373d0ac..fe1cbe1 100644
--- a/src/content/Import.js
+++ b/src/content/Import.js
@@ -52,13 +52,10 @@ if (!com.gContactSync) {com.gContactSync = {};}
  * etc.
  * It also reorganizes and signs the parameters.
  * 
- * TODO List:
- *  - Attempt to get more contact info from MySpace
- * 
  * @class
  */
 com.gContactSync.Import = {
-  /** The 'source' from which contacts are imported (Plaxo, Google, etc.) */
+  /** The 'source' from which contacts are imported (Facebook, Twitter, etc.) */
   mSource: "",
   /** This is used internally to track whether an import is in progress */
   mStarted: false,
@@ -68,27 +65,6 @@ com.gContactSync.Import = {
   mNewContacts: 0,
   /** A reference to the window TODO remove */
   mWindow: {},
-  /** Map for Plaxo only */
-  mMapplaxo: {
-    /** The user's ID */
-    id:            "PlaxoID",
-    /** An array of the user's photos */
-    photos:        "PlaxoPhotos"
-  },
-  /** Map for MySpace only */
-  mMapmyspace: {
-    /** The user's MySpace ID */
-    id:            "MySpaceID",
-    /**
-     * The 'nickname' (MySpace only).  This is mapped w/ DisplayName because it
-     * is basically all that MySpace gives.
-     */
-    nickname:      "DisplayName",
-    /** The user's thumbnail */
-    thumbnailUrl:  "MySpaceThumbnail",
-    /** The URL to the contact's profile */
-    profileUrl:    "WebPage2"
-  },
   /** Map for Facebook only
    *  https://developers.facebook.com/docs/reference/api/user/
    * TODO - family (need a separate GET request for each contact)
diff --git a/src/content/Overlay.xul b/src/content/Overlay.xul
index d2acdf2..8d34392 100644
--- a/src/content/Overlay.xul
+++ b/src/content/Overlay.xul
@@ -171,28 +171,11 @@
          <menupopup>
            <menuitem label="&Facebook.label;"
                      oncommand="com.gContactSync.Import.step1('facebook');"/>
-           <!-- Google shows duplicates (with different IDs), commented out to
-                avoid confusion over how to sync contacts -->
-           <!--<menuitem label="&Google.label;"
-                     oncommand="com.gContactSync.Import.step1('google');"/>-->
            <!-- Not supported quite yet -->
            <!--<menuitem label="&LinkedIn.label;"
                      oncommand="com.gContactSync.Import.step1('linkedin');"/>-->
-           <!-- This add-on has not been supported for years -->
-           <!--<menuitem label="&MozLabsContacts.label;"
-                     id="MozLabsContactsMenuitem"
-                     oncommand="com.gContactSync.Import.mozillaLabsContactsImporter();"/>-->
-           <!-- MySpace Developer has disappeared, requests return service unavailable -->
-           <!--<menuitem label="&MySpace.label;"
-                     oncommand="com.gContactSync.Import.step1('myspace');"/>-->
-           <!-- Plaxo's API is no longer supported. -->
-           <!--<menuitem label="&Plaxo.label;"
-                     oncommand="com.gContactSync.Import.step1('plaxo');"/>-->
            <menuitem label="&Twitter.label;"
                      oncommand="com.gContactSync.Import.step1('twitter');"/>
-           <!-- Yahoo is commented out because of an "Internal Error" -->
-           <!--<menuitem label="&Yahoo.label;"
-                         oncommand="com.gContactSync.Import.step1('yahoo');"/>-->
          </menupopup>
        </menu>
       <menuitem id="finishImport"
@@ -256,28 +239,11 @@
          <menupopup>
            <menuitem label="&Facebook.label;"
                      oncommand="com.gContactSync.Import.step1('facebook');"/>
-           <!-- Google shows duplicates (with different IDs), commented out to
-                avoid confusion over how to sync contacts -->
-           <!--<menuitem label="&Google.label;"
-                     oncommand="com.gContactSync.Import.step1('google');"/>-->
            <!-- Not supported quite yet -->
            <!--<menuitem label="&LinkedIn.label;"
                      oncommand="com.gContactSync.Import.step1('linkedin');"/>-->
-           <!-- This add-on has not been supported for years -->
-           <!--<menuitem label="&MozLabsContacts.label;"
-                     id="MozLabsContactsMenuitem"
-                     oncommand="com.gContactSync.Import.mozillaLabsContactsImporter();"/>-->
-           <!-- MySpace Developer has disappeared, requests return service unavailable -->
-           <!--<menuitem label="&MySpace.label;"
-                     oncommand="com.gContactSync.Import.step1('myspace');"/>-->
-           <!-- Plaxo's API is no longer supported. -->
-           <!--<menuitem label="&Plaxo.label;"
-                     oncommand="com.gContactSync.Import.step1('plaxo');"/>-->
            <menuitem label="&Twitter.label;"
                      oncommand="com.gContactSync.Import.step1('twitter');"/>
-           <!-- Yahoo is commented out because of an "Internal Error" -->
-           <!--<menuitem label="&Yahoo.label;"
-                         oncommand="com.gContactSync.Import.step1('yahoo');"/>-->
          </menupopup>
        </menu>
       <menuitem id="finishImport"
diff --git a/src/locale/en-US/overlay.dtd b/src/locale/en-US/overlay.dtd
index fdffe88..d79495b 100644
--- a/src/locale/en-US/overlay.dtd
+++ b/src/locale/en-US/overlay.dtd
@@ -65,11 +65,6 @@
 <!ENTITY FinishImport.label            "Finish Import">
 <!ENTITY FinishImport.accesskey        "F">
 <!ENTITY Facebook.label                "Facebook">
-<!ENTITY Google.label                  "Google">
 <!ENTITY LinkedIn.label                "LinkedIn">
-<!ENTITY MySpace.label                 "MySpace">
-<!ENTITY MozLabsContacts.label         "Mozilla Labs Contacts">
-<!ENTITY Plaxo.label                   "Plaxo">
 <!ENTITY Twitter.label                 "Twitter">
-<!ENTITY Yahoo.label                   "Yahoo">
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/gcontactsync.git