Hello community, here is the log from the commit of package qtcurve-gtk2 checked in at Mon Nov 6 22:53:12 CET 2006. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-11-02 14:38:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-11-06 08:35:33.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 6 08:35:07 CET 2006 - stbinner@suse.de + +- update to 0.45.2: + * Fix coloured menubars. + * Fix firefox 2's "stack smashing detected" errors. + * Remove ok/Cancel button swapping from QtCurve.css + +------------------------------------------------------------------- Old: ---- QtCurve-Gtk2-0.45.1.tar.gz drop-moz-box-pack.diff New: ---- QtCurve-Gtk2-0.45.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.DlCdWw/_old 2006-11-06 22:48:37.000000000 +0100 +++ /var/tmp/diff_new_pack.DlCdWw/_new 2006-11-06 22:48:37.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-gtk2 (Version 0.45.1) +# spec file for package qtcurve-gtk2 (Version 0.45.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,11 +16,10 @@ License: GNU General Public License (GPL) - all versions Group: System/GUI/KDE Summary: QtCurve style for KDE -Version: 0.45.1 +Version: 0.45.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-Gtk2-%{version}.tar.gz -Patch: drop-moz-box-pack.diff %if %suse_version > 1010 Recommends: qtcurve-kde %endif @@ -36,7 +35,6 @@ %prep %setup -q -n QtCurve-Gtk2-%{version} -%patch %build ./configure @@ -65,6 +63,11 @@ /opt/gnome/share/themes/QtCurve %changelog -n qtcurve-gtk2 +* Mon Nov 06 2006 - stbinner@suse.de +- update to 0.45.2: + * Fix coloured menubars. + * Fix firefox 2's "stack smashing detected" errors. + * Remove ok/Cancel button swapping from QtCurve.css * Thu Nov 02 2006 - stbinner@suse.de - fix Firefox warning about dropped declaration (#216088) - update to 0.45.1: ++++++ QtCurve-Gtk2-0.45.1.tar.gz -> QtCurve-Gtk2-0.45.2.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.45.1/ChangeLog new/QtCurve-Gtk2-0.45.2/ChangeLog --- old/QtCurve-Gtk2-0.45.1/ChangeLog 2006-10-29 21:36:22.000000000 +0100 +++ new/QtCurve-Gtk2-0.45.2/ChangeLog 2006-11-05 20:26:23.000000000 +0100 @@ -1,3 +1,10 @@ +0.45.2 +------ +1. Fix coloured menubars. +2. Fix firefox 2's "stack smashing detected" errors. +3. Remove ok/Cancel button swapping from QtCurve.css, does not + work for firefox 2.x + 0.45.1 ------ 1. Restore pre 0.45 inactive window highlight. Option is diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.45.1/configure new/QtCurve-Gtk2-0.45.2/configure --- old/QtCurve-Gtk2-0.45.1/configure 2006-10-30 21:50:17.000000000 +0100 +++ new/QtCurve-Gtk2-0.45.2/configure 2006-11-05 20:26:40.000000000 +0100 @@ -1901,7 +1901,7 @@ PACKAGE=QtCurve-Gtk2 -VERSION=0.45.1 +VERSION=0.45.2 AUTOMAKE_OPTIONS=no-dependencies am__api_version="1.9" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.45.1/configure.in new/QtCurve-Gtk2-0.45.2/configure.in --- old/QtCurve-Gtk2-0.45.1/configure.in 2006-10-27 21:57:09.000000000 +0200 +++ new/QtCurve-Gtk2-0.45.2/configure.in 2006-11-05 20:26:23.000000000 +0100 @@ -1,6 +1,6 @@ AC_INIT(README) PACKAGE=QtCurve-Gtk2 -VERSION=0.45.1 +VERSION=0.45.2 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.1/gtk2/QtCurve.css.in new/QtCurve-Gtk2-0.45.2/gtk2/QtCurve.css.in --- old/QtCurve-Gtk2-0.45.1/gtk2/QtCurve.css.in 2006-10-19 21:31:56.000000000 +0200 +++ new/QtCurve-Gtk2-0.45.2/gtk2/QtCurve.css.in 2006-11-05 20:26:23.000000000 +0100 @@ -6,8 +6,13 @@ */ /* Swap Cancel/OK -> OK/Cancel */ +/* The following are commented-out, becuase they cause errors with FireFox 2.x :-( To re-eanble, + delete all lines with COMMENT_OUT on */ + +/* COMMENT_OUT .dialog-button-box { -moz-box-direction: reverse; -moz-box-pack: right; } .dialog-button-box spacer { display: none !important; } +COMMENT_OUT */ /* FireFox >=1.5.x */ prefwindow { -moz-binding: url("file://QTC_MOZILLA_DIR/preferences-rev.xml#prefwindow") !important; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.45.1/gtk2/qt_settings.c new/QtCurve-Gtk2-0.45.2/gtk2/qt_settings.c --- old/QtCurve-Gtk2-0.45.1/gtk2/qt_settings.c 2006-10-27 21:57:09.000000000 +0200 +++ new/QtCurve-Gtk2-0.45.2/gtk2/qt_settings.c 2006-11-05 20:17:52.000000000 +0100 @@ -1003,7 +1003,6 @@ char *app=NULL, *path=NULL, *tmpStr=NULL; - int tmpStrLen=0; GtkSettings *settings=NULL; qtSettings.icons=NULL; @@ -1055,29 +1054,35 @@ if(GTK_APP_MOZILLA==qtSettings.app) { /* KDE's "apply colors to non-KDE apps" messes up firefox! so need to fix this! */ - char filename[QTC_MAX_FILENAME_LEN+1]={'\0'}; char *kdehome=getKdeHome(); - if(kdehome && - strlen(kdehome)<(QTC_MAX_FILENAME_LEN-strlen("/share/config/gtkrc-2.0"))) + if(kdehome) { - sprintf(filename, "%s/share/config/gtkrc-2.0", kdehome); + static const char *constCfgDir="/share/config/"; + static const char *constCfgFile="gtkrc-2.0"; + + tmpStr=(char *)realloc(tmpStr, strlen(kdehome)+strlen(constCfgDir) + +strlen(constCfgFile)+1); + sprintf(tmpStr, "%s%s%s", kdehome, constCfgDir, constCfgFile); char *gtkEnv=getenv("GTK2_RC_FILES"); /* its in the users environment... */ - if(gtkEnv && NULL!=strstr(gtkEnv, filename)) + if(gtkEnv && NULL!=strstr(gtkEnv, tmpStr)) { struct stat statbuf; /* Check if KDE's gtkrc file exists */ - if(-1!=lstat(filename, &statbuf)) + if(-1!=lstat(tmpStr, &statbuf)) { static const int constVersion=1; + static const char *constQtcCfgFile="gtkrc-qtc"; - sprintf(filename, "%s/share/config/gtkrc-qtc", kdehome); + tmpStr=(char *)realloc(tmpStr, strlen(kdehome)+strlen(constCfgDir) + +strlen(constQtcCfgFile)+1); + sprintf(tmpStr, "%s%s%s", kdehome, constCfgDir, constQtcCfgFile); - FILE *f=fopen(filename, "r"); + FILE *f=fopen(tmpStr, "r"); gboolean write_file=TRUE; char version[10]; @@ -1090,14 +1095,14 @@ /* Read any previous file, and check previous color setting! */ if(f) { - char line[8]; + char line[10]; - write_file=NULL==fgets(line, 10, f) || memcmp(version, line, 9); + write_file=NULL==fgets(line, 9, f) || memcmp(version, line, 9); fclose(f); } /* Either it didnt exist, or the colors are different */ - if(write_file && (f=fopen(filename, "w"))) + if(write_file && (f=fopen(tmpStr, "w"))) { #ifdef HAVE_LOCALE_H /* We need to switch to the C locale in order @@ -1128,7 +1133,7 @@ /* Now get gtk to read this file *after* its other gtkrc files - this allows us to undo the KDE settings! */ - gtk_rc_add_default_file(filename); + gtk_rc_add_default_file(tmpStr); } } } @@ -1146,10 +1151,9 @@ static const char *format="style \"QtCLightMnu\" " "{bg[NORMAL]={%5.3f, %5.3f, %5.3f}} " "class \"GtkMenu\" style \"QtCLightMnu\""; - tmpStrLen=strlen(format)+32; - tmpStr=(char *)realloc(tmpStr, tmpStrLen); + tmpStr=(char *)realloc(tmpStr, strlen(format)+32); - if(tmpStrLen) + if(tmpStr) { GdkColor col; @@ -1234,8 +1238,7 @@ "GtkScrollbar::has-secondary-backward-stepper=%d " "GtkScrollbar::has-secondary-forward-stepper=%d } " "class \"*\" style \"QtCSBt\""; - tmpStrLen=strlen(constSbStrFormat)+1; - tmpStr=(char *)realloc(tmpStr, tmpStrLen); + tmpStr=(char *)realloc(tmpStr, strlen(constSbStrFormat)+1); if(GTK_APP_OPEN_OFFICE==qtSettings.app) if(SCROLLBAR_NONE==opts->scrollbarType) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.45.1/gtk2/qtcurve.c new/QtCurve-Gtk2-0.45.2/gtk2/qtcurve.c --- old/QtCurve-Gtk2-0.45.1/gtk2/qtcurve.c 2006-10-29 21:36:22.000000000 +0100 +++ new/QtCurve-Gtk2-0.45.2/gtk2/qtcurve.c 2006-11-05 20:17:52.000000000 +0100 @@ -2402,7 +2402,7 @@ g_signal_connect(G_OBJECT(topLevel), "event", G_CALLBACK(windowEvent), widget); } - if(topLevel && GTK_IS_WINDOW(topLevel)) + if(topLevel && GTK_IS_WINDOW(topLevel) && opts.shadeMenubarOnlyWhenActive) activeWindow=gtk_window_has_toplevel_focus(GTK_WINDOW(topLevel)); } @@ -5395,6 +5395,10 @@ GtkStyle parent_instance; }; +static void qtcurve_style_init(QtCurveStyle *style) +{ +} + void qtcurve_style_register_type(GTypeModule *module) { static const GTypeInfo object_info = @@ -5407,7 +5411,7 @@ NULL, /* class_data */ sizeof(struct _QtCurveGtkStyle), 0, /* n_preallocs */ - NULL, + (GInstanceInitFunc) qtcurve_style_init, NULL }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org