diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2009-10-28 06:35:02 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2009-10-28 06:35:02 +0000 |
| commit | 562ffc3a84da444e6e4728a80479a05c228ddd73 (patch) | |
| tree | b03a87b268e3a0a2370d3fdef14af27abde6125a /src/update_check.c | |
| parent | 5fc2ce811fa944c6af5a16dea9b8f11d200b5ad6 (diff) | |
made release version have priority over development version on update check.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2305 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src/update_check.c')
| -rw-r--r-- | src/update_check.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/update_check.c b/src/update_check.c index 5979ea5f..78247151 100644 --- a/src/update_check.c +++ b/src/update_check.c @@ -42,9 +42,13 @@ static gboolean compare_version(gint major, gint minor, gint micro, - const gchar *extra) + const gchar *extra, gboolean remote_is_release, + gboolean cur_ver_is_release) { - debug_print("comparing %d.%d.%d.%s <> " VERSION "\n", major, minor, micro, extra ? extra : ""); + debug_print("comparing %d.%d.%d.%s (%s) <> " VERSION " (%s)\n", + major, minor, micro, extra ? extra : "", + remote_is_release ? "release" : "devel", + cur_ver_is_release ? "release" : "devel"); if (major > MAJOR_VERSION) return TRUE; @@ -58,6 +62,17 @@ static gboolean compare_version(gint major, gint minor, gint micro, return TRUE; if (micro < MICRO_VERSION) return FALSE; + + /* compare extra version + 3.0.0.a (rel) > 3.0.0 (rel) + 3.0.0 (rel) > 3.0.0.betaX (dev) + 3.0.0.a (rel) > 3.0.0.betaX (dev) + 3.0.0.rc (dev) > 3.0.0.betaX (dev) */ + if (remote_is_release && !cur_ver_is_release) + return TRUE; + if (!remote_is_release && cur_ver_is_release) + return FALSE; + if (extra) { if (strcmp(extra, EXTRA_VERSION) > 0) return TRUE; @@ -169,11 +184,13 @@ static void update_check_cb(GPid pid, gint status, gpointer data) if (!strcmp(key, "RELEASE")) { parse_version_string(val, &major, &minor, µ, &extra); - result = compare_version(major, minor, micro, extra); + result = compare_version(major, minor, micro, extra, + TRUE, cur_ver_is_release); } else if (!cur_ver_is_release && !strcmp(key, "DEVEL")) { parse_version_string(val, &major, &minor, µ, &extra); - result = compare_version(major, minor, micro, extra); + result = compare_version(major, minor, micro, extra, + FALSE, cur_ver_is_release); } if (major + minor + micro != 0) |