From 6c2c19d1101a043cc0b05065447cc9321ed32ac0 Mon Sep 17 00:00:00 2001 From: Sai Sasidhar Maddali Date: Mon, 15 Feb 2016 12:19:47 +0100 Subject: FIX: Symbol name exported by plugin is causing a recursive call in Windows --- plugins/file/CMakeLists.txt | 1 + plugins/mock/uca-mock-camera.c | 4 ++-- src/uca-plugin-manager.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/file/CMakeLists.txt b/plugins/file/CMakeLists.txt index ab655fb..741ac56 100644 --- a/plugins/file/CMakeLists.txt +++ b/plugins/file/CMakeLists.txt @@ -22,5 +22,6 @@ if (TIFF_FOUND) install(TARGETS ucafile LIBRARY DESTINATION ${UCA_PLUGINDIR} + RUNTIME DESTINATION ${UCA_BINDIR} COMPONENT ${UCA_CAMERA_NAME}) endif () diff --git a/plugins/mock/uca-mock-camera.c b/plugins/mock/uca-mock-camera.c index ad300d2..e6892cb 100644 --- a/plugins/mock/uca-mock-camera.c +++ b/plugins/mock/uca-mock-camera.c @@ -557,7 +557,7 @@ uca_mock_camera_init(UcaMockCamera *self) } G_MODULE_EXPORT GType -uca_camera_get_type (void) +camera_plugin_get_type (void) { return UCA_TYPE_MOCK_CAMERA; -} +} \ No newline at end of file diff --git a/src/uca-plugin-manager.c b/src/uca-plugin-manager.c index dc69227..b298a4c 100644 --- a/src/uca-plugin-manager.c +++ b/src/uca-plugin-manager.c @@ -229,7 +229,7 @@ get_camera_type (UcaPluginManagerPrivate *priv, GModule *module; gchar *module_path; GetTypeFunc *func; - const gchar *symbol_name = "uca_camera_get_type"; + const gchar *symbol_name = "camera_plugin_get_type"; module_path = find_camera_module_path (priv->search_paths, name); -- cgit v1.2.3