--- a/pidgin/gtkimhtml.c Mon Nov 29 22:14:00 2010 +0000
+++ b/pidgin/gtkimhtml.c Tue Nov 30 09:03:34 2010 +0000
@@ -499,22 +499,20 @@
gtk_imhtml_tip_paint (GtkIMHtml *imhtml)
- cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(imhtml->tip_window));
+ cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(imhtml->tip_window)); g_return_val_if_fail(GTK_IS_IMHTML(imhtml), FALSE);
layout = gtk_widget_create_pango_layout(imhtml->tip_window, imhtml->tip);
- gtk_paint_flat_box (gtk_widget_get_style(imhtml->tip_window),
- GTK_STATE_NORMAL, GTK_SHADOW_OUT, imhtml->tip_window,
- "tooltip", 0, 0, -1, -1);
- gtk_paint_layout (gtk_widget_get_style(imhtml->tip_window),
- GTK_STATE_NORMAL, TRUE, imhtml->tip_window, NULL, 4, 4, layout);
+ gtk_paint_flat_box (gtk_widget_get_style(imhtml->tip_window), cr, + GTK_STATE_NORMAL, GTK_SHADOW_OUT, imhtml->tip_window, "tooltip", + gtk_paint_layout (gtk_widget_get_style(imhtml->tip_window), cr, + GTK_STATE_NORMAL, TRUE, imhtml->tip_window, NULL, 4, 4, layout); @@ -526,13 +524,13 @@
PangoFontMetrics *font_metrics;
- GtkStyle *style = gtk_widget_get_style(imhtml->tip_window);
- GtkAllocation allocation;
+ GtkStyle *style = gtk_widget_get_style(imhtml->tip_window); + GtkAllocation allocation; gint gap, x, y, h, w, scr_w, baseline_skip;
g_return_val_if_fail(GTK_IS_IMHTML(imhtml), FALSE);
- gtk_widget_get_allocation(GTK_WIDGET(imhtml), &allocation);
+ gtk_widget_get_allocation(GTK_WIDGET(imhtml), &allocation); if (!imhtml->tip || !gtk_widget_is_drawable(GTK_WIDGET(imhtml))) {