[Libreoffice-commits] .: 2 commits - solenv/bin vcl/inc vcl/unx

[Libreoffice Gerrit user]

 solenv/bin/modules/installer/scriptitems.pm |    2 +-
 vcl/inc/unx/gtk/gtksalmenu.hxx              |    7 +++----
 vcl/unx/gtk/window/gtkframe.cxx             |    8 +++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit b7e6c8459b15a4fdb9ebb269b27cdeea82c8c5c2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 22 14:10:29 2012 +0100

    Use unabbreviated git SHA1 for buildid
    
    Change-Id: I508b97ff41726d2efd8d518e504aef3ba3e8f9b4

diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 15fbdb2..3f32f94 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -702,7 +702,7 @@ sub replace_setup_variables
 
     if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; }   # using "680" instead of "src680"
 
-    my $buildidstring = join( '-', split( ' ', `git log -n 1 --pretty=format:"%h "` ));
+    my $buildidstring = `git log -n 1 --pretty=format:"%H"`;
     if ($? || !$buildidstring) {
         $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
     }
commit b91e719f551c83467fcda32dc29f55025db03e09
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 22 14:12:59 2012 +0100

    Use ENABLE_GMENU_INTEGRATION consistently
    
    Change-Id: I576bfa41b0dce0cba8c92c123f8747cf619fcffb

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 5dad085..cdd29f9 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -16,10 +16,9 @@
 #include <unx/salmenu.h>
 #include <unx/gtk/gtkframe.hxx>
 
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
-#  if GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 32
-#    define ENABLE_GMENU_INTEGRATION
-#  endif
+#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) && \
+    (GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 32)
+#  define ENABLE_GMENU_INTEGRATION
 #  include <unx/gtk/glomenu.h>
 #  include <unx/gtk/gloactiongroup.h>
 #else
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index fdc7290..8db1a1d 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -36,6 +36,8 @@
 #endif
 #if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
 #  include <unx/gtk/gtksalmenu.hxx>
+#endif
+#if defined ENABLE_GMENU_INTEGRATION // defined in gtksalmenu.hxx above
 #  include <unx/gtk/hudawareness.h>
 #endif
 
@@ -99,7 +101,7 @@ using namespace com::sun::star;
 
 int GtkSalFrame::m_nFloats = 0;
 
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#if defined ENABLE_GMENU_INTEGRATION
 static GDBusConnection* pSessionBus = NULL;
 #endif
 
@@ -688,7 +690,7 @@ GtkSalFrame::~GtkSalFrame()
         gtk_widget_destroy( GTK_WIDGET( m_pFixedContainer ) );
     {
         SolarMutexGuard aGuard;
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#if defined ENABLE_GMENU_INTEGRATION
         if(m_nWatcherId)
             g_bus_unwatch_name(m_nWatcherId);
 #endif
@@ -696,7 +698,7 @@ GtkSalFrame::~GtkSalFrame()
         {
             g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", NULL );
 
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#if defined ENABLE_GMENU_INTEGRATION
             if ( pSessionBus )
             {
                 if ( m_nHudAwarenessId )