[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Boxygen-gtk=5D_src=3A_Merge_branch_=27colors=27?=
From:       Hugo Pereira Da Costa <hugo () oxygen-icons ! org>
Date:       2011-01-31 9:08:55
Message-ID: 20110131090855.6CC47A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 27d3303544a64375af9ef6c64d9990701afddd91 by Hugo Pereira Da Costa.
Pushed by hpereiradacosta into branch 'master'.

Merge branch 'colors'

Conflicts:
	src/oxygenqtsettings.cpp
	src/oxygenqtsettings.h
	src/oxygenstylewrapper.cpp

MM +0    -44   src/oxygenqtsettings.cpp     
MM +0    -3    src/oxygenqtsettings.h     
MM +0    -6    src/oxygenstylewrapper.cpp     

http://commits.kde.org/d1a86b4e/27d3303544a64375af9ef6c64d9990701afddd91

diff --cc src/oxygenqtsettings.h
index 342e9c5,2972395..070b462
--- a/src/oxygenqtsettings.h
+++ b/src/oxygenqtsettings.h
@@@ -72,11 -55,8 +72,8 @@@ namespace Oxyge
          { return _userConfigDir; }
  
          //! initialize
 -        void initialize( void );
 +        void initialize( unsigned int flags = All );
  
-         //! initialize colors
-         void initializeColors( bool forced = false );
- 
          //! palette
          const Palette& palette( void ) const
          { return _palette; }
diff --cc src/oxygenstylewrapper.cpp
index 591934d,324f0e1..edad60f
--- a/src/oxygenstylewrapper.cpp
+++ b/src/oxygenstylewrapper.cpp
@@@ -2882,19 -2894,9 +2882,13 @@@ namespace Oxyge
      void StyleWrapper::instanceInit( OxygenStyle* self )
      {
  
- //         /*
- //         need to initialize the colors here even if done already
- //         elsewhere, to fix some overwritting that occurs with some distros
- //         */
- //         Style::instance().settings().initializeColors();
- 
 -        // initialize window manager hook
 +        // hooks
 +        Style::instance().animations().initializeHooks();
          Style::instance().windowManager().initializeHooks();
  
 +        // also initialize dbus
 +        Oxygen::DBus::instance();
 +
          // initialize argb hooks
          if(
              Style::instance().settings().argbEnabled() &&

[prev in list] [next in list] [prev in thread] [next in thread]