summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-01-10 17:38:18 +0000
committerNoel Power <noel.power@suse.com>2013-01-14 11:32:14 +0000
commit6f047915018e286b6f05d0e87866d5f18c9901cd (patch)
tree2ad8b353e31b5cfde51c934c8d9825ba65f22d0f /vcl/unx/gtk
parent621b7451cf9cf16e29ff19f2cd11a06f6abbacc5 (diff)
export cleaned up dotted version in environment and GtkWindow user-data.
Change-Id: If865127a9a5560f4b3636fb870699e2f3bac0e83 Signed-off-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx4
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx6
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 46a4c01e49f7..736834ac2a22 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_version.h>
#include "vcl/svapp.hxx"
@@ -4173,6 +4174,9 @@ static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen )
if ( !rData.gCacheWindow )
{
rData.gCacheWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+ g_object_set_data( G_OBJECT( rData.gCacheWindow ), "libo-version",
+ (gpointer)LIBO_VERSION_DOTTED );
+
GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(),
nScreen.getXScreen() );
if( pScreen )
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 6bba14123185..398ece4c300a 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1071,11 +1071,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType,
"visible", FALSE, NULL );
g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
-
- static char pVersion[16] = "";
- if( pVersion[0] == '\0' )
- g_sprintf( pVersion, "%d", SUPD );
- g_object_set_data( G_OBJECT( m_pWindow ), "libo-version", pVersion );
+ g_object_set_data( G_OBJECT( m_pWindow ), "libo-version", (gpointer)LIBO_VERSION_DOTTED);
// force wm class hint
m_nExtStyle = ~0;