# HG changeset patch
# User Dan
# Date 1249099146 14400
# Node ID b9a3da602841691978a29a382c5b80b6fcb7e779
# Parent  647f0aa485dda070f59bf6fee8c7f0d6b951b324# Parent  ba1a31f16afe2ee6a564f1b4a9f14dd094b5c098
Merged branches from Scribus and Charlie

diff -r 647f0aa485dd -r b9a3da602841 plugins/yubikey/yubikey.js
--- a/plugins/yubikey/yubikey.js	Fri Jul 31 23:48:56 2009 -0400
+++ b/plugins/yubikey/yubikey.js	Fri Jul 31 23:59:06 2009 -0400
@@ -217,6 +217,11 @@
 
 addOnloadHook(function()
   {
+    if ( is_iPhone )
+      // kinda can't plug a yubikey into an iPhone
+      // ... yet?
+      return;
+    
     attachHook('login_build_form', 'yk_login_dlg_hook(table, data);');
     attachHook('login_build_userinfo', 'if ( window.yubikey_otp_current ) userinfo.yubikey_otp = window.yubikey_otp_current;');
     if ( title == namespace_list.Special + 'Preferences/Yubikey' )