From 785027751aaa0405342dcda0337dbd73d96a5d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 9 Jun 2010 19:12:27 +0200
Subject: [PATCH] constify gtk_init_with_args()'s GOptionEntry argument

Reported by Nick Schermer in bug
https://bugzilla.gnome.org/show_bug.cgi?id=621111
---
 gtk/gtkmain.c | 12 ++++++------
 gtk/gtkmain.h | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 0ab2b53c82..c8c769f942 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -821,12 +821,12 @@ gtk_get_option_group (gboolean open_default_display)
  * Since: 2.6
  */
 gboolean
-gtk_init_with_args (int            *argc,
-		    char         ***argv,
-		    const char     *parameter_string,
-		    GOptionEntry   *entries,
-		    const char     *translation_domain,
-		    GError        **error)
+gtk_init_with_args (gint                 *argc,
+                    gchar              ***argv,
+                    const gchar          *parameter_string,
+                    const GOptionEntry   *entries,
+                    const gchar          *translation_domain,
+                    GError              **error)
 {
   GOptionContext *context;
   GOptionGroup *gtk_group;
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 9b4c686469..fe4ff99490 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -82,13 +82,13 @@ void     gtk_init                 (int    *argc,
 
 gboolean gtk_init_check           (int    *argc,
                                    char ***argv);
-  
-gboolean gtk_init_with_args       (int            *argc,
-				   char         ***argv,
-				   const char     *parameter_string,
-				   GOptionEntry   *entries,
-				   const char     *translation_domain,
-				   GError        **error);
+
+gboolean gtk_init_with_args       (gint                 *argc,
+                                   gchar              ***argv,
+                                   const gchar          *parameter_string,
+                                   const GOptionEntry   *entries,
+                                   const gchar          *translation_domain,
+                                   GError              **error);
 
 GOptionGroup *gtk_get_option_group (gboolean open_default_display);