diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java index decfe5ea3..fdf43ebcc 100644 --- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java +++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsQuery.java @@ -203,7 +203,7 @@ private void onGoogleContactsEntry(GoogleContactsEntry entry) @Override protected void run() { - GoogleContactsServiceImpl service = (GoogleContactsServiceImpl) + GoogleContactsServiceImpl service = GoogleContactsActivator.getGoogleContactsService(); gQuery = new GoogleQuery(query); diff --git a/src/net/java/sip/communicator/impl/neomedia/device/JmfDeviceDetector.java b/src/net/java/sip/communicator/impl/neomedia/device/JmfDeviceDetector.java index 53c15ed05..f9fa18c69 100644 --- a/src/net/java/sip/communicator/impl/neomedia/device/JmfDeviceDetector.java +++ b/src/net/java/sip/communicator/impl/neomedia/device/JmfDeviceDetector.java @@ -238,6 +238,8 @@ public void initializeVideo() //FMJ boolean fmjVideoAvailable = isFMJVideoAvailable(); + /* disable LTI-CIVIL for now as we have native capture for all OS */ + /* try { if(fmjVideoAvailable) @@ -250,6 +252,7 @@ public void initializeVideo() exc); fmjVideoAvailable = false; } + */ if (OSUtils.IS_MAC) // QuickTime {