From 652698880bd0886a672b0abde9c19ad1fc8c3554 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 4 Aug 2002 21:38:17 +0000 Subject: [PATCH] Fix for binary compatibility across 2.x.y. * gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility across 2.x.y. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmain.c | 11 +++++------ 7 files changed, 35 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f03d6c7798..d869627684 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-08-04 Matthias Clasen + + * gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility + across 2.x.y. + Fri Aug 2 18:00:46 2002 Owen Taylor * gtk/gtkmenu.c: Fix menus resizing dynamically while diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f03d6c7798..d869627684 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-08-04 Matthias Clasen + + * gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility + across 2.x.y. + Fri Aug 2 18:00:46 2002 Owen Taylor * gtk/gtkmenu.c: Fix menus resizing dynamically while diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f03d6c7798..d869627684 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-08-04 Matthias Clasen + + * gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility + across 2.x.y. + Fri Aug 2 18:00:46 2002 Owen Taylor * gtk/gtkmenu.c: Fix menus resizing dynamically while diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f03d6c7798..d869627684 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-08-04 Matthias Clasen + + * gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility + across 2.x.y. + Fri Aug 2 18:00:46 2002 Owen Taylor * gtk/gtkmenu.c: Fix menus resizing dynamically while diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f03d6c7798..d869627684 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-08-04 Matthias Clasen + + * gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility + across 2.x.y. + Fri Aug 2 18:00:46 2002 Owen Taylor * gtk/gtkmenu.c: Fix menus resizing dynamically while diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f03d6c7798..d869627684 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-08-04 Matthias Clasen + + * gtk/gtkmain.c (gtk_check_version): Fix for binary compatibility + across 2.x.y. + Fri Aug 2 18:00:46 2002 Owen Taylor * gtk/gtkmenu.c: Fix menus resizing dynamically while diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 0579d7b462..c573612738 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -177,17 +177,16 @@ gtk_check_version (guint required_major, guint required_minor, guint required_micro) { + gint gtk_effective_micro = 100 * GTK_MINOR_VERSION + GTK_MICRO_VERSION; + gint required_effective_micro = 100 * required_minor + required_micro; + if (required_major > GTK_MAJOR_VERSION) return "Gtk+ version too old (major mismatch)"; if (required_major < GTK_MAJOR_VERSION) return "Gtk+ version too new (major mismatch)"; - if (required_minor > GTK_MINOR_VERSION) - return "Gtk+ version too old (minor mismatch)"; - if (required_minor < GTK_MINOR_VERSION) - return "Gtk+ version too new (minor mismatch)"; - if (required_micro < GTK_MICRO_VERSION - GTK_BINARY_AGE) + if (required_effective_micro < gtk_effective_micro - GTK_BINARY_AGE) return "Gtk+ version too new (micro mismatch)"; - if (required_micro > GTK_MICRO_VERSION) + if (required_effective_micro > gtk_effective_micro) return "Gtk+ version too old (micro mismatch)"; return NULL; }