TDE
/
gtk-qt-engine
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/gtk-qt-engine
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix potential GTK theme engine crash

Browse Source 
Thanks to MutantTurkey for tracing the problem!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gtk-qt-engine@1258270 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent ba933811da
commit 84c9dfc73d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
src/qt_theme_draw.c
Unescape Escape View File

@ -82,7 +82,7 @@ draw_hline(GtkStyle* style,
gint y) gint y)
{ {
if (gtkQtDebug) if (gtkQtDebug)
printf("HLINE (%d,%d,%d) Widget: %s Detail: %s\n",x1,y1,y,gtk_widget_get_name(widget),detail); printf("HLINE (%d,%p,%d) Widget: %s Detail: %s\n",x1,y1,y,gtk_widget_get_name(widget),detail);
if (DETAIL("vscale")) if (DETAIL("vscale"))
return; return;
@ -483,7 +483,7 @@ draw_arrow(GtkStyle* style,
} }
parent = gtk_widget_get_parent(widget); parent = gtk_widget_get_parent(widget);
drawArrow(window,style, GTK_WIDGET_STATE(parent), arrow_type, x, y, width, height); drawArrow(window,style, gtk_widget_get_state(parent), arrow_type, x, y, width, height);
return; return;
} }
/* if (DETAIL("menuitem")) /* if (DETAIL("menuitem"))
@ -689,7 +689,7 @@ draw_box(GtkStyle * style,
memset( val, 0, sizeof(GValue) ); memset( val, 0, sizeof(GValue) );
g_value_init( val, G_TYPE_BOOLEAN ); g_value_init( val, G_TYPE_BOOLEAN );
g_object_get_property(widget, "inverted", val); g_object_get_property(G_OBJECT(widget), "inverted", val);
inverted = g_value_get_boolean(val); inverted = g_value_get_boolean(val);
g_value_unset(val); g_value_unset(val);
g_free(val); g_free(val);
@ -741,7 +741,7 @@ draw_box(GtkStyle * style,
on a dropdown entry box -- eg. search/replace in gedit */ on a dropdown entry box -- eg. search/replace in gedit */
/* Draw square buttons only if number of children in the hbox is 2 and /* Draw square buttons only if number of children in the hbox is 2 and
* the first child is a entry view (GtkEntry)*/ * the first child is a entry view (GtkEntry)*/
int defaultButton = GTK_WIDGET_HAS_FOCUS(widget); int defaultButton = gtk_widget_has_focus(widget);
GtkWindow* toplevel; GtkWindow* toplevel;
if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2)) if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2))

Write Preview
Loading…
Cancel
Save