diff options
| author |  Paweł Zuzelski <pawelz@pld-linux.org> | 2010-01-12 14:16:54 +0100 |
|---|---|---|
| committer |  Mason Larobina <mason.larobina@gmail.com> | 2010-02-02 20:39:55 +0800 |
| commit | 4001c9e918477be55ba2a41dc7bea31bf4848380 (patch) | |
| tree | 342545e5a70a3a2d5306d967956d0a7269d70e76 | |
| parent | ca0273c78b9878b2559be38584aa0ab2e28ae80d (diff) | |
better way to check WebKit version
use webkit_major_version(), webkit_minor_version() and webkit_micro_version()
functions to obtain webkit version instead of accessing WEBKIT_MAJOR_VERSION,
WEBKIT_MINOR_VERSION and WEBKIT_MICRO_VERSION directly.
WEBKIT_M*_VERSION are defined in header files included by uzbl code, so they
contain WebKit version that uzbl was compiled against.
webkit_m*_version() functions return WebKit version that is realy used at the
moment.
| -rw-r--r-- | src/uzbl-core.c | 6 | ||||
| -rw-r--r-- | tests/test-expand.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/uzbl-core.c b/src/uzbl-core.c index bc62e61..e23a64e 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -2467,9 +2467,9 @@ initialize(int argc, char *argv[]) { } event_buffer_timeout(10); - uzbl.info.webkit_major = WEBKIT_MAJOR_VERSION; - uzbl.info.webkit_minor = WEBKIT_MINOR_VERSION; - uzbl.info.webkit_micro = WEBKIT_MICRO_VERSION; + uzbl.info.webkit_major = webkit_major_version(); + uzbl.info.webkit_minor = webkit_minor_version(); + uzbl.info.webkit_micro = webkit_micro_version(); uzbl.info.arch = ARCH; uzbl.info.commit = COMMIT; diff --git a/tests/test-expand.c b/tests/test-expand.c index 4dcd82d..7ea3d61 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -72,11 +72,11 @@ test_useragent (void) { void test_WEBKIT_VERSION (void) { GString* expected = g_string_new(""); - g_string_append(expected, itos(WEBKIT_MAJOR_VERSION)); + g_string_append(expected, itos(webkit_major_version())); g_string_append(expected, " "); - g_string_append(expected, itos(WEBKIT_MINOR_VERSION)); + g_string_append(expected, itos(webkit_minor_version())); g_string_append(expected, " "); - g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); + g_string_append(expected, itos(webkit_micro_version())); g_assert_cmpstr(expand("@WEBKIT_MAJOR @WEBKIT_MINOR @WEBKIT_MICRO", 0), ==, g_string_free(expected, FALSE)); } |