diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-10-23 16:02:23 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-10-23 16:02:23 +0000 |
| commit | 4e32ede28751a90f747ccd0a7144bd10aa613a36 (patch) | |
| tree | 29f2e22d6a8c302ccc3f6a420316f49754f9394f /gtk/gtksignal.c | |
| parent | 0d5635b36613c0e5eca772e223001d1858433c28 (diff) | |
| download | gtk+-4e32ede28751a90f747ccd0a7144bd10aa613a36.tar.gz | |
Remove G_DISABLE_CONST_RETURNS.
Tue Oct 23 11:53:00 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am (INCLUDES): Remove G_DISABLE_CONST_RETURNS.
* gtk/gtkfontsel.[ch]: Make gtk_font_selection_get_font()
G_CONST_RETURN. (Murray Cumming)
* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_preview_text):
Make G_CONST_RETURN.
* gtk/gtkfilesel.c (open_user_dir): Fix bug with freeing
results of g_get_home_dir().
* gtk/gtkfilesel.c: Make filesel->fileop_file a duplicated
copy. Storing the return from gtk_entry_get_text() is evil.
* gtk/gtkcombo.c gtk/gtkcellrenderertext.c gtk/gtkbindings.c
gtk/gtkfilesel.c gtk/gtkfontsel.c gtk/gtkimmodule.c
gtk/gtkobject.c gtk/gtkoldeditable.c gtk/gtktreedatalist.c
gtk/gtksignal.c: Add const.
* gdk/x11/gdkkeys-x11.c (get_direction): Add missing const.
* gtk/gtktreeview.c: Namespace object data keys to be safe, even
if we are setting them on private widgets.
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search):
Duplicate entry->text before setting it as object data.
Diffstat (limited to 'gtk/gtksignal.c')
| -rw-r--r-- | gtk/gtksignal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index 1d98d92230..b24741dd8f 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -106,7 +106,7 @@ gtk_signal_connect_object_while_alive (GtkObject *object, g_signal_connect_closure_by_id (object, g_signal_lookup (signal, G_OBJECT_TYPE (object)), 0, - g_cclosure_new_object_swap (func, alive_object), + g_cclosure_new_object_swap (func, G_OBJECT (alive_object)), FALSE); } @@ -254,7 +254,7 @@ gtk_arg_set_from_value (GtkArg *arg, case G_TYPE_STRING: if (copy_string) GTK_VALUE_STRING (*arg) = g_value_dup_string (value); else - GTK_VALUE_STRING (*arg) = g_value_get_string (value); + GTK_VALUE_STRING (*arg) = (char *) g_value_get_string (value); break; default: return FALSE; @@ -286,7 +286,7 @@ gtk_argloc_set_from_value (GtkArg *arg, case G_TYPE_STRING: if (copy_string) *GTK_RETLOC_STRING (*arg) = g_value_dup_string (value); else - *GTK_RETLOC_STRING (*arg) = g_value_get_string (value); + *GTK_RETLOC_STRING (*arg) = (char *) g_value_get_string (value); break; default: return FALSE; |