From b0791c3001f669a32abc4d4b40f4dc4f6f2bc912 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 9 Feb 2010 15:07:45 +0000
Subject: Backed out changeset 0664cf2c9edf
---
indra/llwindow/llwindowsdl.cpp | 2 +-
indra/media_plugins/webkit/CMakeLists.txt | 11 +---------
indra/media_plugins/webkit/media_plugin_webkit.cpp | 24 ++++------------------
3 files changed, 6 insertions(+), 31 deletions(-)
(limited to 'indra')
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index f9c3694459..bfdf1147a1 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -1617,7 +1617,7 @@ void LLWindowSDL::processMiscNativeEvents()
pump_timer.setTimerExpirySec(1.0f / 15.0f);
do {
// Always do at least one non-blocking pump
- gtk_main_iteration_do(FALSE);
+ gtk_main_iteration_do(0);
} while (gtk_events_pending() &&
!pump_timer.hasExpired());
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt
index 812760a116..5bccd589d8 100644
--- a/indra/media_plugins/webkit/CMakeLists.txt
+++ b/indra/media_plugins/webkit/CMakeLists.txt
@@ -9,7 +9,6 @@ include(LLPlugin)
include(LLMath)
include(LLRender)
include(LLWindow)
-include(UI)
include(Linking)
include(PluginAPI)
include(MediaPluginBase)
@@ -39,7 +38,7 @@ add_library(media_plugin_webkit
${media_plugin_webkit_SOURCE_FILES}
)
-set(media_plugin_webkit_LINK_LIBRARIES
+target_link_libraries(media_plugin_webkit
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
@@ -47,14 +46,6 @@ set(media_plugin_webkit_LINK_LIBRARIES
${PLUGIN_API_WINDOWS_LIBRARIES}
)
-if (LINUX)
- list(APPEND media_plugin_webkit_LINK_LIBRARIES
- ${UI_LIBRARIES} # for glib/GTK
- )
-endif (LINUX)
-
-target_link_libraries(media_plugin_webkit ${media_plugin_webkit_LINK_LIBRARIES})
-
add_dependencies(media_plugin_webkit
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index b607d2f66a..3c24b4ed22 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -43,21 +43,15 @@
#include "llpluginmessageclasses.h"
#include "media_plugin_base.h"
-#if LL_LINUX
-extern "C" {
-# include <glib.h>
-}
-#endif // LL_LINUX
-
#if LL_WINDOWS
-# include <direct.h>
+#include <direct.h>
#else
-# include <unistd.h>
-# include <stdlib.h>
+#include <unistd.h>
+#include <stdlib.h>
#endif
#if LL_WINDOWS
- // *NOTE:Mani - This captures the module handle for the dll. This is used below
+ // *NOTE:Mani - This captures the module handle fo rthe dll. This is used below
// to get the path to this dll for webkit initialization.
// I don't know how/if this can be done with apr...
namespace { HMODULE gModuleHandle;};
@@ -118,16 +112,6 @@ private:
//
void update(int milliseconds)
{
-#if LL_LINUX
- // pump glib generously, as Linux browser plugins are on the
- // glib main loop, even if the browser itself isn't - ugh
- //*TODO: shouldn't this be transparent if Qt was compiled with
- // glib mainloop integration? investigate.
- GMainContext *mainc = g_main_context_default();
- while(g_main_context_iteration(mainc, FALSE));
-#endif // LL_LINUX
-
- // pump qt
LLQtWebKit::getInstance()->pump( milliseconds );
checkEditState();
--
cgit v1.2.3