Hello community, here is the log from the commit of package qtcurve-gtk2 checked in at Tue Nov 7 12:34:03 CET 2006. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-11-06 08:35:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-11-07 11:49:16.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Nov 7 11:46:06 CET 2006 - stbinner@suse.de + +- fix missing return value statement (#218500) +- update to 0.45.3: + * When determinging background of popup menu for AA'ing, use + shade window colour, not button. + * Fix for "-1" warnings reported by some users. + +------------------------------------------------------------------- Old: ---- QtCurve-Gtk2-0.45.2.tar.gz New: ---- QtCurve-Gtk2-0.45.3.tar.gz fix-return-value.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.HSGzpe/_old 2006-11-07 12:33:31.000000000 +0100 +++ /var/tmp/diff_new_pack.HSGzpe/_new 2006-11-07 12:33:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-gtk2 (Version 0.45.2) +# spec file for package qtcurve-gtk2 (Version 0.45.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,10 +16,11 @@ License: GNU General Public License (GPL) - all versions Group: System/GUI/KDE Summary: QtCurve style for KDE -Version: 0.45.2 +Version: 0.45.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-Gtk2-%{version}.tar.gz +Patch: fix-return-value.diff %if %suse_version > 1010 Recommends: qtcurve-kde %endif @@ -35,6 +36,7 @@ %prep %setup -q -n QtCurve-Gtk2-%{version} +%patch %build ./configure @@ -63,6 +65,12 @@ /opt/gnome/share/themes/QtCurve %changelog -n qtcurve-gtk2 +* Tue Nov 07 2006 - stbinner@suse.de +- fix missing return value statement (#218500) +- update to 0.45.3: + * When determinging background of popup menu for AA'ing, use + shade window colour, not button. + * Fix for "-1" warnings reported by some users. * Mon Nov 06 2006 - stbinner@suse.de - update to 0.45.2: * Fix coloured menubars. ++++++ QtCurve-Gtk2-0.45.2.tar.gz -> QtCurve-Gtk2-0.45.3.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.45.2/ChangeLog new/QtCurve-Gtk2-0.45.3/ChangeLog --- old/QtCurve-Gtk2-0.45.2/ChangeLog 2006-11-05 20:26:23.000000000 +0100 +++ new/QtCurve-Gtk2-0.45.3/ChangeLog 2006-11-06 21:14:35.000000000 +0100 @@ -1,3 +1,9 @@ +0.45.3 +------ +1. When determinging background of popup menu for AA'ing, use + shade window colour, not button. +2. Fix for "-1" warnings reported by some users. + 0.45.2 ------ 1. Fix coloured menubars. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.45.2/configure new/QtCurve-Gtk2-0.45.3/configure --- old/QtCurve-Gtk2-0.45.2/configure 2006-11-05 20:26:40.000000000 +0100 +++ new/QtCurve-Gtk2-0.45.3/configure 2006-11-06 21:17:12.000000000 +0100 @@ -1901,7 +1901,7 @@ PACKAGE=QtCurve-Gtk2 -VERSION=0.45.2 +VERSION=0.45.3 AUTOMAKE_OPTIONS=no-dependencies am__api_version="1.9" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.45.2/configure.in new/QtCurve-Gtk2-0.45.3/configure.in --- old/QtCurve-Gtk2-0.45.2/configure.in 2006-11-05 20:26:23.000000000 +0100 +++ new/QtCurve-Gtk2-0.45.3/configure.in 2006-11-06 21:14:35.000000000 +0100 @@ -1,6 +1,6 @@ AC_INIT(README) PACKAGE=QtCurve-Gtk2 -VERSION=0.45.2 +VERSION=0.45.3 AC_SUBST(VERSION) AUTOMAKE_OPTIONS=no-dependencies AM_INIT_AUTOMAKE($PACKAGE, $VERSION) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.45.2/gtk2/qt_settings.c new/QtCurve-Gtk2-0.45.3/gtk2/qt_settings.c --- old/QtCurve-Gtk2-0.45.2/gtk2/qt_settings.c 2006-11-05 20:17:52.000000000 +0100 +++ new/QtCurve-Gtk2-0.45.3/gtk2/qt_settings.c 2006-11-06 21:14:35.000000000 +0100 @@ -988,6 +988,12 @@ static void shade(GdkColor *a, GdkColor *b, float k); +#define toGtkRcColor(col) \ + (((double)col)/65535.0) + +#define toQtColor(col) \ + ((int)((((double)col)/256.0)+0.5)) + static gboolean qtInit(Options *opts) { if(0==qt_refs++) @@ -1002,6 +1008,9 @@ { char *app=NULL, *path=NULL, +#ifdef HAVE_LOCALE_H + *locale=NULL, +#endif *tmpStr=NULL; GtkSettings *settings=NULL; @@ -1087,10 +1096,10 @@ char version[10]; sprintf(version, "#%02d%02X%02X%02X", - constVersion, - qtSettings.colors[COLOR_TEXT_SELECTED].red>>8, - qtSettings.colors[COLOR_TEXT_SELECTED].green>>8, - qtSettings.colors[COLOR_TEXT_SELECTED].blue>>8); + constVersion, + toQtColor(qtSettings.colors[COLOR_TEXT_SELECTED].red), + toQtColor(qtSettings.colors[COLOR_TEXT_SELECTED].green), + toQtColor(qtSettings.colors[COLOR_TEXT_SELECTED].blue)); /* Read any previous file, and check previous color setting! */ if(f) @@ -1107,7 +1116,8 @@ #ifdef HAVE_LOCALE_H /* We need to switch to the C locale in order to have decimal separator recognized by gtkrc engine */ - char *locale = setlocale(LC_NUMERIC, "C"); + if(!locale) + locale = setlocale(LC_NUMERIC, "C"); #endif fprintf(f, "%s\n" @@ -1118,16 +1128,12 @@ " fg[PRELIGHT]={ %5.3f, %5.3f, %5.3f } }\n" "widget_class \"*Menu*\" style \"QtCMnuFix\"", version, - (qtSettings.colors[COLOR_TEXT_SELECTED].red>>8)/255.0, - (qtSettings.colors[COLOR_TEXT_SELECTED].green>>8)/255.0, - (qtSettings.colors[COLOR_TEXT_SELECTED].blue>>8)/255.0, - (qtSettings.colors[COLOR_TEXT_SELECTED].red>>8)/255.0, - (qtSettings.colors[COLOR_TEXT_SELECTED].green>>8)/255.0, - (qtSettings.colors[COLOR_TEXT_SELECTED].blue>>8)/255.0); -#ifdef HAVE_LOCALE_H - if(locale) - setlocale(LC_NUMERIC, locale); -#endif + toGtkRcColor(qtSettings.colors[COLOR_TEXT_SELECTED].red), + toGtkRcColor(qtSettings.colors[COLOR_TEXT_SELECTED].green), + toGtkRcColor(qtSettings.colors[COLOR_TEXT_SELECTED].blue), + toGtkRcColor(qtSettings.colors[COLOR_TEXT_SELECTED].red), + toGtkRcColor(qtSettings.colors[COLOR_TEXT_SELECTED].green), + toGtkRcColor(qtSettings.colors[COLOR_TEXT_SELECTED].blue)); fclose(f); } @@ -1157,9 +1163,14 @@ { GdkColor col; - shade(&qtSettings.colors[COLOR_BUTTON], &col, POPUPMENU_LIGHT_FACTOR); - sprintf(tmpStr, format, (col.red>>8)/255.0, (col.green>>8)/255.0, - (col.blue>>8)/255.0); +#ifdef HAVE_LOCALE_H + /* We need to switch to the C locale in order + to have decimal separator recognized by gtkrc engine */ + if(!locale) + locale = setlocale(LC_NUMERIC, "C"); +#endif + shade(&qtSettings.colors[COLOR_WINDOW], &col, POPUPMENU_LIGHT_FACTOR); + sprintf(tmpStr, format, toGtkRcColor(col.red), toGtkRcColor(col.green), toGtkRcColor(col.blue)); gtk_rc_parse_string(tmpStr); } } @@ -1270,6 +1281,11 @@ } if(tmpStr) free(tmpStr); + +#ifdef HAVE_LOCALE_H + if(locale) + setlocale(LC_NUMERIC, locale); +#endif } return TRUE; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.45.2/gtk2/qtcurve.c new/QtCurve-Gtk2-0.45.3/gtk2/qtcurve.c --- old/QtCurve-Gtk2-0.45.2/gtk2/qtcurve.c 2006-11-05 20:17:52.000000000 +0100 +++ new/QtCurve-Gtk2-0.45.3/gtk2/qtcurve.c 2006-11-06 21:14:35.000000000 +0100 @@ -314,9 +314,9 @@ { *mid=*b; - mid->red=(a->red+limit(b->red*factor))>>1; \ - mid->green=(a->green+limit(b->green*factor))>>1; \ - mid->blue=(a->blue+limit(b->blue*factor))>>1; \ + mid->red=(a->red+limit(b->red*factor))>>1; + mid->green=(a->green+limit(b->green*factor))>>1; + mid->blue=(a->blue+limit(b->blue*factor))>>1; } static GdkGC * getTempGc(int num, GdkWindow *window) ++++++ fix-return-value.diff ++++++ --- gtk2/animation.c 2006/11/07 10:47:33 1.1 +++ gtk2/animation.c 2006/11/07 10:48:07 @@ -43,6 +43,8 @@ gtk_widget_queue_resize (widget); else gtk_widget_queue_draw (widget); + + return TRUE; } /* ensures that the timer is running */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org