diff --git a/ChangeLog b/ChangeLog index f0a46a7b8b..b6c5c32a63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jan 21 16:16:29 2000 Owen Taylor + + * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc + take a const string argument like GtkTranslateFunc. This will + require changes in use code. + 2000-01-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f0a46a7b8b..b6c5c32a63 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri Jan 21 16:16:29 2000 Owen Taylor + + * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc + take a const string argument like GtkTranslateFunc. This will + require changes in use code. + 2000-01-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f0a46a7b8b..b6c5c32a63 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Jan 21 16:16:29 2000 Owen Taylor + + * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc + take a const string argument like GtkTranslateFunc. This will + require changes in use code. + 2000-01-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f0a46a7b8b..b6c5c32a63 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Jan 21 16:16:29 2000 Owen Taylor + + * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc + take a const string argument like GtkTranslateFunc. This will + require changes in use code. + 2000-01-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f0a46a7b8b..b6c5c32a63 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Jan 21 16:16:29 2000 Owen Taylor + + * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc + take a const string argument like GtkTranslateFunc. This will + require changes in use code. + 2000-01-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f0a46a7b8b..b6c5c32a63 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Jan 21 16:16:29 2000 Owen Taylor + + * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc + take a const string argument like GtkTranslateFunc. This will + require changes in use code. + 2000-01-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f0a46a7b8b..b6c5c32a63 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Jan 21 16:16:29 2000 Owen Taylor + + * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc + take a const string argument like GtkTranslateFunc. This will + require changes in use code. + 2000-01-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct diff --git a/docs/Changes-1.4.txt b/docs/Changes-1.4.txt index 6b6563f276..3009ee96ab 100644 --- a/docs/Changes-1.4.txt +++ b/docs/Changes-1.4.txt @@ -4,4 +4,6 @@ Incompatible Changes from GTK+-1.2 to GTK+-1.4: has been unused since the main loop was moved into GLib prior to 1.2. - +- The signature for GtkPrintFunc (used for gtk_item_factory_dump_items) + has been changed to take a 'const gchar *' instead of 'gchar *', to + match what we do for glib, and other similar cases. diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 8f73b8b6c0..c47ee8d278 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -778,8 +778,8 @@ gtk_item_factory_dump_items (GtkPatternSpec *path_pspec, } void -gtk_item_factory_print_func (gpointer FILE_pointer, - gchar *string) +gtk_item_factory_print_func (gpointer FILE_pointer, + const gchar *string) { FILE *f_out = FILE_pointer; diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h index dcf21514ab..6b7c21e367 100644 --- a/gtk/gtkitemfactory.h +++ b/gtk/gtkitemfactory.h @@ -42,7 +42,7 @@ extern "C" { typedef void (*GtkPrintFunc) (gpointer func_data, - gchar *str); + const gchar *str); typedef gchar * (*GtkTranslateFunc) (const gchar *path, gpointer func_data); typedef void (*GtkItemFactoryCallback) (); @@ -172,7 +172,7 @@ void gtk_item_factory_dump_rc (const gchar *file_name, GtkPatternSpec *path_pspec, gboolean modified_only); void gtk_item_factory_print_func (gpointer FILE_pointer, - gchar *string); + const gchar *string); void gtk_item_factory_create_item (GtkItemFactory *ifactory, GtkItemFactoryEntry *entry, gpointer callback_data,