summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2010-12-07 10:51:36 +0100
committerDavid Tardon <dtardon@redhat.com>2010-12-07 14:18:11 +0100
commitb274d974c7763367072d43ed888e83cacc1cda5f (patch)
tree838701a661cc2069baa6ede40a0cbe8338257d0d
parent040cd5d18f20655656073fc7dbb44d3410023946 (diff)
initialize session client when SalSession is created
This avoids crash on end of desktop session if quickstarter is running and no window has been opened yet.
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx1
-rw-r--r--vcl/unx/source/app/sm.cxx1
-rw-r--r--vcl/unx/source/window/salframe.cxx2
3 files changed, 1 insertions, 3 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index e062dfe89f72..43cb518af758 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1282,7 +1282,6 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
gtk_window_set_keep_above( GTK_WINDOW(m_pWindow), bVisible );
if( bVisible )
{
- SessionManagerClient::open(); // will simply return after the first time
initClientId();
getDisplay()->startupNotificationCompleted();
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx
index 126d7090801d..580436d046f0 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/source/app/sm.cxx
@@ -82,6 +82,7 @@ SalSession* X11SalInstance::CreateSalSession()
{
if( ! pOneInstance )
pOneInstance = new IceSalSession();
+ SessionManagerClient::open();
return pOneInstance;
}
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index 977c0ecdf93f..82a3bd0bcaca 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -1152,8 +1152,6 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
setXEmbedInfo();
if( bVisible )
{
- SessionManagerClient::open(); // will simply return after the first time
-
mbInShow = TRUE;
if( ! (nStyle_ & SAL_FRAME_STYLE_INTRO) )
{