diff options
| author | Mihael Koep <koep@schneide.com> | 2012-10-19 16:08:05 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-10-19 16:08:05 +0200 |
| commit | 420839db21e0bb60f6be72f1924af74b0ffe8224 (patch) | |
| tree | 92b5d777f2d52d46da92b9e3793eab05d13f7d4f /src | |
| parent | b73c7a9550a39566b881244d95cd0cb2a97e82b3 (diff) | |
| parent | ee6b7a941f7ef7cdcc92c04b80a683d7370f52bd (diff) | |
| download | uca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.gz uca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.bz2 uca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.xz uca-420839db21e0bb60f6be72f1924af74b0ffe8224.zip | |
Merge remote branch 'origin/1.0' into dexela
Conflicts:
CMakeLists.txt
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/cameras/uca-mock-camera.h | 4 | ||||
| -rw-r--r-- | src/cameras/uca-pco-camera.h | 4 | ||||
| -rw-r--r-- | src/cameras/uca-pf-camera.h | 4 | ||||
| -rw-r--r-- | src/cameras/uca-ufo-camera.h | 4 |
5 files changed, 17 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff9108e..033587e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -169,7 +169,7 @@ add_library(uca SHARED set_target_properties(uca PROPERTIES VERSION ${UCA_ABI_VERSION} - SOVERSION ${UCA_VERSION_MINOR}) + SOVERSION ${UCA_VERSION_MAJOR}) target_link_libraries(uca ${uca_LIBS}) diff --git a/src/cameras/uca-mock-camera.h b/src/cameras/uca-mock-camera.h index aa196db..92030f8 100644 --- a/src/cameras/uca-mock-camera.h +++ b/src/cameras/uca-mock-camera.h @@ -21,6 +21,8 @@ #include <glib-object.h> #include "uca-camera.h" +G_BEGIN_DECLS + #define UCA_TYPE_MOCK_CAMERA (uca_mock_camera_get_type()) #define UCA_MOCK_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_MOCK_CAMERA, UcaMockCamera)) #define UCA_IS_MOCK_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_MOCK_CAMERA)) @@ -60,4 +62,6 @@ UcaMockCamera *uca_mock_camera_new(GError **error); GType uca_mock_camera_get_type(void); +G_END_DECLS + #endif diff --git a/src/cameras/uca-pco-camera.h b/src/cameras/uca-pco-camera.h index 87f4277..fdb709a 100644 --- a/src/cameras/uca-pco-camera.h +++ b/src/cameras/uca-pco-camera.h @@ -21,6 +21,8 @@ #include <glib-object.h> #include "uca-camera.h" +G_BEGIN_DECLS + #define UCA_TYPE_PCO_CAMERA (uca_pco_camera_get_type()) #define UCA_PCO_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_PCO_CAMERA, UcaPcoCamera)) #define UCA_IS_PCO_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_PCO_CAMERA)) @@ -86,4 +88,6 @@ UcaPcoCamera *uca_pco_camera_new(GError **error); GType uca_pco_camera_get_type(void); +G_END_DECLS + #endif diff --git a/src/cameras/uca-pf-camera.h b/src/cameras/uca-pf-camera.h index 11ac55a..7e3fe2c 100644 --- a/src/cameras/uca-pf-camera.h +++ b/src/cameras/uca-pf-camera.h @@ -21,6 +21,8 @@ #include <glib-object.h> #include "uca-camera.h" +G_BEGIN_DECLS + #define UCA_TYPE_PF_CAMERA (uca_pf_camera_get_type()) #define UCA_PF_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_PF_CAMERA, UcaPfCamera)) #define UCA_IS_PF_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_PF_CAMERA)) @@ -69,4 +71,6 @@ UcaPfCamera *uca_pf_camera_new(GError **error); GType uca_pf_camera_get_type(void); +G_END_DECLS + #endif diff --git a/src/cameras/uca-ufo-camera.h b/src/cameras/uca-ufo-camera.h index e97eb17..0b52ffb 100644 --- a/src/cameras/uca-ufo-camera.h +++ b/src/cameras/uca-ufo-camera.h @@ -21,6 +21,8 @@ #include <glib-object.h> #include "uca-camera.h" +G_BEGIN_DECLS + #define UCA_TYPE_UFO_CAMERA (uca_ufo_camera_get_type()) #define UCA_UFO_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_UFO_CAMERA, UcaUfoCamera)) #define UCA_IS_UFO_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_UFO_CAMERA)) @@ -71,4 +73,6 @@ UcaUfoCamera *uca_ufo_camera_new(GError **error); GType uca_ufo_camera_get_type(void); +G_END_DECLS + #endif |