Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2013-01-31 10:27:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2012-10-06 18:40:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes 2013-01-31 10:27:42.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Jan 30 16:22:30 UTC 2013 - [email protected] + +- Update to version 1.3.2 + * Bugfix release + * Fixes for running oxygen-gtk with gnome shell + +------------------------------------------------------------------- Old: ---- oxygen-gtk2-1.3.1.tar.bz2 New: ---- oxygen-gtk2-1.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.JJyyYV/_old 2013-01-31 10:27:43.000000000 +0100 +++ /var/tmp/diff_new_pack.JJyyYV/_new 2013-01-31 10:27:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package oxygen-gtk2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: oxygen-gtk2 -Version: 1.3.1 +Version: 1.3.2 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 2.x License: LGPL-2.1+ ++++++ oxygen-gtk2-1.3.1.tar.bz2 -> oxygen-gtk2-1.3.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.1/CMakeLists.txt new/oxygen-gtk2-1.3.2/CMakeLists.txt --- old/oxygen-gtk2-1.3.1/CMakeLists.txt 2012-10-03 09:50:32.000000000 +0200 +++ new/oxygen-gtk2-1.3.2/CMakeLists.txt 2013-01-29 13:32:52.000000000 +0100 @@ -13,7 +13,7 @@ set( CPACK_PACKAGE_VENDOR "[email protected]" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "3" ) -set( CPACK_PACKAGE_VERSION_PATCH "1" ) +set( CPACK_PACKAGE_VERSION_PATCH "2" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## @@ -41,6 +41,11 @@ set( OXYGEN_DEBUG 0 ) endif( NOT DEFINED OXYGEN_DEBUG ) +# Set to 1 to disable all signal hooks used for various features +if( NOT DEFINED DISABLE_SIGNAL_HOOKS ) + set( DISABLE_SIGNAL_HOOKS 0 ) +endif( NOT DEFINED DISABLE_SIGNAL_HOOKS ) + # Set to 1 to enable debug logs regarding inner shadows if( NOT DEFINED OXYGEN_DEBUG_INNERSHADOWS ) set( OXYGEN_DEBUG_INNERSHADOWS 0 ) @@ -150,6 +155,7 @@ ######### message( "Flags: " ) message( " OXYGEN_DEBUG ${OXYGEN_DEBUG}" ) +message( " DISABLE_SIGNAL_HOOKS ${DISABLE_SIGNAL_HOOKS}" ) message( " BUILD_DECO_TEST ${BUILD_DECO_TEST}" ) message( " OXYGEN_DEBUG_INNERSHADOWS ${OXYGEN_DEBUG_INNERSHADOWS}" ) message( " OXYGEN_ICON_HACK ${OXYGEN_ICON_HACK}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.1/config.h.cmake new/oxygen-gtk2-1.3.2/config.h.cmake --- old/oxygen-gtk2-1.3.1/config.h.cmake 2012-10-03 09:50:32.000000000 +0200 +++ new/oxygen-gtk2-1.3.2/config.h.cmake 2013-01-18 11:03:49.000000000 +0100 @@ -15,6 +15,7 @@ #define ENABLE_COMBOBOX_LIST_RESIZE @ENABLE_COMBOBOX_LIST_RESIZE@ #define ENABLE_INNER_SHADOWS_HACK @ENABLE_INNER_SHADOWS_HACK@ #define ENABLE_GROUPBOX_HACK @ENABLE_GROUPBOX_HACK@ +#define DISABLE_SIGNAL_HOOKS @DISABLE_SIGNAL_HOOKS@ #define OXYGEN_VERSION "@OXYGEN_VERSION@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.1/src/animations/oxygenhook.cpp new/oxygen-gtk2-1.3.2/src/animations/oxygenhook.cpp --- old/oxygen-gtk2-1.3.1/src/animations/oxygenhook.cpp 2012-10-03 09:50:32.000000000 +0200 +++ new/oxygen-gtk2-1.3.2/src/animations/oxygenhook.cpp 2013-01-18 11:03:49.000000000 +0100 @@ -35,6 +35,9 @@ //__________________________________________________________________ bool Hook::connect( const std::string& signal, GType typeId, GSignalEmissionHook hookFunction, gpointer data ) { +#if DISABLE_SIGNAL_HOOKS + return false; +#endif // make sure that signal is not already connected assert( _signalId == 0 && _hookId == 0 ); @@ -82,6 +85,9 @@ //____________________________________________________________________ void Hook::disconnect( void ) { +#if DISABLE_SIGNAL_HOOKS + return; +#endif // disconnect signal if( _signalId > 0 && _hookId > 0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.1/src/oxygenqtsettings.cpp new/oxygen-gtk2-1.3.2/src/oxygenqtsettings.cpp --- old/oxygen-gtk2-1.3.1/src/oxygenqtsettings.cpp 2012-10-03 09:50:32.000000000 +0200 +++ new/oxygen-gtk2-1.3.2/src/oxygenqtsettings.cpp 2013-01-29 13:32:23.000000000 +0100 @@ -103,7 +103,7 @@ const bool forced( flags&Forced ); if( _initialized && !forced ) return false; - _initialized = true; + else if( !forced ) _initialized = true; if( g_getenv( "KDE_FULL_SESSION" ) ) { _KDESession = true; } @@ -138,12 +138,15 @@ const bool oxygenChanged = loadOxygen(); // do nothing if settings not changed - if( !(changed||kdeGlobalsChanged||oxygenChanged) ) return false; + if( forced && !(changed||kdeGlobalsChanged||oxygenChanged) ) return false; // dialog button ordering /* TODO: in principle this should be needed only once */ - GtkSettings* settings( gtk_settings_get_default() ); - gtk_settings_set_long_property( settings, "gtk-alternative-button-order", 1, "oxygen-gtk" ); + if( flags & Extra ) + { + GtkSettings* settings( gtk_settings_get_default() ); + gtk_settings_set_long_property( settings, "gtk-alternative-button-order", 1, "oxygen-gtk" ); + } // clear gtkrc _rc.clear(); @@ -182,7 +185,8 @@ } // apply extra programatically set metrics metrics - loadExtraOptions(); + if( flags & Extra ) + { loadExtraOptions(); } // print generated Gtkrc and commit #if OXYGEN_DEBUG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.1/src/oxygenqtsettings.h new/oxygen-gtk2-1.3.2/src/oxygenqtsettings.h --- old/oxygen-gtk2-1.3.1/src/oxygenqtsettings.h 2012-10-03 09:50:32.000000000 +0200 +++ new/oxygen-gtk2-1.3.2/src/oxygenqtsettings.h 2013-01-29 13:32:23.000000000 +0100 @@ -66,7 +66,8 @@ KdeGlobals = 1<<3, Oxygen = 1<<4, Colors = 1<<5, - All = AppName|Icons|Fonts|KdeGlobals|Oxygen|Colors, + Extra = 1<<7, + All = AppName|Icons|Fonts|KdeGlobals|Oxygen|Colors|Extra, Forced = 1<<6 }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.1/src/oxygenstyle.cpp new/oxygen-gtk2-1.3.2/src/oxygenstyle.cpp --- old/oxygen-gtk2-1.3.1/src/oxygenstyle.cpp 2012-10-03 09:50:32.000000000 +0200 +++ new/oxygen-gtk2-1.3.2/src/oxygenstyle.cpp 2013-01-29 13:32:23.000000000 +0100 @@ -45,8 +45,11 @@ { if( !_instance ) { + #if OXYGEN_DEBUG + std::cerr << "Oxygen::Style::instance - creating new style." << std::endl; + #endif + _instance = new Style(); - _instance->initialize(); } return *_instance; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.1/src/oxygenstylewrapper.cpp new/oxygen-gtk2-1.3.2/src/oxygenstylewrapper.cpp --- old/oxygen-gtk2-1.3.1/src/oxygenstylewrapper.cpp 2012-10-03 09:50:32.000000000 +0200 +++ new/oxygen-gtk2-1.3.2/src/oxygenstylewrapper.cpp 2013-01-29 13:32:23.000000000 +0100 @@ -3736,28 +3736,43 @@ void StyleWrapper::instanceInit( OxygenStyle* self ) { - // animations hooks - Style::instance().animations().initializeHooks(); + #if OXYGEN_DEBUG + std::cerr << "Oxygen::StyleWrapper::classInit" << std::endl; + #endif + + // style initialization + Style::instance().initialize(); - // shadow hooks + // hooks + Style::instance().animations().initializeHooks(); Style::instance().shadowHelper().initializeHooks(); - // window manager hooks if( !Style::instance().settings().applicationName().isEclipse() ) { Style::instance().windowManager().initializeHooks(); } - // argb hooks - if( - Style::instance().settings().argbEnabled() && + if( Style::instance().settings().argbEnabled() && !Style::instance().settings().applicationName().isXul() ) { Style::instance().argbHelper().initializeHooks(); } + // disable all animations for openoffice + // and re-enable combobox animations + if( Oxygen::Style::instance().settings().applicationName().isOpenOffice() ) + { + Oxygen::Style::instance().animations().setEnabled( false ); + Oxygen::Style::instance().animations().setInnerShadowsEnabled( false ); + Oxygen::Style::instance().animations().comboBoxEngine().setEnabled( true ); + } + } //_______________________________________________________________________________________________________________ void StyleWrapper::classInit( OxygenStyleClass* klass ) { + #if OXYGEN_DEBUG + std::cerr << "Oxygen::StyleWrapper::classInit" << std::endl; + #endif + GtkStyleClass* style_class( GTK_STYLE_CLASS( klass ) ); _parentClass = static_cast<GtkStyleClass*>( g_type_class_peek_parent( klass ) ); @@ -3816,6 +3831,10 @@ _typeInfo = info; _type = g_type_module_register_type( module, GTK_TYPE_STYLE, "OxygenStyle", &_typeInfo, GTypeFlags(0 ) ); + #if OXYGEN_DEBUG + std::cerr << "Oxygen::StyleWrapper::registerType - done" << std::endl; + #endif + } //_______________________________________________________________________________________________________________ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.1/src/oxygentheme.cpp new/oxygen-gtk2-1.3.2/src/oxygentheme.cpp --- old/oxygen-gtk2-1.3.1/src/oxygentheme.cpp 2012-10-03 09:50:32.000000000 +0200 +++ new/oxygen-gtk2-1.3.2/src/oxygentheme.cpp 2013-01-22 13:47:16.000000000 +0100 @@ -45,18 +45,19 @@ void theme_init( GTypeModule* module ) { + #if OXYGEN_DEBUG + std::cerr << "Oxygen::theme_init" << std::endl; + #endif + Oxygen::RCStyle::registerType( module ); Oxygen::StyleWrapper::registerType( module ); - // disable all animations for openoffice - if( - Oxygen::Style::instance().settings().applicationName().isOpenOffice() ) - { - Oxygen::Style::instance().animations().setEnabled( false ); - Oxygen::Style::instance().animations().setInnerShadowsEnabled( false ); - // re-enable combobox animations - Oxygen::Style::instance().animations().comboBoxEngine().setEnabled( true ); - } + // initialize oxygen here, for XUL applications + // special care is taken to not initialize everything + Oxygen::ApplicationName applicationName; + applicationName.initialize(); + if( applicationName.isXul() ) + { Oxygen::Style::instance().initialize( Oxygen::QtSettings::Forced | Oxygen::QtSettings::Colors ); } } @@ -127,7 +128,4 @@ //_________________________________________________ unsigned long getWindecoABIVersion(void) -{ - return 0x3; -} - +{ return 0x3; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.1/src/oxygenwindowmanager.cpp new/oxygen-gtk2-1.3.2/src/oxygenwindowmanager.cpp --- old/oxygen-gtk2-1.3.1/src/oxygenwindowmanager.cpp 2012-10-03 09:50:32.000000000 +0200 +++ new/oxygen-gtk2-1.3.2/src/oxygenwindowmanager.cpp 2013-01-18 11:03:49.000000000 +0100 @@ -76,8 +76,11 @@ { if( _hooksInitialized ) return; - _styleSetHook.connect( "style-set", (GSignalEmissionHook)styleSetHook, this ); - _buttonReleaseHook.connect( "button-release-event", (GSignalEmissionHook)buttonReleaseHook, this ); + if(_mode!=Disabled) + { + _styleSetHook.connect( "style-set", (GSignalEmissionHook)styleSetHook, this ); + _buttonReleaseHook.connect( "button-release-event", (GSignalEmissionHook)buttonReleaseHook, this ); + } _hooksInitialized = true; } @@ -667,6 +670,7 @@ _blackList.push_back( "MetaFrames" ); _blackList.push_back( "SPHRuler" ); _blackList.push_back( "SPVRuler" ); + _blackList.push_back( "GtkPlug" ); } //________________________________________________________________________________ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
