Don't return NULL.

2007-12-28  Matthias Clasen  <mclasen@redhat.com>

        * gdk/x11/gdkwindow-x11.c (get_default_title): Don't return NULL.

svn path=/trunk/; revision=19274

diff --git a/ChangeLog b/ChangeLog
index 4340095868cae38da74f00d0633c57b47a63d556..20c7f0f3cd2eefa916cc72eb6e8c7e5a37700a06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkwindow-x11.c (get_default_title): Don't return NULL.
+
 2007-12-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkhandlebox.c: Fix the default values of shadow and 

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index ae4fab0630ac741c84fde1dd12d03490f11f8019..452959d05daef116e5517a3091095837c5258231 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -498,6 +498,8 @@ get_default_title (void)
   title = g_get_application_name ();
   if (!title)
     title = g_get_prgname ();
+  if (!title)
+    title = "";
 
   return title;
 }