diff --git a/ChangeLog b/ChangeLog index 1ae0a86788..e37095a0e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ +Tue Apr 30 14:15:14 2002 Owen Taylor + + * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes. + 2002-04-30 Erwann Chenede - - * gdk/x11/gdkimage-x11.c : retionalized multihead code + * gdk/x11/gdkimage-x11.c : rationalized multihead code in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems. 2002-04-30 Havoc Pennington diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1ae0a86788..e37095a0e3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,6 +1,10 @@ +Tue Apr 30 14:15:14 2002 Owen Taylor + + * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes. + 2002-04-30 Erwann Chenede - - * gdk/x11/gdkimage-x11.c : retionalized multihead code + * gdk/x11/gdkimage-x11.c : rationalized multihead code in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems. 2002-04-30 Havoc Pennington diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1ae0a86788..e37095a0e3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,6 +1,10 @@ +Tue Apr 30 14:15:14 2002 Owen Taylor + + * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes. + 2002-04-30 Erwann Chenede - - * gdk/x11/gdkimage-x11.c : retionalized multihead code + * gdk/x11/gdkimage-x11.c : rationalized multihead code in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems. 2002-04-30 Havoc Pennington diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1ae0a86788..e37095a0e3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,6 +1,10 @@ +Tue Apr 30 14:15:14 2002 Owen Taylor + + * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes. + 2002-04-30 Erwann Chenede - - * gdk/x11/gdkimage-x11.c : retionalized multihead code + * gdk/x11/gdkimage-x11.c : rationalized multihead code in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems. 2002-04-30 Havoc Pennington diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1ae0a86788..e37095a0e3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,6 +1,10 @@ +Tue Apr 30 14:15:14 2002 Owen Taylor + + * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes. + 2002-04-30 Erwann Chenede - - * gdk/x11/gdkimage-x11.c : retionalized multihead code + * gdk/x11/gdkimage-x11.c : rationalized multihead code in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems. 2002-04-30 Havoc Pennington diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1ae0a86788..e37095a0e3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,6 +1,10 @@ +Tue Apr 30 14:15:14 2002 Owen Taylor + + * gtk/gtkfilesel.c gtk/gtkselection.c: Doc fixes. + 2002-04-30 Erwann Chenede - - * gdk/x11/gdkimage-x11.c : retionalized multihead code + * gdk/x11/gdkimage-x11.c : rationalized multihead code in _gdk_x11_copy_to_image. fixes #80256 and ungrab problems. 2002-04-30 Havoc Pennington diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 10992602ef..b6472fe728 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -1170,13 +1170,15 @@ gtk_file_selection_set_filename (GtkFileSelection *filesel, * gtk_file_selection_get_filename: * @filesel: a #GtkFileSelection * - * This function returns the selected filename in encoding of - * g_filename_from_utf8(), which may or may not be the same as that + * This function returns the selected filename in the on-disk encoding + * (See g_filename_from_utf8()), which may or may not be the same as that * used by GTK+ (UTF-8). To convert to UTF-8, call g_filename_to_utf8(). * The returned string points to a statically allocated buffer and * should be copied if you plan to keep it around. + * + * If no file is selected then the selected directory path is returned. * - * Return value: currently-selected filename in locale's encoding + * Return value: currently-selected filename in the on-disk encoding. **/ G_CONST_RETURN gchar* gtk_file_selection_get_filename (GtkFileSelection *filesel) diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index f70cbc3e7f..2b4a4084c0 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -310,7 +310,6 @@ _gtk_plug_remove_from_socket (GtkPlug *plug, /** * gtk_plug_construct: - * @display: the #GdkDisplay associated with @socket_id's #GtkSocket. * @plug: a #GtkPlug. * @socket_id: the XID of the socket's window. *