]> Pileus Git - ~andy/gtk/commitdiff
constify gtk_init_with_args()'s GOptionEntry argument
authorJavier Jardón <jjardon@gnome.org>
Wed, 9 Jun 2010 17:12:27 +0000 (19:12 +0200)
committerJavier Jardón <jjardon@gnome.org>
Thu, 10 Jun 2010 01:51:51 +0000 (03:51 +0200)
Reported by Nick Schermer in bug
https://bugzilla.gnome.org/show_bug.cgi?id=621111

gtk/gtkmain.c
gtk/gtkmain.h

index 0ab2b53c8270b30b66eeb9d877e2a92bc03290c0..c8c769f942992dda8392869ff525d9652b160fc9 100644 (file)
@@ -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;
index 9b4c6864693ca0eae320d78b8bcd0bf7dddb3edf..fe4ff99490dafad551625914a153a2ed9da6c2b4 100644 (file)
@@ -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);