diff options
| author | Sai Sasidhar Maddali <sai.sasidhar92@gmail.com> | 2016-02-15 12:19:47 +0100 |
|---|---|---|
| committer | Sai Sasidhar Maddali <sai.sasidhar92@gmail.com> | 2016-03-15 15:33:44 +0100 |
| commit | 6c2c19d1101a043cc0b05065447cc9321ed32ac0 (patch) | |
| tree | 44149b431a284c848d65ef9e969685b936bc5ee5 | |
| parent | ad6d2550d0e728a2927270721ebcd62671f1f0aa (diff) | |
| download | libuca-6c2c19d1101a043cc0b05065447cc9321ed32ac0.tar.gz libuca-6c2c19d1101a043cc0b05065447cc9321ed32ac0.tar.bz2 libuca-6c2c19d1101a043cc0b05065447cc9321ed32ac0.tar.xz libuca-6c2c19d1101a043cc0b05065447cc9321ed32ac0.zip | |
FIX: Symbol name exported by plugin is causing a recursive call in Windows
| -rw-r--r-- | plugins/file/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | plugins/mock/uca-mock-camera.c | 4 | ||||
| -rw-r--r-- | 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); |