Hello community, here is the log from the commit of package appmenu-qt for openSUSE:Factory checked in at 2013-01-20 11:56:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/appmenu-qt (Old) and /work/SRC/openSUSE:Factory/.appmenu-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "appmenu-qt", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/appmenu-qt/appmenu-qt.changes 2013-01-17 09:35:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.appmenu-qt.new/appmenu-qt.changes 2013-01-20 11:56:21.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 18 13:40:02 UTC 2013 - [email protected] + +- Add check-if-service-is-valid.diff and + do-not-force-menubar-to-be-shown-when-registrar-is-deleted.diff + from upstream (lp#1099357) (lp#1096008) + +------------------------------------------------------------------- @@ -5 +12 @@ - async dbus-calls. + async dbus-calls. (bnc#798334) New: ---- check-if-service-is-valid.diff do-not-force-menubar-to-be-shown-when-registrar-is-deleted.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ appmenu-qt.spec ++++++ --- /var/tmp/diff_new_pack.6HOIip/_old 2013-01-20 11:56:22.000000000 +0100 +++ /var/tmp/diff_new_pack.6HOIip/_new 2013-01-20 11:56:22.000000000 +0100 @@ -24,7 +24,12 @@ Group: System/GUI/KDE Url: https://launchpad.net/appmenu-qt/ Source0: https://launchpad.net/appmenu-qt/trunk/%{version}/+download/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM async-dbus-calls.diff [lp#1096008] Patch0: async-dbus-calls.diff +# PATCH-FIX-UPSTREAM check-if-service-is-valid.diff [lp#1096008] +Patch1: check-if-service-is-valid.diff +# PATCH-FIX-UPSTREAM do-not-force-menubar-to-be-shown-when-registrar-is-deleted.diff [lp#1099357] +Patch2: do-not-force-menubar-to-be-shown-when-registrar-is-deleted.diff BuildRequires: cmake >= 2.8.0 BuildRequires: libdbusmenu-qt-devel >= 0.9.0 BuildRequires: libqt4-devel >= 4.8.0 @@ -41,6 +46,8 @@ %prep %setup -q %patch0 +%patch1 +%patch2 %build export CFLAGS=$RPM_OPT_FLAGS ++++++ check-if-service-is-valid.diff ++++++ === modified file 'src/appmenuplatformmenubar.cpp' --- src/appmenuplatformmenubar.cpp 2013-01-11 15:05:38 +0000 +++ src/appmenuplatformmenubar.cpp 2013-01-14 15:53:32 +0000 @@ -410,6 +410,10 @@ registrar = new com::canonical::AppMenu::Registrar(REGISTRAR_SERVICE, REGISTRAR_PATH, QDBusConnection::sessionBus(), 0); } + if (!registrar || !registrar->isValid()) { + return false; + } + Q_FOREACH(QAction *action, m_menuBar->actions()) { if (!action->isSeparator()) { m_rootMenu->addAction(action); @@ -430,9 +434,9 @@ } m_registeredWinId = winId; - if (registrar) { - registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); - } + + registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); + return true; } ++++++ do-not-force-menubar-to-be-shown-when-registrar-is-deleted.diff ++++++ === modified file 'src/appmenuplatformmenubar.cpp' --- src/appmenuplatformmenubar.cpp 2013-01-14 15:53:32 +0000 +++ src/appmenuplatformmenubar.cpp 2013-01-17 12:53:26 +0000 @@ -92,6 +92,7 @@ { m_nativeMenuBar = NMB_Auto; m_altPressed = false; + m_wasVisibleMenuBar = true; m_menuBar = _menuBar; static int menuBarId = 1; @@ -253,14 +254,17 @@ destroyMenuBar(); QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true); m_menuBar->updateGeometry(); - m_menuBar->setVisible(false); - m_menuBar->setVisible(true); + if (m_wasVisibleMenuBar) { + m_menuBar->setVisible(false); + m_menuBar->setVisible(true); + } return; } // We reach this point if there is a registrar QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, false); m_menuBar->updateGeometry(); + m_wasVisibleMenuBar = m_menuBar->isVisible(); m_menuBar->setVisible(true); m_menuBar->setVisible(false); delete m_adapter; === modified file 'src/appmenuplatformmenubar.h' --- src/appmenuplatformmenubar.h 2012-04-04 15:51:10 +0000 +++ src/appmenuplatformmenubar.h 2013-01-14 10:44:22 +0000 @@ -56,6 +56,7 @@ private: QMenuBar* m_menuBar; + bool m_wasVisibleMenuBar; MenuBarAdapter* m_adapter; enum NativeMenuBar { NMB_DisabledByEnv, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
