Hello community, here is the log from the commit of package qtcurve-gtk2 for openSUSE:12.1 checked in at 2011-10-25 17:06:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/qtcurve-gtk2 (Old) and /work/SRC/openSUSE:12.1/.qtcurve-gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtcurve-gtk2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1/qtcurve-gtk2/qtcurve-gtk2.changes 2011-10-24 13:23:17.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.qtcurve-gtk2.new/qtcurve-gtk2.changes 2011-10-25 17:06:44.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Oct 21 11:47:04 UTC 2011 - [email protected] + +- Update to version 1.8.12: + + Fix first shown menu not having a shadow in firefox. + + Fix eclipse crash due to resetting of shadows. + + Disable shadows for SWT where Gtk<2.12. + +------------------------------------------------------------------- Old: ---- QtCurve-Gtk2-1.8.11.tar.bz2 New: ---- QtCurve-Gtk2-1.8.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.XvZBK4/_old 2011-10-25 17:06:46.000000000 +0200 +++ /var/tmp/diff_new_pack.XvZBK4/_new 2011-10-25 17:06:46.000000000 +0200 @@ -18,7 +18,7 @@ Name: qtcurve-gtk2 -Version: 1.8.11 +Version: 1.8.12 Release: 1 License: GPLv2+ Summary: QtCurve style for GTK+ 2 ++++++ QtCurve-Gtk2-1.8.11.tar.bz2 -> QtCurve-Gtk2-1.8.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.11/CMakeLists.txt new/QtCurve-Gtk2-1.8.12/CMakeLists.txt --- old/QtCurve-Gtk2-1.8.11/CMakeLists.txt 2011-10-16 21:45:43.000000000 +0200 +++ new/QtCurve-Gtk2-1.8.12/CMakeLists.txt 2011-10-19 22:24:31.000000000 +0200 @@ -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 "11") +set(CPACK_PACKAGE_VERSION_PATCH "12") set(CPACK_PACKAGE_CONTACT "Craig Drummond <[email protected]>") 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.11/ChangeLog new/QtCurve-Gtk2-1.8.12/ChangeLog --- old/QtCurve-Gtk2-1.8.11/ChangeLog 2011-10-16 21:45:43.000000000 +0200 +++ new/QtCurve-Gtk2-1.8.12/ChangeLog 2011-10-19 22:24:31.000000000 +0200 @@ -1,3 +1,9 @@ +1.8.12 +------ +1. Fix first shown menu not having a shadow in firefox. +2. Fix eclipse crash due to resetting of shadows. +3. Disable shadows for SWT where Gtk<2.12. + 1.8.11 ------ 1. Fix broken titlebars in GIMP, etc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.11/style/qt_settings.c new/QtCurve-Gtk2-1.8.12/style/qt_settings.c --- old/QtCurve-Gtk2-1.8.11/style/qt_settings.c 2011-10-16 21:45:43.000000000 +0200 +++ new/QtCurve-Gtk2-1.8.12/style/qt_settings.c 2011-10-19 22:24:31.000000000 +0200 @@ -2062,7 +2062,7 @@ gboolean firefox=isMozApp(qtSettings.appName, "firefox") || isMozApp(qtSettings.appName, "iceweasel") || isMozApp(qtSettings.appName, "swiftfox") || isMozApp(qtSettings.appName, "xulrunner") || isMozApp(qtSettings.appName, "abrowser"), - thunderbird=!firefox && isMozApp(qtSettings.appName, "thunderbird"), + thunderbird=!firefox && (isMozApp(qtSettings.appName, "thunderbird") || isMozApp(qtSettings.appName, "icedove")), mozThunderbird=!thunderbird && !firefox && isMozApp(qtSettings.appName, "mozilla-thunderbird"), seamonkey=!thunderbird && !firefox && !mozThunderbird && isMozApp(qtSettings.appName, "seamonkey"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.11/style/shadowhelper.c new/QtCurve-Gtk2-1.8.12/style/shadowhelper.c --- old/QtCurve-Gtk2-1.8.11/style/shadowhelper.c 2011-10-16 21:45:43.000000000 +0200 +++ new/QtCurve-Gtk2-1.8.12/style/shadowhelper.c 2011-10-19 22:24:31.000000000 +0200 @@ -20,6 +20,7 @@ #include <string.h> #include <gtk/gtk.h> +#include <gdk/gdk.h> #include <cairo-xlib.h> #include <X11/Xlib.h> #include <X11/Xatom.h> @@ -27,6 +28,7 @@ #include "common.h" #include "qt_settings.h" #include "shadow.h" +#include "compatability.h" #define NUM_SHADOW_PIXMAPS 8 static unsigned long shadowPixmaps[NUM_SHADOW_PIXMAPS]; @@ -65,6 +67,8 @@ static gboolean createPixmapHandles() { + if(DEBUG_ALL==qtSettings.debug) printf(DEBUG_PREFIX "%s\n", __FUNCTION__); + // create atom if(!shadowAtom) { @@ -100,6 +104,8 @@ static void installX11Shadows(GtkWidget* widget) { + if(DEBUG_ALL==qtSettings.debug) printf(DEBUG_PREFIX "%s\n", __FUNCTION__); + if(createPixmapHandles()) { GdkWindow *window = gtk_widget_get_window(widget); @@ -116,20 +122,10 @@ } } -#if 0 -static void uninstallX11Shadows(GtkWidget* widget) const -{ - if(widget); - { - GdkWindow *window = gtk_widget_get_window(widget); - GdkDisplay *display = gtk_widget_get_display(widget); - XDeleteProperty(GDK_DISPLAY_XDISPLAY(display), GDK_WINDOW_XID(window), shadowAtom); - } -} -#endif - static gboolean acceptWidget(GtkWidget* widget) { + if(DEBUG_ALL==qtSettings.debug) printf(DEBUG_PREFIX "%s %X\n", __FUNCTION__, (int)widget); + if(widget && GTK_IS_WINDOW(widget)) { if(GTK_APP_OPEN_OFFICE==qtSettings.app) @@ -137,12 +133,14 @@ else { GdkWindowTypeHint hint=gtk_window_get_type_hint(GTK_WINDOW(widget)); + if(DEBUG_ALL==qtSettings.debug) printf(DEBUG_PREFIX "%s %d\n", __FUNCTION__, (int)hint); return hint == GDK_WINDOW_TYPE_HINT_MENU || hint == GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU || hint == GDK_WINDOW_TYPE_HINT_POPUP_MENU || hint == GDK_WINDOW_TYPE_HINT_COMBO || - hint == GDK_WINDOW_TYPE_HINT_TOOLTIP; + hint == GDK_WINDOW_TYPE_HINT_TOOLTIP || + (hint == GDK_WINDOW_TYPE_HINT_UTILITY && !qtcWidgetGetParent(widget) && isMozilla()) ; // Firefox URL combo } } return FALSE; @@ -150,6 +148,8 @@ static gboolean shadowDestroy(GtkWidget* widget, gpointer data) { + if(DEBUG_ALL==qtSettings.debug) printf(DEBUG_PREFIX "%s %X\n", __FUNCTION__, (int)widget); + if (g_object_get_data(G_OBJECT(widget), "QTC_SHADOW_SET")) { g_signal_handler_disconnect(G_OBJECT(widget), @@ -161,6 +161,7 @@ static gboolean registerWidget(GtkWidget* widget) { + if(DEBUG_ALL==qtSettings.debug) printf(DEBUG_PREFIX "%s %X\n", __FUNCTION__, (int)widget); // check widget if(!(widget && GTK_IS_WINDOW(widget))) return FALSE; @@ -184,38 +185,23 @@ { GtkWidget* widget=GTK_WIDGET(g_value_get_object(params)); + if(DEBUG_ALL==qtSettings.debug) printf(DEBUG_PREFIX "%s %X\n", __FUNCTION__, (int)widget); + if(!GTK_IS_WIDGET(widget)) return FALSE; registerWidget(widget); return TRUE; } -void qtcShadowReset() -{ - GdkScreen* screen = gdk_screen_get_default(); - if(screen) - { - Display* display=GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(screen)); - int i; - for(i=0; i<NUM_SHADOW_PIXMAPS; ++i) - { - if(0!=shadowPixmaps[i]) - { - XFreePixmap(display, shadowPixmaps[i]); - shadowPixmaps[i]=0; - } - } - } - shadowSize = 0; -} - void qtcShadowInitialize() { +#if !GTK_CHECK_VERSION(2, 12, 0) + if(GTK_APP_JAVA_SWT==qtSettings.app) return; // Getting crashes with old Gtk and eclipse :-( +#endif + if(DEBUG_ALL==qtSettings.debug) printf(DEBUG_PREFIX "%s %d\n", __FUNCTION__, qtSettings.app); if(!realizeSignalId) { realizeSignalId = g_signal_lookup("realize", GTK_TYPE_WIDGET); if(realizeSignalId) realizeHookId = g_signal_add_emission_hook(realizeSignalId, (GQuark)0L, (GSignalEmissionHook)realizeHook, 0, 0L); } - - qtcShadowReset(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.11/style/shadowhelper.h new/QtCurve-Gtk2-1.8.12/style/shadowhelper.h --- old/QtCurve-Gtk2-1.8.11/style/shadowhelper.h 2011-10-16 21:45:43.000000000 +0200 +++ new/QtCurve-Gtk2-1.8.12/style/shadowhelper.h 2011-10-19 22:24:31.000000000 +0200 @@ -21,7 +21,6 @@ Boston, MA 02110-1301, USA. */ -extern void qtcShadowReset(); extern void qtcShadowInitialize(); #endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
