Hello community,

here is the log from the commit of package qtcurve-gtk2 for openSUSE:Factory 
checked in at 2012-02-20 16:17:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qtcurve-gtk2 (Old)
 and      /work/SRC/openSUSE:Factory/.qtcurve-gtk2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qtcurve-gtk2", Maintainer is "gnome-maintain...@suse.de"

Changes:
--------
--- /work/SRC/openSUSE:Factory/qtcurve-gtk2/qtcurve-gtk2.changes        
2012-02-14 19:06:51.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qtcurve-gtk2.new/qtcurve-gtk2.changes   
2012-02-20 16:17:51.000000000 +0100
@@ -1,0 +2,10 @@
+Sat Feb 18 16:48:57 UTC 2012 - zai...@opensuse.org
+
+- Update to version 1.8.13:
+  + Fix building with newer glibs - only glib.h itself can be
+    included.
+  + Use squared menus and tooltips if using XRender.
+  + Minimum 1ms delay for sub menus.
+- Dropped qtcurve-gtk2-glib2-2.31.patch, fixed upstream.
+
+-------------------------------------------------------------------

Old:
----
  QtCurve-Gtk2-1.8.12.tar.bz2
  qtcurve-gtk2-glib2-2.31.patch

New:
----
  QtCurve-Gtk2-1.8.13.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qtcurve-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.Jh7Ks1/_old  2012-02-20 16:17:52.000000000 +0100
+++ /var/tmp/diff_new_pack.Jh7Ks1/_new  2012-02-20 16:17:52.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           qtcurve-gtk2
-Version:        1.8.12
+Version:        1.8.13
 Release:        0
 Summary:        QtCurve style for GTK+ 2
 License:        GPL-2.0+
@@ -25,8 +25,6 @@
 Url:            http://www.kde-look.org/content/show.php?content=40492
 Source0:        
http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-%{version}.tar.bz2
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM qtcurve-gtk2-glib2-2.31.patch dims...@opensuse.org -- fix 
build with glib 2.31; sent upstream by mail (2011-12-01)
-Patch0:         qtcurve-gtk2-glib2-2.31.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  gtk2-devel
@@ -43,7 +41,6 @@
 
 %prep
 %setup -q -n QtCurve-Gtk2-%{version}
-%patch0 -p1
 
 %build
 mkdir build

++++++ QtCurve-Gtk2-1.8.12.tar.bz2 -> QtCurve-Gtk2-1.8.13.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/QtCurve-Gtk2-1.8.12/CMakeLists.txt 
new/QtCurve-Gtk2-1.8.13/CMakeLists.txt
--- old/QtCurve-Gtk2-1.8.12/CMakeLists.txt      2011-10-19 22:24:31.000000000 
+0200
+++ new/QtCurve-Gtk2-1.8.13/CMakeLists.txt      2012-02-15 23:04:53.000000000 
+0100
@@ -8,7 +8,7 @@
 set(CPACK_SOURCE_GENERATOR "TBZ2")
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
 set(CPACK_PACKAGE_VERSION_MINOR "8")
-set(CPACK_PACKAGE_VERSION_PATCH "12")
+set(CPACK_PACKAGE_VERSION_PATCH "13")
 set(CPACK_PACKAGE_CONTACT "Craig Drummond <craig.p.drumm...@gmail.com>")
 set(QTCURVE_VERSION 
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
 set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/QtCurve-Gtk2-1.8.12/ChangeLog 
new/QtCurve-Gtk2-1.8.13/ChangeLog
--- old/QtCurve-Gtk2-1.8.12/ChangeLog   2011-10-19 22:24:31.000000000 +0200
+++ new/QtCurve-Gtk2-1.8.13/ChangeLog   2012-02-15 23:04:53.000000000 +0100
@@ -1,3 +1,9 @@
+1.8.13
+------
+1. Fix builing with newer glibs - only glib.h itself can be included.
+2. Use squared menus and tooltips if using XRender
+3. Minimum 1ms delay for sub menus.
+
 1.8.12
 ------
 1. Fix first shown menu not having a shadow in firefox.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/QtCurve-Gtk2-1.8.12/common/common.h 
new/QtCurve-Gtk2-1.8.13/common/common.h
--- old/QtCurve-Gtk2-1.8.12/common/common.h     2011-10-19 22:24:31.000000000 
+0200
+++ new/QtCurve-Gtk2-1.8.13/common/common.h     2012-02-15 23:04:53.000000000 
+0100
@@ -254,7 +254,7 @@
 #define MAX_TAB_BGND         5
 
 #define DEFAULT_MENU_DELAY 225
-#define MIN_MENU_DELAY       0
+#define MIN_MENU_DELAY       1
 #define MAX_MENU_DELAY     500
 
 #define DEFAULT_SLIDER_WIDTH  15
@@ -323,7 +323,7 @@
 
 #define DRAW_3D_FULL_BORDER(SUNKEN, APP) \
     (!(SUNKEN) && GB_3D_FULL==qtcGetGradient((APP), &opts)->border)
-    
+
 #define DRAW_3D_BORDER(SUNKEN, APP) \
     (!(SUNKEN) && GB_3D==qtcGetGradient((APP), &opts)->border)
 
@@ -379,7 +379,7 @@
 #else // !defined __cplusplus
 #define BORDER_BLEND_ALPHA(W)    (WIDGET_ENTRY==(W) || WIDGET_SCROLLVIEW==(W) 
? 0.45 : 0.7)
 #endif // !defined __cplusplus
- 
+
 #define ETCH_TOP_ALPHA           0.055
 #define ETCH_BOTTOM_ALPHA        0.1
 // #if defined QT_VERSION && (QT_VERSION >= 0x040000)
@@ -1029,7 +1029,7 @@
             if((*last).pos<0.999)
                 c.insert(GradientStop(1.0, 1.0));
         }
-        return c;                                  
+        return c;
     }
 };
 struct Gradient
@@ -1334,7 +1334,7 @@
 #define IS_EXTRA_ROUND_WIDGET(A) \
             (A!=WIDGET_MENU_ITEM && A!=WIDGET_TAB_FRAME && 
A!=WIDGET_PBAR_TROUGH && A!=WIDGET_PROGRESSBAR && \
              A!=WIDGET_MDI_WINDOW && A!=WIDGET_MDI_WINDOW_TITLE)
-             
+
 #define EXTRA_INNER_RADIUS   3.5
 #define EXTRA_OUTER_RADIUS   4.5
 #define EXTRA_ETCH_RADIUS    5.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/QtCurve-Gtk2-1.8.12/common/config_file.c 
new/QtCurve-Gtk2-1.8.13/common/config_file.c
--- old/QtCurve-Gtk2-1.8.12/common/config_file.c        2011-10-19 
22:24:31.000000000 +0200
+++ new/QtCurve-Gtk2-1.8.13/common/config_file.c        2012-02-15 
23:04:53.000000000 +0100
@@ -1057,7 +1057,7 @@
     if(!ok && strings.size())
         list[0]=0;
 }
-            
+
 #define CFG_READ_COLOR(ENTRY) \
     { \
         QString sVal(cfg.readEntry(#ENTRY)); \
@@ -1107,7 +1107,7 @@
 #endif
 
 #else
-         
+
 static char * lookupCfgHash(GHashTable **cfg, char *key, char *val)
 {
     char *rv=NULL;
@@ -1230,7 +1230,7 @@
             list[0]=0;
     }
 }
-            
+
 #define TO_LATIN1(A) A
 
 #define CFG_READ_COLOR(ENTRY) \
@@ -1291,7 +1291,7 @@
         opts->ENTRY=DEF; \
     else \
         opts->ENTRY=readNumEntry(cfg, #ENTRY, def->ENTRY);
-    
+
 #define CFG_READ_TB_BORDER(ENTRY) \
     opts->ENTRY=toTBarBorder(TO_LATIN1(readStringEntry(cfg, #ENTRY)), 
def->ENTRY);
 
@@ -1450,7 +1450,7 @@
         opts->noDlgFixApps=NULL
 #endif
         if(opts->noMenuStripeApps)
-            g_strfreev(opts->noMenuStripeApps); 
+            g_strfreev(opts->noMenuStripeApps);
         
opts->noBgndGradientApps=opts->noBgndOpacityApps=opts->noMenuBgndOpacityApps=opts->noBgndImageApps=opts->noMenuStripeApps=NULL;
         for(i=0; i<NUM_CUSTOM_GRAD; ++i)
             if(opts->customGradient[i])
@@ -1546,7 +1546,9 @@
         opts->expanderHighlight=DEFAULT_EXPANDER_HIGHLIGHT_FACTOR;
 #endif
 
-    if(opts->menuDelay<MIN_MENU_DELAY || opts->menuDelay>MAX_MENU_DELAY)
+    if(0==opts->menuDelay) /* Qt seems to have issues if delay is 0 - so set 
this to 1 :-) */
+        opts->menuDelay=MIN_MENU_DELAY;
+    else if(opts->menuDelay<MIN_MENU_DELAY || opts->menuDelay>MAX_MENU_DELAY)
         opts->menuDelay=DEFAULT_MENU_DELAY;
 
     if(0==opts->sliderWidth%2)
@@ -1758,7 +1760,7 @@
         {
 #endif
             int     i;
-            
+
             opts->version=readVersionEntry(cfg, VERSION_KEY);
 
 #ifdef __cplusplus
@@ -1783,7 +1785,7 @@
             
opts->noBgndGradientApps=opts->noBgndOpacityApps=opts->noMenuBgndOpacityApps=opts->noBgndImageApps=opts->noMenuStripeApps=NULL;
             for(i=0; i<NUM_CUSTOM_GRAD; ++i)
                 opts->customGradient[i]=NULL;
-            
+
             if(defOpts)
                 copyOpts(defOpts, &newOpts);
             else
@@ -1792,7 +1794,7 @@
                 copyGradients(def, opts);
 #endif
 
-            /* Check if the config file expects old default values... */       
    
+            /* Check if the config file expects old default values... */
             if(opts->version<MAKE_VERSION(1, 6))
             {
                 bool framelessGroupBoxes=readBoolEntry(cfg, 
"framelessGroupBoxes", true),
@@ -2093,7 +2095,7 @@
             CFG_READ_INT_BOOL(windowDrag, WM_DRAG_MENUBAR)
             CFG_READ_BOOL(shadePopupMenu)
             CFG_READ_BOOL(hideShortcutUnderline)
-            
+
 #if defined CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
             CFG_READ_BOOL(stdBtnSizes)
             CFG_READ_INT(titlebarButtons)
@@ -2168,7 +2170,7 @@
             if(opts->version<MAKE_VERSION3(1, 7, 2))
                 opts->noMenuBgndOpacityApps << "gtk";
 #endif
-#endif 
+#endif
 #if defined QT_VERSION && (QT_VERSION >= 0x040000)
             CFG_READ_STRING_LIST(menubarApps)
             CFG_READ_STRING_LIST(statusbarApps)
@@ -2178,7 +2180,7 @@
 #endif
             readDoubleList(cfg, "customShades", opts->customShades, 
NUM_STD_SHADES);
             readDoubleList(cfg, "customAlphas", opts->customAlphas, 
NUM_STD_ALPHAS);
-            
+
 #ifdef __cplusplus
 #if defined CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
             if(opts->titlebarButtons&TITLEBAR_BUTTON_COLOR || 
opts->titlebarButtons&TITLEBAR_BUTTON_ICON_COLOR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/QtCurve-Gtk2-1.8.12/style/animation.c 
new/QtCurve-Gtk2-1.8.13/style/animation.c
--- old/QtCurve-Gtk2-1.8.12/style/animation.c   2011-10-19 22:24:31.000000000 
+0200
+++ new/QtCurve-Gtk2-1.8.13/style/animation.c   2012-02-15 23:04:53.000000000 
+0100
@@ -30,7 +30,7 @@
 
 /* #define CHECK_ANIMATION_TIME 0.5 */
 
-#include <glib/gtimer.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include "common.h"
 #include "compatability.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/QtCurve-Gtk2-1.8.12/style/qt_settings.c 
new/QtCurve-Gtk2-1.8.13/style/qt_settings.c
--- old/QtCurve-Gtk2-1.8.12/style/qt_settings.c 2011-10-19 22:24:31.000000000 
+0200
+++ new/QtCurve-Gtk2-1.8.13/style/qt_settings.c 2012-02-15 23:04:53.000000000 
+0100
@@ -35,10 +35,94 @@
 #include <dirent.h>
 #include <errno.h>
 #include <locale.h>
+#include <gmodule.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/types.h>
+
+#define strcmp_i(A, B) strncmp_i(A, B, -1)
 
 QtCPalette qtcPalette;
 Options    opts;
 
+#define MAX_APP_NAME_LEN 32
+
+#define KDE_CFG_DIR         "/share/config/"
+#define KDEGLOBALS_FILE     KDE_CFG_DIR"kdeglobals"
+#define KDEGLOBALS_SYS_FILE KDE_CFG_DIR"system.kdeglobals"
+
+static char * getKdeHome()
+{
+    static char *kdeHome=NULL;
+
+    if(!kdeHome)
+        if(g_spawn_command_line_sync(qtSettings.qt4 ? "kde4-config 
--expandvars --localprefix"
+                                                    : "kde-config --expandvars 
--localprefix", &kdeHome, NULL, NULL, NULL))
+        {
+            int len=strlen(kdeHome);
+
+            if(len>1 && kdeHome[len-1]=='\n')
+                kdeHome[len-1]='\0';
+        }
+        else
+            kdeHome=0L;
+
+    if(!kdeHome)
+    {
+        char *env=getenv(getuid() ? "KDEHOME" : "KDEROOTHOME");
+
+        if(env)
+            kdeHome=env;
+        else
+        {
+            static char kdeHomeStr[MAX_CONFIG_FILENAME_LEN+1];
+
+            const char *home=qtcGetHome();
+
+            if(home && strlen(home)<(MAX_CONFIG_FILENAME_LEN-5))
+            {
+                sprintf(kdeHomeStr, "%s/.kde", home);
+                kdeHome=kdeHomeStr;
+            }
+        }
+    }
+
+    return kdeHome;
+}
+
+static const char * kdeFile(const char *f)
+{
+    static char kg[MAX_CONFIG_FILENAME_LEN+1]={'\0'};
+
+    char *kdehome=getKdeHome();
+
+    if(kdehome && 
strlen(kdehome)<(MAX_CONFIG_FILENAME_LEN-(strlen(KDE_CFG_DIR)+strlen(f))))
+        sprintf(kg, "%s"KDE_CFG_DIR"%s", kdehome, f);
+
+    return kg;
+}
+
+static const char * kdeGlobals()
+{
+    return kdeFile(KDEGLOBALS_FILE);
+}
+
+static const char * kwinrc()
+{
+    return kdeFile("kwinrc");
+}
+
+#define HICOLOR_ICONS           "hicolor"
+#define HICOLOR_LEN             7
+#define ICON_FOLDER             "/share/icons/"
+#define ICON_FOLDER_SLEN        13
+#define DEFAULT_ICON_PREFIX     "/usr/share/icons"
+#define DEFAULT_ICON_PREFIX_LEN 16
+
 #if 0
 static gboolean drawBackgroundPng(const char *png);
 #endif
@@ -79,17 +163,6 @@
     return (int)c2-(int)c1;
 }
 
-#define strcmp_i(A, B) strncmp_i(A, B, -1)
-
-#include <gmodule.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <sys/types.h>
-
 #define DEFAULT_KDE_ACT_PAL \
 
"active=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e"
 
@@ -160,13 +233,13 @@
 
     SECT_KDE4_COL_WM          =0x008000,
 
-    SECT_QT
+    SECT_KWIN_COMPOS          =0x010000
 };
 
 #define ALL_KDE4_PAL_SETTINGS 
(SECT_KDE4_COL_BUTTON|SECT_KDE4_COL_SEL|SECT_KDE4_COL_TOOLTIP|SECT_KDE4_COL_VIEW|
 \
                                
SECT_KDE4_COL_WINDOW|SECT_KDE4_EFFECT_DISABLED|SECT_KDE4_EFFECT_INACTIVE|SECT_KDE4_COL_WM)
 /*
-  Qt uses the following predefined weights: 
+  Qt uses the following predefined weights:
     Light    = 25,
     Normal   = 50,
     DemiBold = 63,
@@ -272,7 +345,7 @@
                     char *minor=&dot[1];
                     char *major=0L;
                     int  i=0;
-                    
+
                     for(i=-1; (&dot[i])!=version; i--)
                         if(!isdigit(dot[i]))
                         {
@@ -291,45 +364,6 @@
     return ver;
 }
 
-static char * getKdeHome()
-{
-    static char *kdeHome=NULL;
-
-    if(!kdeHome)
-        if(g_spawn_command_line_sync(qtSettings.qt4 ? "kde4-config 
--expandvars --localprefix"
-                                                    : "kde-config --expandvars 
--localprefix", &kdeHome, NULL, NULL, NULL))
-        {
-            int len=strlen(kdeHome);
-
-            if(len>1 && kdeHome[len-1]=='\n')
-                kdeHome[len-1]='\0';
-        }
-        else
-            kdeHome=0L;
-
-    if(!kdeHome)
-    {
-        char *env=getenv(getuid() ? "KDEHOME" : "KDEROOTHOME");
-
-        if(env)
-            kdeHome=env;
-        else
-        {
-            static char kdeHomeStr[MAX_CONFIG_FILENAME_LEN+1];
-
-            const char *home=qtcGetHome();
-
-            if(home && strlen(home)<(MAX_CONFIG_FILENAME_LEN-5))
-            {
-                sprintf(kdeHomeStr, "%s/.kde", home);
-                kdeHome=kdeHomeStr;
-            }
-        }
-    }
-
-    return kdeHome;
-}
-
 static char * themeFileSub(const char *prefix, const char *name, char 
**tmpStr, const char *sub)
 {
     *tmpStr=realloc(*tmpStr, 
strlen(prefix)+1+strlen(sub)+1+strlen(name)+strlen(THEME_SUFFIX)+1);
@@ -439,7 +473,7 @@
     ContrastFade = 1,
     ContrastTint = 2
 } ColAdjustEffects;
-    
+
 typedef struct
 {
     double           amount;
@@ -658,6 +692,36 @@
     }
 }
 
+static void readKwinrc()
+{
+    FILE *f=fopen(kwinrc(), "r");
+
+    if(f)
+    {
+        int  section=SECT_NONE;
+        char line[MAX_CONFIG_INPUT_LINE_LEN+1];
+
+        if(qtSettings.debug)
+            printf(DEBUG_PREFIX"Reading kwinrc\n");
+
+        while(NULL!=fgets(line, MAX_CONFIG_INPUT_LINE_LEN, f))
+            if(line[0]=='[')
+            {
+                if(0==strncmp_i(line, "[Compositing]", 13))
+                    section=SECT_KWIN_COMPOS;
+                else
+                    section=SECT_NONE;
+            }
+            else if (SECT_KWIN_COMPOS==section && 0==strncmp_i(line, 
"Backend=", 8))
+            {
+                if (strstr(line, "=XRender"))
+                    opts.square|=SQUARE_POPUP_MENUS|SQUARE_TOOLTIPS;
+                break;
+            }
+        fclose(f);
+    }
+}
+
 static void readKdeGlobals(const char *rc, int rd, bool first, bool kde4)
 {
     ColorEffect   effects[2];
@@ -1254,31 +1318,6 @@
 
 static int qt_refs=0;
 
-#define MAX_APP_NAME_LEN 32
-
-#define KDE_CFG_DIR         "/share/config/"
-#define KDEGLOBALS_FILE     KDE_CFG_DIR"kdeglobals"
-#define KDEGLOBALS_SYS_FILE KDE_CFG_DIR"system.kdeglobals"
-
-static const char * kdeGlobals()
-{
-    static char kg[MAX_CONFIG_FILENAME_LEN+1]={'\0'};
-
-    char *kdehome=getKdeHome();
-
-    if(kdehome && 
strlen(kdehome)<(MAX_CONFIG_FILENAME_LEN-strlen(KDEGLOBALS_FILE)))
-        sprintf(kg, "%s"KDEGLOBALS_FILE, kdehome);
-
-    return kg;
-}
-
-#define HICOLOR_ICONS           "hicolor"
-#define HICOLOR_LEN             7
-#define ICON_FOLDER             "/share/icons/"
-#define ICON_FOLDER_SLEN        13
-#define DEFAULT_ICON_PREFIX     "/usr/share/icons"
-#define DEFAULT_ICON_PREFIX_LEN 16
-
 static const char * kdeIconsPrefix()
 {
     static char *kdeIcons=NULL;
@@ -1604,12 +1643,12 @@
             std=&qtSettings.colors[PAL_ACTIVE][COLOR_WINDOW_BORDER_TEXT];
         else if(opts.customMenuTextColor)
             std=&opts.customMenuNormTextColor;
-        else if(SHADE_BLEND_SELECTED==opts.shadeMenubars || 
SHADE_SELECTED==opts.shadeMenubars || 
+        else if(SHADE_BLEND_SELECTED==opts.shadeMenubars || 
SHADE_SELECTED==opts.shadeMenubars ||
                 (SHADE_CUSTOM==opts.shadeMenubars && 
TOO_DARK(qtcPalette.menubar[ORIGINAL_SHADE])))
             std=&qtSettings.colors[PAL_ACTIVE][COLOR_TEXT_SELECTED];
         else
             std=&qtSettings.colors[PAL_ACTIVE][COLOR_WINDOW_TEXT];
-  
+
         if(opts.customMenuTextColor)
             active=&opts.customMenuSelTextColor;
         else if(opts.useHighlightForMenu)
@@ -1750,7 +1789,7 @@
         }
         free(contents);
     }
-    
+
     if(menu_text_str)
         free(menu_text_str);
 }
@@ -1792,7 +1831,7 @@
                     {
                         char  *line=NULL;
                         size_t len=0;
-                        
+
                         while(-1!=getline(&line, &len, userJs))
                             if(NULL!=strstr(line, 
"browser.preferences.instantApply"))
                             {
@@ -2178,7 +2217,7 @@
                 opts.gbFactor=0;
                 opts.highlightScrollViews=FALSE;
             }
-                
+
             if(!IS_FLAT(opts.bgndAppearance) && 
excludedApp(opts.noBgndGradientApps))
                 opts.bgndAppearance=APPEARANCE_FLAT;
 
@@ -2191,13 +2230,13 @@
                 opts.bgndOpacity=opts.dlgOpacity=opts.menuBgndOpacity=100;
                 qtSettings.useAlpha=false;
             }
-            
+
             if(excludedApp(opts.noBgndOpacityApps))
                 opts.bgndOpacity=opts.dlgOpacity=100;
 
             if(excludedApp(opts.noMenuBgndOpacityApps))
                 opts.menuBgndOpacity=100, qtSettings.useAlpha=false;
-            
+
             /* Disable usage of alpha channel for older configs, unless app is 
uing opacity... */
             if(qtSettings.useAlpha && opts.version<MAKE_VERSION3(1, 7, 2) && 
100==opts.menuBgndOpacity && 100==opts.dlgOpacity && 100==opts.bgndOpacity)
                 qtSettings.useAlpha=false;
@@ -2209,7 +2248,7 @@
 
             if(opts.menuStripe && excludedApp(opts.noMenuStripeApps))
                 opts.menuStripe=SHADE_NONE;
-            
+
             /*if(isMozilla() || GTK_APP_JAVA==qtSettings.app)*/
             if(GTK_APP_JAVA!=qtSettings.app)
             {
@@ -2311,15 +2350,15 @@
 //                                           "{base[ACTIVE]=\"#%02X%02X%02X\"}"
 //                                           //" 
text[ACTIVE]=\"#%02X%02X%02X\"}"
 //                                           "class \"*\" style 
\""RC_SETTING"HlFix\"";
-// 
+//
 //                 tmpStr=(char *)realloc(tmpStr, strlen(format));
-// 
+//
 //                 if(tmpStr)
 //                 {
 //                     sprintf(tmpStr, format, 
toQtColor(qtSettings.colors[PAL_INACTIVE][COLOR_SELECTED].red),
 //                                             
toQtColor(qtSettings.colors[PAL_INACTIVE][COLOR_SELECTED].green),
 //                                             
toQtColor(qtSettings.colors[PAL_INACTIVE][COLOR_SELECTED].blue));
-// 
+//
 //                     // KDE4 does not set the text colour...
 //                     /*
 //                                             
toQtColor(qtSettings.colors[PAL_ACTIVE][COLOR_TEXT].red),
@@ -2345,7 +2384,7 @@
                 sprintf(tmpStr, constFormat, qtSettings.icons);
                 gtk_rc_parse_string(tmpStr);
             }
-            
+
             if(opts.mapKdeIcons && (path=getIconPath()))
             {
                 const char *iconTheme=qtSettings.icons ? qtSettings.icons : 
"XX";
@@ -2749,12 +2788,12 @@
             }
 
             /* Mozilla seems to assume that all scrolledviews are square :-(
-               So, set the xthickness and ythickness to 1, and in qtcurve.c 
draw these as sqare */
+               So, set the xthickness and ythickness to 1, and in qtcurve.c 
draw these as square */
             if(isMozilla())
                 gtk_rc_parse_string("style \""RC_SETTING"SVm\""
                                     " { xthickness=1 ythickness=1 } "
                                     "widget_class 
\"GtkWindow.GtkFixed.GtkScrolledWindow\" style \""RC_SETTING"SVm\"");
-            
+
             if(TAB_MO_GLOW==opts.tabMouseOver)
                 gtk_rc_parse_string("style \""RC_SETTING"Tab\" { 
GtkNotebook::tab-overlap = 0 } class \"*GtkNotebook\" style 
\""RC_SETTING"Tab\"");
 
@@ -2815,10 +2854,10 @@
 
             if(!opts.menuIcons)
                 gtk_rc_parse_string("gtk-menu-images=0");
-            
+
             if(opts.hideShortcutUnderline)
                 gtk_rc_parse_string("gtk-auto-mnemonics=1");
-            
+
             if(LINE_1DOT==opts.splitters)
                 gtk_rc_parse_string("style \""RC_SETTING"Spl\" { 
GtkPaned::handle_size=7 GtkPaned::handle_width = 7 } "
                                     "class \"*GtkWidget\" style 
\""RC_SETTING"Spl\"");
@@ -2859,6 +2898,11 @@
             if(opts.shadeMenubarOnlyWhenActive && 
SHADE_WINDOW_BORDER==opts.shadeMenubars &&
                EQUAL_COLOR(qtSettings.colors[PAL_ACTIVE][COLOR_WINDOW_BORDER], 
qtSettings.colors[PAL_INACTIVE][COLOR_WINDOW_BORDER]))
                 opts.shadeMenubarOnlyWhenActive=false;
+
+            if (!(opts.square&SQUARE_POPUP_MENUS) || 
!(opts.square&SQUARE_TOOLTIPS))
+            {
+                readKwinrc();
+            }
             setlocale(LC_NUMERIC, locale);
         }
         return TRUE;
@@ -2903,7 +2947,7 @@
 
 #define SET_COLOR_X(st, rc, itm, ITEM, state, QTP_COL, USE_DIS) \
     SET_COLOR_PAL(st, rc, itm, ITEM, state, QTP_COL, PAL_ACTIVE, USE_DIS)
-    
+
 #define SET_COLOR(st, rc, itm, ITEM, state, QTP_COL) \
     SET_COLOR_PAL(st, rc, itm, ITEM, state, QTP_COL, PAL_ACTIVE, TRUE)
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to