Attachment 98 Details for Bug 538 – gtk-qt engine patch.

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] gtk-qt engine patch.

gtk-qt-engine.patch (text/plain), 3.15 KB, created by Calvin Morrison on 2011-10-12 11:18:06 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Calvin Morrison

Created: 2011-10-12 11:18:06 CDT

Size: 3.15 KB

patch

obsolete

>Index: src/qt_theme_draw.c
>===================================================================
>--- src/qt_theme_draw.c	(revision 1258637)
>+++ src/qt_theme_draw.c	(working copy)
>@@ -4,12 +4,6 @@
> #include <gdk/gdk.h>
> #include <gtk/gtk.h>
> #include <glib/glist.h>
>-
>-#ifdef HAVE_BONOBO
>-#include <libbonobo.h>
>-#include <libbonoboui.h>
>-#endif
>-
> #include <gdk-pixbuf/gdk-pixbuf.h>
> 
> #include "qt_style.h"
>@@ -609,8 +603,9 @@
> 	gint width,
> 	gint height)
> {
>-	GList *child1;
>+	GList *child_list;
> 	GtkWidget *child;
>+	
> 	GtkNotebook *nb;
> 	int nbpages;
> 	sanitize_size(window, &width, &height);
>@@ -716,11 +711,7 @@
> 		{
> 			if (GTK_IS_WIDGET(parent))
> 			{
>-#ifdef HAVE_BONOBO
>-				if (GTK_IS_TOOLBAR(parent) || BONOBO_IS_UI_TOOLBAR(parent))
>-#else
> 				if (GTK_IS_TOOLBAR(parent))
>-#endif
> 				{
> 					toolbutton = 1;
> 					break;
>@@ -746,16 +737,16 @@
> 			
> 			if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2))
> 			{
>-				child1 = g_list_first((GTK_BOX(parent)->children));
>-				child = ((GtkBoxChild *)child1->data)->widget;
>+				child_list = g_list_first((GTK_BOX(parent)->children));
>+				child = (GtkWidget *)child_list->data;
> 				if (GTK_IS_ENTRY(child))
> 				{
> 					drawSquareButton(window,style,state_type,x,y,width,height);
> 					return;
> 				}
> 				
>-				child1 = g_list_last((GTK_BOX(parent)->children));
>-				child = ((GtkBoxChild *)child1->data)->widget;
>+				child_list = g_list_last((GTK_BOX(parent)->children));
>+				child = ((GtkBoxChild *)child_list->data)->widget;
> 				if (GTK_IS_ENTRY(child))
> 				{
> 					drawSquareButton(window,style,state_type,x,y,width,height);
>Index: src/CMakeLists.txt
>===================================================================
>--- src/CMakeLists.txt	(revision 1258637)
>+++ src/CMakeLists.txt	(working copy)
>@@ -8,10 +8,10 @@
> ADD_LIBRARY(qtengine SHARED ${GTK-QT-SOURCES})
> 
> # Add GTK's cflags
>-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTK_CFLAGS} ${BONOBO_CFLAGS}")
>-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTK_CFLAGS} ${BONOBO_CFLAGS}")
>+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTK_CFLAGS}")
>+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTK_CFLAGS}")
> 
>-TARGET_LINK_LIBRARIES(qtengine ${GTK_LINK_FLAGS} ${BONOBO_LINK_FLAGS} ${TQT_LIBRARIES} -lX11)
>+TARGET_LINK_LIBRARIES(qtengine ${GTK_LINK_FLAGS} ${TQT_LIBRARIES} -lX11)
> 
> INSTALL(
> 	TARGETS qtengine
>Index: CMakeLists.txt
>===================================================================
>--- CMakeLists.txt	(revision 1258261)
>+++ CMakeLists.txt	(working copy)
>@@ -60,16 +60,6 @@
> MESSAGE(STATUS "Found GTK include dir: ${GTK_INCLUDE_DIR}")
> MESSAGE(STATUS "Found GTK library dir: ${GTK_LIB_DIR}")
> 
>-# Find Bonobo
>-PKGCONFIG(libbonoboui-2.0 BONOBO_INCLUDE_DIR BONOBO_LIB_DIR BONOBO_LINK_FLAGS BONOBO_CFLAGS)
>-IF (NOT BONOBO_INCLUDE_DIR)
>-	MESSAGE(STATUS "bonoboui not found.  Some features of the theme engine will not work as intended.")
>-ELSE (NOT BONOBO_INCLUDE_DIR)
>-	MESSAGE(STATUS "Found Bonobo include dir: ${BONOBO_INCLUDE_DIR}")
>-	MESSAGE(STATUS "Found Bonobo library dir: ${BONOBO_LIB_DIR}")
>-	SET(BONOBO_DEFINITIONS -D HAVE_BONOBO)
>-ENDIF (NOT BONOBO_INCLUDE_DIR)
>-
> # Find msgfmt
> SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
> FIND_PACKAGE(Msgfmt REQUIRED)

Actions: View | Diff

Attachments on bug 538: 98