[gnome-color-manager/gnome-3-2] trivial: fix make check
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager/gnome-3-2] trivial: fix make check
- Date: Wed, 14 Mar 2012 17:47:36 +0000 (UTC)
commit 3db6f3417fe3a456c6d7c8f580d4306cc56f1fff
Author: Richard Hughes <richard hughsie com>
Date: Mon Feb 6 11:44:24 2012 +0000
trivial: fix make check
src/gcm-self-test.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/gcm-self-test.c b/src/gcm-self-test.c
index bd87398..b7ab7ea 100644
--- a/src/gcm-self-test.c
+++ b/src/gcm-self-test.c
@@ -426,8 +426,12 @@ gcm_test_calibrate_func (void)
ret = gcm_calibrate_set_from_exif (GCM_CALIBRATE(calibrate), TESTDATADIR "/test.tif", &error);
g_assert_no_error (error);
g_assert (ret);
- model = gcm_calibrate_get_profile_model (calibrate);
- manufacturer = gcm_calibrate_get_profile_manufacturer (calibrate);
+
+ /* get device properties */
+ g_object_get (calibrate,
+ "manufacturer", &manufacturer,
+ "model", &model,
+ NULL);
g_assert_cmpstr (model, ==, "NIKON D60");
g_assert_cmpstr (manufacturer, ==, "NIKON CORPORATION");
g_free (model);
@@ -673,6 +677,7 @@ gcm_test_utils_func (void)
gboolean ret;
gchar *text;
gchar *filename;
+ GFile *file;
GFile *dest;
text = gcm_utils_linkify ("http://www.dave.org is text http://www.hughsie.com that needs to be linked to http://www.bbc.co.uk really");
@@ -763,8 +768,6 @@ gcm_test_named_color_func (void)
int
main (int argc, char **argv)
{
- if (! g_thread_supported ())
- g_thread_init (NULL);
gtk_init (&argc, &argv);
g_test_init (&argc, &argv, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]