From f40c1895152ba78ae51d06b581b75e06ce2878fa Mon Sep 17 00:00:00 2001 From: GRiker Date: Thu, 24 Oct 2013 06:55:59 -0600 Subject: [PATCH] Disable 'Connect to iTunes' when OS X >= 10.9 --- src/calibre/gui2/actions/device.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py index 364a0486b2..9be6765cff 100644 --- a/src/calibre/gui2/actions/device.py +++ b/src/calibre/gui2/actions/device.py @@ -12,7 +12,7 @@ from PyQt4.Qt import QToolButton, QMenu, pyqtSignal, QIcon, QTimer from calibre.gui2.actions import InterfaceAction from calibre.utils.smtp import config as email_config from calibre.utils.config import tweaks -from calibre.constants import iswindows, isosx +from calibre.constants import iswindows, isosx, get_osx_version from calibre.customize.ui import is_disabled from calibre.devices.bambook.driver import BAMBOOK from calibre.gui2.dialogs.smartdevice import SmartdeviceDialog @@ -44,7 +44,8 @@ class ShareConnMenu(QMenu): # {{{ mitem.setEnabled(True) mitem.triggered.connect(lambda x : self.connect_to_itunes.emit()) self.connect_to_itunes_action = mitem - if not (iswindows or isosx): + osxv = get_osx_version() + if not (iswindows or isosx) or (osxv.major == 10 and osxv.minor >= 9) or osxv.major > 10: mitem.setVisible(False) mitem = self.addAction(QIcon(I('devices/bambook.png')), _('Connect to Bambook')) mitem.setEnabled(True)