Fix spelling Add g_return_val_if_fail.

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

diff --git a/ChangeLog b/ChangeLog
index b043585c415aae63912431ba5b9cf735cea704b4..f33a7922ce83c819b33f5b92b0f11cda1edd0627 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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]:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b043585c415aae63912431ba5b9cf735cea704b4..f33a7922ce83c819b33f5b92b0f11cda1edd0627 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+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]:

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index b043585c415aae63912431ba5b9cf735cea704b4..f33a7922ce83c819b33f5b92b0f11cda1edd0627 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+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]:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b043585c415aae63912431ba5b9cf735cea704b4..f33a7922ce83c819b33f5b92b0f11cda1edd0627 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+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]:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b043585c415aae63912431ba5b9cf735cea704b4..f33a7922ce83c819b33f5b92b0f11cda1edd0627 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+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]:

diff --git a/glib/gconvert.c b/glib/gconvert.c
index ef4b1bb009ea19f0339e2b1098db53c8946f38da..14587595a8f558665cbf5cdc9051c8f187bf82db 100644 (file)
--- 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 20b7ad6cf08a0a43113f57e0f71406da8ba3da4d..2285395cafee5c0623f74d1d8850d72a9654e874 100644 (file)
--- 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