[vidalia-svn] r3881: Commented out web browser subdirectory in cmake. Fixed a cou (in vidalia/branches/extension-api/src: . vidalia vidalia/NetworkMapPlugin)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-06-24 14:34:43 -0400 (Wed, 24 Jun 2009)
New Revision: 3881

Modified:
   vidalia/branches/extension-api/src/CMakeLists.txt
   vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
   vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt
   vidalia/branches/extension-api/src/vidalia/PluginManager.cpp
Log:
Commented out web browser subdirectory in cmake. Fixed a couple of things.


Modified: vidalia/branches/extension-api/src/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/CMakeLists.txt	2009-06-24 17:45:32 UTC (rev 3880)
+++ vidalia/branches/extension-api/src/CMakeLists.txt	2009-06-24 18:34:43 UTC (rev 3881)
@@ -47,4 +47,4 @@
 add_subdirectory(tools)
 add_subdirectory(torcontrol)
 add_subdirectory(vidalia)
-add_subdirectory(webbrowserplugin)
+#add_subdirectory(WebBrowserPlugin)

Modified: vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/CMakeLists.txt	2009-06-24 17:45:32 UTC (rev 3880)
+++ vidalia/branches/extension-api/src/vidalia/CMakeLists.txt	2009-06-24 18:34:43 UTC (rev 3881)
@@ -55,7 +55,7 @@
   HomePlugin
   MessageLogPlugin
   NetworkMapPlugin
-}
+)
 
 ## Process the static plugins
 add_subdirectory(DashboardPlugin)

Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt	2009-06-24 17:45:32 UTC (rev 3880)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/CMakeLists.txt	2009-06-24 18:34:43 UTC (rev 3881)
@@ -34,14 +34,25 @@
 )
 qt4_wrap_cpp(networkmapplugin_SRCS
   NetworkMapPlugin.h
+  CircuitItem.h
   CircuitListWidget.h
   GeoIpCache.h
+  GeoIpCacheItem.h
+  GeoIp.h
+  GeoIpRequest.h
   GeoIpResolver.h
+  GeoIpResponse.h
   NetViewer.h
   RouterDescriptorView.h
   RouterInfoDialog.h
+  RouterListItem.h
   RouterListWidget.h
+  StreamItem.h
 )
+qt4_wrap_ui(networkmapplugin_SRCS
+  NetViewer.ui
+  RouterInfoDialog.ui
+)
 
 add_library(networkmapplugin STATIC  ${networkmapplugin_SRCS})
 target_link_libraries(networkmapplugin ${QT_LIBRARIES})

Modified: vidalia/branches/extension-api/src/vidalia/PluginManager.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/PluginManager.cpp	2009-06-24 17:45:32 UTC (rev 3880)
+++ vidalia/branches/extension-api/src/vidalia/PluginManager.cpp	2009-06-24 18:34:43 UTC (rev 3881)
@@ -40,7 +40,7 @@
 	/* Invalid plugin type? */
       }
   }
-
+#if 0
   QDir dataPluginsDir = QDir(dataDirectory);
   QDir applicationPluginsDir = QDir(applicationDirectory);
 #if defined(Q_OS_WIN)
@@ -74,6 +74,7 @@
       /* Either not a plugin file or not a vidaliaplugininterface plugin */
     }
   }
+#endif
 }