diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | glib/gconvert.c | 4 | ||||
| -rw-r--r-- | glib/glib.symbols | 1 |
7 files changed, 49 insertions, 1 deletions
@@ -1,5 +1,14 @@ 2004-12-15 Alexander Larsson <alexl@redhat.com> + * glib/gconvert.c: (g_filename_display_basename): + Fix spelling + Add g_return_val_if_fail. + + * glib/glib.symbols: + Add g_filename_display_basename + +2004-12-15 Alexander Larsson <alexl@redhat.com> + * glib/gconvert.[ch]: Add g_filename_display_basename. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b043585c4..f33a7922c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,14 @@ 2004-12-15 Alexander Larsson <alexl@redhat.com> + * glib/gconvert.c: (g_filename_display_basename): + Fix spelling + Add g_return_val_if_fail. + + * glib/glib.symbols: + Add g_filename_display_basename + +2004-12-15 Alexander Larsson <alexl@redhat.com> + * glib/gconvert.[ch]: Add g_filename_display_basename. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b043585c4..f33a7922c 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,14 @@ 2004-12-15 Alexander Larsson <alexl@redhat.com> + * glib/gconvert.c: (g_filename_display_basename): + Fix spelling + Add g_return_val_if_fail. + + * glib/glib.symbols: + Add g_filename_display_basename + +2004-12-15 Alexander Larsson <alexl@redhat.com> + * glib/gconvert.[ch]: Add g_filename_display_basename. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b043585c4..f33a7922c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,14 @@ 2004-12-15 Alexander Larsson <alexl@redhat.com> + * glib/gconvert.c: (g_filename_display_basename): + Fix spelling + Add g_return_val_if_fail. + + * glib/glib.symbols: + Add g_filename_display_basename + +2004-12-15 Alexander Larsson <alexl@redhat.com> + * glib/gconvert.[ch]: Add g_filename_display_basename. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b043585c4..f33a7922c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,14 @@ 2004-12-15 Alexander Larsson <alexl@redhat.com> + * glib/gconvert.c: (g_filename_display_basename): + Fix spelling + Add g_return_val_if_fail. + + * glib/glib.symbols: + Add g_filename_display_basename + +2004-12-15 Alexander Larsson <alexl@redhat.com> + * glib/gconvert.[ch]: Add g_filename_display_basename. diff --git a/glib/gconvert.c b/glib/gconvert.c index ef4b1bb00..14587595a 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -1918,7 +1918,7 @@ make_valid_utf8 (const gchar *name) * You must pass the whole absolute pathname to this functions so that * translation of well known locations can be done. * - * This function is prefered over g_filename_display_name() if you know the + * This function is preferred over g_filename_display_name() if you know the * whole path, as it allows translation. * * Return value: a newly allocated string containing @@ -1931,6 +1931,8 @@ g_filename_display_basename (const gchar *filename) { char *basename; char *display_name; + + g_return_val_if_fail (filename != NULL, NULL); basename = g_path_get_basename (filename); display_name = g_filename_display_name (basename); diff --git a/glib/glib.symbols b/glib/glib.symbols index 20b7ad6cf..2285395ca 100644 --- a/glib/glib.symbols +++ b/glib/glib.symbols @@ -169,6 +169,7 @@ g_file_get_contents PRIVATE g_file_get_contents_utf8 #endif g_filename_display_name G_GNUC_MALLOC +g_filename_display_basename G_GNUC_MALLOC g_filename_from_uri PRIVATE G_GNUC_MALLOC #ifdef G_OS_WIN32 g_filename_from_uri_utf8 G_GNUC_MALLOC |