[Libreoffice-commits] .: 2 commits - desktop/unx

[David Tardon]

 desktop/unx/source/splashx.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 5f76a3280e3ae81d28cd143dabdf5db2d4ac8fe5
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 24 06:32:05 2011 +0200

    surely the name should be LibreOffice

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index dc88343..6bcb10e 100755
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -538,7 +538,7 @@ int splash_create_window( int argc, char** argv )
     size_hints.min_height = height;
     size_hints.max_height = height;
 
-    char *name = "OpenOffice.org";
+    char *name = "LibreOffice";
     char *icon = "icon"; // FIXME
 
     XSetStandardProperties( display, win, name, icon, None,
commit d14700853b39685e5171b5aa99142106cd658aad
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 24 06:30:46 2011 +0200

    handle NULL display gracefully

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index a8a87b0..dc88343 100755
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -574,6 +574,9 @@ static void process_events()
 // Draw the progress
 void splash_draw_progress( int progress )
 {
+    if (!display)
+        return;
+
     // sanity
     if ( progress < 0 )
         progress = 0;
@@ -604,7 +607,8 @@ void splash_draw_progress( int progress )
 // Close the window & cleanup
 void splash_close_window()
 {
-    XCloseDisplay( display );
+    if (display)
+        XCloseDisplay( display );
 #ifdef USE_LIBPNG
     png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
 #else