summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2007-11-19 05:34:19 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-11-19 05:34:19 +0000
commit5f4e93fe0a84b1c38b9780b78785e27fd7163b61 (patch)
treecef98f3ba3ee1b511623ae2cd066166db9728362
parent0add6313d3b0d127573eba3843f7c5f365e1350b (diff)
downloadgtk+-5f4e93fe0a84b1c38b9780b78785e27fd7163b61.tar.gz
Make gtk_check_version() return const. (#496734, Nicolas Joseph)
2007-11-19 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmain.[hc]: Make gtk_check_version() return const. (#496734, Nicolas Joseph) svn path=/trunk/; revision=19000
-rw-r--r--ChangeLog5
-rw-r--r--gtk/gtkmain.c2
-rw-r--r--gtk/gtkmain.h6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 394d6a0a4b..6b60b76100 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-11-19 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkmain.[hc]: Make gtk_check_version() return const.
+ (#496734, Nicolas Joseph)
+
+2007-11-19 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkaboutdialog.c: Correct docs for program-name property.
(#496689, Thomas Wood)
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index c6972381d4..0c7702ae5e 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -202,7 +202,7 @@ static const GDebugKey gtk_debug_keys[] = {
* The returned string is owned by GTK+ and should not be modified
* or freed.
**/
-gchar*
+const gchar*
gtk_check_version (guint required_major,
guint required_minor,
guint required_micro)
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 9e92d60707..15d08cbe3c 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -76,9 +76,9 @@ GTKMAIN_C_VAR const guint gtk_minor_version;
GTKMAIN_C_VAR const guint gtk_micro_version;
GTKMAIN_C_VAR const guint gtk_binary_age;
GTKMAIN_C_VAR const guint gtk_interface_age;
-gchar* gtk_check_version (guint required_major,
- guint required_minor,
- guint required_micro);
+const gchar* gtk_check_version (guint required_major,
+ guint required_minor,
+ guint required_micro);
/* Initialization, exit, mainloop and miscellaneous routines