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

List:       kde-commits
Subject:    [oxygen-gtk] /: Merge branch '1.4'
From:       Hugo Pereira Da Costa <hugo () oxygen-icons ! org>
Date:       2014-01-19 19:32:20
Message-ID: E1W4y6W-0003wR-11 () scm ! kde ! org
[Download RAW message or body]

Git commit 2358a00401c6c3faa1e4fa125c7f9a177f6e8832 by Hugo Pereira Da Costa.
Committed on 19/01/2014 at 19:31.
Pushed by hpereiradacosta into branch 'master'.

Merge branch '1.4'

M  +17   -1    demo/oxygendemodialog.cpp
M  +10   -0    src/oxygentheme.cpp

http://commits.kde.org/oxygen-gtk/2358a00401c6c3faa1e4fa125c7f9a177f6e8832

diff --cc src/oxygentheme.cpp
index 208cb28,53bac00..25c1b06
--- a/src/oxygentheme.cpp
+++ b/src/oxygentheme.cpp
@@@ -41,8 -41,14 +41,15 @@@
  #include <vector>
  #include <sys/stat.h>
  
 +
  //_________________________________________________
+ int theme_exit_callback( gpointer )
+ {
+     theme_exit();
+     return false;
+ }
+ 
+ //_________________________________________________
  void theme_init( GTypeModule* module )
  {
  
[prev in list] [next in list] [prev in thread] [next in thread]