Merge commit '293f264' into 0.6.0.x

diff --cc src/qt/bitcoin.cpp
index c7f0092,3157ead..9fea2c1
--- 1/src/qt/bitcoin.cpp
--- 2/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@@ -264,29 -203,9 +264,30 @@@ int main(int argc, char *argv[]
                      window.show();
                  }
  
 +                // Place this here as guiref has to be defined if we dont want to lose URIs
 +                ipcInit();
 +
 +#if !defined(MAC_OSX) && !defined(WIN32)
 +// TODO: implement qtipcserver.cpp for Mac and Windows
 +
 +                // Check for URI in argv
 +                for (int i = 1; i < argc; i++)
 +                {
 +                    if (strlen(argv[i]) > 7 && strncasecmp(argv[i], "bitcoin:", 8) == 0)
 +                    {
 +                        const char *strURI = argv[i];
 +                        try {
 +                            boost::interprocess::message_queue mq(boost::interprocess::open_only, BITCOINURI_QUEUE_NAME);
 +                            mq.try_send(strURI, strlen(strURI), 0);
 +                        }
 +                        catch (boost::interprocess::interprocess_exception &ex) {
 +                        }
 +                    }
 +                }
 +#endif
                  app.exec();
  
+                 window.hide();
                  guiref = 0;
              }
              Shutdown(NULL);

diff --cc src/qt/walletmodel.cpp
Simple merge