Merge pull request #1281 from jmarshallnz/plugins_drop_progress

Plugins drop progress dialog

diff --cc xbmc/dialogs/GUIDialogBusy.cpp
index 5393c36,4347d2b..78ace1b
--- 1/xbmc/dialogs/GUIDialogBusy.cpp
--- 2/xbmc/dialogs/GUIDialogBusy.cpp
+++ b/xbmc/dialogs/GUIDialogBusy.cpp
@@@ -24,8 -28,9 +27,9 @@@
  CGUIDialogBusy::CGUIDialogBusy(void)
    : CGUIDialog(WINDOW_DIALOG_BUSY, "DialogBusy.xml"), m_bLastVisible(false)
  {
 -  m_loadOnDemand = false;
 +  m_loadType = LOAD_ON_GUI_INIT;
    m_bModal = true;
+   m_progress = 0;
  }
  
  CGUIDialogBusy::~CGUIDialogBusy(void)

diff --cc xbmc/dialogs/GUIDialogBusy.h
Simple merge

diff --cc xbmc/filesystem/Directory.cpp
Simple merge

diff --cc xbmc/filesystem/IDirectory.h
Simple merge

diff --cc xbmc/filesystem/PluginDirectory.cpp
Simple merge

diff --cc xbmc/filesystem/PluginDirectory.h
Simple merge