From 153aee8eda858f0c6316cbb3f714dc53806fe802 Mon Sep 17 00:00:00 2001
From: Dick Hollenbeck <dick@softplc.com>
Date: Sat, 21 Sep 2013 22:57:40 -0500
Subject: [PATCH] GITHUB_PLUGIN now works and can be used under Linux
 immediately. Other platforms to follow as volunteers test support and get
 openssl in place.

---
 pcbnew/dialogs/dialog_fp_lib_table.cpp | 8 +++++++-
 pcbnew/github/github_plugin.cpp        | 6 +++---
 pcbnew/github/github_plugin.h          | 4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pcbnew/dialogs/dialog_fp_lib_table.cpp b/pcbnew/dialogs/dialog_fp_lib_table.cpp
index 0b5815fa69..e3886b0628 100644
--- a/pcbnew/dialogs/dialog_fp_lib_table.cpp
+++ b/pcbnew/dialogs/dialog_fp_lib_table.cpp
@@ -628,11 +628,17 @@ public:
 
         wxArrayString choices;
         choices.Add( IO_MGR::ShowType( IO_MGR::KICAD ) );
+#if defined(BUILD_GITHUB_PLUGIN)
+        choices.Add( IO_MGR::ShowType( IO_MGR::GITHUB ) );
+#endif
         choices.Add( IO_MGR::ShowType( IO_MGR::LEGACY ) );
         choices.Add( IO_MGR::ShowType( IO_MGR::EAGLE ) );
-        choices.Add( IO_MGR::ShowType( IO_MGR::PCAD ) );
         choices.Add( IO_MGR::ShowType( IO_MGR::GEDA_PCB ) );
 
+        /* PCAD_PLUGIN does not support Footprint*() functions
+        choices.Add( IO_MGR::ShowType( IO_MGR::GITHUB ) );
+        */
+
         wxGridCellAttr* attr;
 
         attr = new wxGridCellAttr;
diff --git a/pcbnew/github/github_plugin.cpp b/pcbnew/github/github_plugin.cpp
index aba27a6fcd..9ef1448e4e 100644
--- a/pcbnew/github/github_plugin.cpp
+++ b/pcbnew/github/github_plugin.cpp
@@ -61,10 +61,10 @@ typedef MODULE_MAP::const_iterator                  MODULE_CITER;
 
 
 /**
- * Class FPL_CACHE
+ * Class GH_CACHE
  * assists only within GITHUB_PLUGIN and hold a map of footprint name to wxZipEntry
  */
-struct FPL_CACHE : public MODULE_MAP
+struct GH_CACHE : public MODULE_MAP
 {
     // MODULE_MAP is a boost::ptr_map template, made into a class hereby.
 };
@@ -157,7 +157,7 @@ void GITHUB_PLUGIN::cacheLib( const wxString& aLibraryPath ) throw( IO_ERROR )
     if( !m_cache || m_lib_path != aLibraryPath )
     {
         delete m_cache;
-        m_cache = new FPL_CACHE();
+        m_cache = new GH_CACHE();
         remote_get_zip( aLibraryPath );
         m_lib_path = aLibraryPath;
 
diff --git a/pcbnew/github/github_plugin.h b/pcbnew/github/github_plugin.h
index 7812baced6..c5955ecfac 100644
--- a/pcbnew/github/github_plugin.h
+++ b/pcbnew/github/github_plugin.h
@@ -26,7 +26,7 @@
 #define GITHUB_PLUGIN_H_
 
 
-struct FPL_CACHE;
+struct GH_CACHE;
 
 
 /**
@@ -82,7 +82,7 @@ private:
 
     wxString    m_lib_path;     ///< from aLibraryPath, something like https://github.com/liftoff-sr/pretty_footprints
     std::string m_zip_image;    ///< byte image of the zip file in its entirety.
-    FPL_CACHE*  m_cache;
+    GH_CACHE*  m_cache;
 };
 
 #endif // GITHUB_PLUGIN_H_