diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2012-03-08 11:24:12 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2012-03-08 11:24:12 +0100 |
| commit | d856ae8dc3ef07e6aa568cdbc2f5a2a8296778f3 (patch) | |
| tree | cd37942d7f87ab3baf95ff25fedf6f609a4df378 | |
| parent | eae2ae49770bcbcdbac3997676c71820dd53fdcc (diff) | |
| download | uca-d856ae8dc3ef07e6aa568cdbc2f5a2a8296778f3.tar.gz uca-d856ae8dc3ef07e6aa568cdbc2f5a2a8296778f3.tar.bz2 uca-d856ae8dc3ef07e6aa568cdbc2f5a2a8296778f3.tar.xz uca-d856ae8dc3ef07e6aa568cdbc2f5a2a8296778f3.zip | |
Quick fix for openSUSE 11.3 with GLib 2.24
| -rw-r--r-- | src/uca-camera.c | 6 | ||||
| -rw-r--r-- | test/test-mock.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/uca-camera.c b/src/uca-camera.c index 2d2963b..5b30798 100644 --- a/src/uca-camera.c +++ b/src/uca-camera.c @@ -373,7 +373,8 @@ void uca_camera_start_recording(UcaCamera *camera, GError **error) if (tmp_error == NULL) { camera->priv->is_recording = TRUE; - g_object_notify_by_pspec(G_OBJECT(camera), camera_properties[PROP_IS_RECORDING]); + /* TODO: we should depend on GLib 2.26 and use g_object_notify_by_pspec */ + g_object_notify(G_OBJECT(camera), "is-recording"); } else g_propagate_error(error, tmp_error); @@ -406,7 +407,8 @@ void uca_camera_stop_recording(UcaCamera *camera, GError **error) if (tmp_error == NULL) { camera->priv->is_recording = FALSE; - g_object_notify_by_pspec(G_OBJECT(camera), camera_properties[PROP_IS_RECORDING]); + /* TODO: we should depend on GLib 2.26 and use g_object_notify_by_pspec */ + g_object_notify(G_OBJECT(camera), "is-recording"); } else g_propagate_error(error, tmp_error); diff --git a/test/test-mock.c b/test/test-mock.c index a9284cf..a008504 100644 --- a/test/test-mock.c +++ b/test/test-mock.c @@ -79,7 +79,7 @@ static void test_recording_async(Fixture *fixture, gconstpointer data) uca_camera_set_grab_func(camera, grab_func, &success); g_object_set(G_OBJECT(camera), - "framerate", 10, + "frame-rate", 10, "transfer-asynchronously", TRUE, NULL); @@ -145,9 +145,9 @@ static void test_signal(Fixture *fixture, gconstpointer data) { UcaCamera *camera = UCA_CAMERA(fixture->camera); gboolean success = FALSE; - g_signal_connect(camera, "notify::framerate", (GCallback) on_property_change, &success); + g_signal_connect(camera, "notify::frame-rate", (GCallback) on_property_change, &success); g_object_set(G_OBJECT(camera), - "framerate", 30, + "frame-rate", 30, NULL); g_assert(success == TRUE); } |