Hello community,
here is the log from the commit of package qtcurve-gtk2 for openSUSE:Factory
checked in at 2012-05-22 08:18:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-03-02 13:50:04.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qtcurve-gtk2.new/qtcurve-gtk2.changes
2012-05-22 08:18:49.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Apr 26 12:26:57 UTC 2012 - vu...@opensuse.org
+
+- Update to version 1.8.15:
+ + Fix tab activation (via mouse) when configured to drag windows
+ from all empty areas and either highlight is set to 0% or
+ coloured mousr over is set to none.
+ + Check widget is realized before attempting to find
+ menubar/statusbar in GhbCompositor class.
+
+-------------------------------------------------------------------
Old:
----
QtCurve-Gtk2-1.8.14.tar.bz2
New:
----
QtCurve-Gtk2-1.8.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.Ka2VTz/_old 2012-05-22 08:18:50.000000000 +0200
+++ /var/tmp/diff_new_pack.Ka2VTz/_new 2012-05-22 08:18:50.000000000 +0200
@@ -17,7 +17,7 @@
Name: qtcurve-gtk2
-Version: 1.8.14
+Version: 1.8.15
Release: 0
Summary: QtCurve style for GTK+ 2
License: GPL-2.0+
++++++ QtCurve-Gtk2-1.8.14.tar.bz2 -> QtCurve-Gtk2-1.8.15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-Gtk2-1.8.14/CMakeLists.txt
new/QtCurve-Gtk2-1.8.15/CMakeLists.txt
--- old/QtCurve-Gtk2-1.8.14/CMakeLists.txt 2012-02-28 21:18:36.000000000
+0100
+++ new/QtCurve-Gtk2-1.8.15/CMakeLists.txt 2012-04-24 23:19:54.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 "14")
+set(CPACK_PACKAGE_VERSION_PATCH "15")
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.14/ChangeLog
new/QtCurve-Gtk2-1.8.15/ChangeLog
--- old/QtCurve-Gtk2-1.8.14/ChangeLog 2012-02-28 21:18:36.000000000 +0100
+++ new/QtCurve-Gtk2-1.8.15/ChangeLog 2012-04-24 23:19:54.000000000 +0200
@@ -1,3 +1,12 @@
+1.8.15
+------
+1. Fix tab activation (via mouse) when configured to drag windows from all
+ empty areas and either highlight is set to 0% or coloured mousr over is set
+ to none.
+2. Check widget is realized before attempting to find menubar/statusbar in
+ GhbCompositor class. Fixes startup crash wih Handbrake when menu/statusbar
+ hiding is enabled.
+
1.8.14
------
1. Fix reading of KDE settings.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-Gtk2-1.8.14/style/drawing.c
new/QtCurve-Gtk2-1.8.15/style/drawing.c
--- old/QtCurve-Gtk2-1.8.14/style/drawing.c 2012-02-28 21:18:36.000000000
+0100
+++ new/QtCurve-Gtk2-1.8.15/style/drawing.c 2012-04-24 23:19:54.000000000
+0200
@@ -3811,7 +3811,7 @@
if(!mozTab && GTK_APP_JAVA!=qtSettings.app)
{
- if(-1==highlightedTabIndex && highlightingEnabled)
+ if(-1==highlightedTabIndex && (highlightingEnabled ||
opts.windowDrag>=WM_DRAG_ALL))
qtcTabSetup(widget);
qtcTabUpdateRect(widget, tabIndex, x, y, width, height);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-Gtk2-1.8.14/style/qt_settings.c
new/QtCurve-Gtk2-1.8.15/style/qt_settings.c
--- old/QtCurve-Gtk2-1.8.14/style/qt_settings.c 2012-02-28 21:18:36.000000000
+0100
+++ new/QtCurve-Gtk2-1.8.15/style/qt_settings.c 2012-04-24 23:19:54.000000000
+0200
@@ -2170,6 +2170,8 @@
0==strcmp(qtSettings.appName, "plugin-container") ||
0==strcmp(qtSettings.appName, "npviewer.bin") )
qtSettings.app=GTK_APP_FLASH_PLUGIN;
+ else if(0==strcmp(qtSettings.appName, "ghb"))
+ qtSettings.app=GTK_APP_GHB;
/*else if(app==strstr(qtSettings.appName, "gaim"))
qtSettings.app=GTK_APP_GAIM;*/
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-Gtk2-1.8.14/style/qt_settings.h
new/QtCurve-Gtk2-1.8.15/style/qt_settings.h
--- old/QtCurve-Gtk2-1.8.14/style/qt_settings.h 2012-02-28 21:18:36.000000000
+0100
+++ new/QtCurve-Gtk2-1.8.15/style/qt_settings.h 2012-04-24 23:19:54.000000000
+0200
@@ -89,7 +89,8 @@
GTK_APP_JAVA,
GTK_APP_JAVA_SWT,
GTK_APP_EVOLUTION,
- GTK_APP_FLASH_PLUGIN
+ GTK_APP_FLASH_PLUGIN,
+ GTK_APP_GHB
/*GTK_APP_GAIM*/
} EGtkApp;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-Gtk2-1.8.14/style/window.c
new/QtCurve-Gtk2-1.8.15/style/window.c
--- old/QtCurve-Gtk2-1.8.14/style/window.c 2012-02-28 21:18:36.000000000
+0100
+++ new/QtCurve-Gtk2-1.8.15/style/window.c 2012-04-24 23:19:54.000000000
+0200
@@ -37,7 +37,7 @@
typedef struct
{
- int width,
+ int width,
height,
timer;
GtkWidget *widget;
@@ -95,7 +95,7 @@
g_signal_handler_disconnect(G_OBJECT(widget),
(gint)g_object_steal_data(G_OBJECT(widget), "QTC_WINDOW_DESTROY_ID"));
g_signal_handler_disconnect(G_OBJECT(widget),
-
(gint)g_object_steal_data(G_OBJECT(widget), "QTC_WINDOW_STYLE_SET_ID"));
+
(gint)g_object_steal_data(G_OBJECT(widget), "QTC_WINDOW_STYLE_SET_ID"));
if((opts.menubarHiding&HIDE_KEYBOARD) ||
(opts.statusbarHiding&HIDE_KEYBOARD))
g_signal_handler_disconnect(G_OBJECT(widget),
(gint)g_object_steal_data(G_OBJECT(widget), "QTC_WINDOW_KEY_RELEASE_ID"));
@@ -222,7 +222,7 @@
static gboolean qtcWindowDelayedUpdate(gpointer user_data)
{
QtCWindow *window=(QtCWindow *)user_data;
-
+
if(window)
{
if(window->locked)
@@ -241,14 +241,14 @@
return FALSE;
}
}
-
+
return FALSE;
}
static gboolean qtcWindowConfigure(GtkWidget *widget, GdkEventConfigure
*event, gpointer user_data)
{
QtCWindow *window=(QtCWindow *)user_data;
-
+
if(window && (event->width != window->width || event->height !=
window->height))
{
window->width = event->width;
@@ -266,9 +266,14 @@
return FALSE;
}
+static bool canGetChildren(GtkWidget *widget)
+{
+ return GTK_APP_GHB!=qtSettings.app ||
0!=strcmp(g_type_name(qtcWidgetType(widget)), "GhbCompositor") ||
qtcWidgetRealized(widget);
+}
+
GtkWidget * qtcWindowGetMenuBar(GtkWidget *parent, int level)
{
- if(level<3 && GTK_IS_CONTAINER(parent))
+ if(level<3 && GTK_IS_CONTAINER(parent) && canGetChildren(parent) /* &&
qtcWidgetRealized(parent)*/)
{
GtkWidget *rv = NULL;
GList *children =
gtk_container_get_children(GTK_CONTAINER(parent)),
@@ -294,7 +299,7 @@
GtkWidget * qtcWindowGetStatusBar(GtkWidget *parent, int level)
{
- if(level<3 && GTK_IS_CONTAINER(parent))
+ if(level<3 && GTK_IS_CONTAINER(parent) && canGetChildren(parent) /* &&
qtcWidgetRealized(parent)*/)
{
GtkWidget *rv = NULL;
GList *children =
gtk_container_get_children(GTK_CONTAINER(parent)),
@@ -390,7 +395,7 @@
{
GtkWindow *topLevel=GTK_WINDOW(gtk_widget_get_toplevel(w));
GdkDisplay *display=gtk_widget_get_display(GTK_WIDGET(topLevel));
-
+
unsigned short setting=1;
g_object_set_data(G_OBJECT(w), STATUSBAR_ATOM, (gpointer)1);
XChangeProperty(GDK_DISPLAY_XDISPLAY(display),
GDK_WINDOW_XID(qtcWidgetGetWindow(GTK_WIDGET(topLevel))),
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
