pidgin/ljfisher-ssl-client-auth

don't use GDK_DRAWABLE
cpw.qulogic.gtk3
2010-12-02, Marcus Lundblad
3d78feb90b9c
Parents 8487d731f10d
Children 21e9527afb95
don't use GDK_DRAWABLE
5 files changed, 29 insertions(+), 30 deletions(-)
  • +18 -18
    pidgin/gtkblist.c
  • +1 -1
    pidgin/gtkimhtml.c
  • +1 -1
    pidgin/gtkplugin.c
  • +1 -1
    pidgin/gtkroomlist.c
  • +8 -9
    pidgin/gtkwhiteboard.c
    • --- a/pidgin/gtkblist.c Wed Dec 01 10:44:54 2010 +0000
    +++ b/pidgin/gtkblist.c Thu Dec 02 12:11:26 2010 +0000
    @@ -3028,7 +3028,7 @@
    for(l = gtkblist->tooltipdata; l; l = l->next)
    {
    struct tooltip_data *td = l->data;
    - cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(gtk_widget_get_window(gtkblist->tipwindow)));
    + cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(gtkblist->tipwindow));
    if (td->avatar && pidgin_gdk_pixbuf_is_opaque(td->avatar))
    {
    @@ -3254,8 +3254,8 @@
    pidgin_blist_expand_contact_cb(NULL, node);
    gtk_tree_view_get_cell_area(GTK_TREE_VIEW(tv), path, NULL, &gtkblist->contact_rect);
    - gtkblist->contact_rect.width =
    - gdk_window_get_width(GDK_DRAWABLE(gtk_widget_get_window(tv)));
    + gtkblist->contact_rect.width =
    + gdk_window_get_width(gtk_widget_get_window(tv));
    gtkblist->mouseover_contact = node;
    gtk_tree_path_down (path);
    while (gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &i, path)) {
    @@ -5641,22 +5641,22 @@
    GdkEventExpose *event,
    gpointer user_data)
    {
    - cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(widget));
    - GtkAllocation allocation;
    -
    - gtk_widget_get_allocation(widget, &allocation);
    + cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget));
    + GtkAllocation allocation;
    +
    + gtk_widget_get_allocation(widget, &allocation);
    gtk_paint_flat_box (gtk_widget_get_style(widget),
    - cr,
    - GTK_STATE_NORMAL,
    - GTK_SHADOW_OUT,
    - widget,
    - "tooltip",
    - allocation.x + 1,
    - allocation.y + 1,
    - allocation.width - 2,
    - allocation.height - 2);
    - cairo_destroy(cr);
    -
    + cr,
    + GTK_STATE_NORMAL,
    + GTK_SHADOW_OUT,
    + widget,
    + "tooltip",
    + allocation.x + 1,
    + allocation.y + 1,
    + allocation.width - 2,
    + allocation.height - 2);
    + cairo_destroy(cr);
    +
    return FALSE;
    }
    --- a/pidgin/gtkimhtml.c Wed Dec 01 10:44:54 2010 +0000
    +++ b/pidgin/gtkimhtml.c Thu Dec 02 12:11:26 2010 +0000
    @@ -499,7 +499,7 @@
    gtk_imhtml_tip_paint (GtkIMHtml *imhtml)
    {
    PangoLayout *layout;
    - cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(imhtml->tip_window));
    + cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(imhtml->tip_window));
    g_return_val_if_fail(GTK_IS_IMHTML(imhtml), FALSE);
    --- a/pidgin/gtkplugin.c Wed Dec 01 10:44:54 2010 +0000
    +++ b/pidgin/gtkplugin.c Thu Dec 02 12:11:26 2010 +0000
    @@ -562,7 +562,7 @@
    pidgin_plugins_paint_tooltip(GtkWidget *tipwindow, gpointer data)
    {
    PangoLayout *layout = g_object_get_data(G_OBJECT(tipwindow), "tooltip-plugin");
    - cairo_t *cr = gdk_cairo_create(GDK_DRAWABLE(gtk_widget_get_window(tipwindow)));
    + cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(tipwindow));
    gtk_paint_layout(gtk_widget_get_style(tipwindow), cr, GTK_STATE_NORMAL, FALSE,
    tipwindow, "tooltip",
    6, 6, layout);
    --- a/pidgin/gtkroomlist.c Wed Dec 01 10:44:54 2010 +0000
    +++ b/pidgin/gtkroomlist.c Thu Dec 02 12:11:26 2010 +0000
    @@ -360,7 +360,7 @@
    int max_text_width;
    GtkTextDirection dir = gtk_widget_get_direction(GTK_WIDGET(grl->tree));
    cairo_t *cr =
    - gdk_cairo_create(GDK_DRAWABLE(gtk_widget_get_window(grl->tipwindow)));
    + gdk_cairo_create(gtk_widget_get_window(grl->tipwindow));
    style = gtk_widget_get_style(grl->tipwindow);
    --- a/pidgin/gtkwhiteboard.c Wed Dec 01 10:44:54 2010 +0000
    +++ b/pidgin/gtkwhiteboard.c Thu Dec 02 12:11:26 2010 +0000
    @@ -358,8 +358,8 @@
    PidginWhiteboard *gtkwb = (PidginWhiteboard*)data;
    GdkPixbuf *pixbuf = gtkwb->pixbuf;
    cairo_t *cr;
    - GdkWindow *window = gtk_widget_get_window(widget);
    - GtkAllocation allocation;
    + GdkWindow *window = gtk_widget_get_window(widget);
    + GtkAllocation allocation;
    if (pixbuf) {
    cr = g_object_get_data(G_OBJECT(pixbuf), "cairo-context");
    @@ -368,16 +368,15 @@
    g_object_unref(pixbuf);
    }
    - gtk_widget_get_allocation(widget, &allocation);
    + gtk_widget_get_allocation(widget, &allocation);
    - pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
    - FALSE,
    - gdk_visual_get_depth(GDK_VISUAL(window)),
    - allocation.width, allocation.height);
    + pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
    + FALSE, gdk_visual_get_depth(GDK_VISUAL(window)),
    + allocation.width, allocation.height);
    gtkwb->pixbuf = pixbuf;
    - cr = gdk_cairo_create(GDK_DRAWABLE(pixbuf));
    + cr = gdk_cairo_create(gtk_widget_get_window(widget));
    g_object_set_data(G_OBJECT(pixbuf), "cairo-context", cr);
    gdk_cairo_set_source_color(cr, &gtk_widget_get_style(widget)->white);
    cairo_rectangle(cr,
    @@ -394,7 +393,7 @@
    GdkPixbuf *pixbuf = gtkwb->pixbuf;
    cairo_t *cr;
    - cr = gdk_cairo_create(GDK_DRAWABLE(gtk_widget_get_window(widget)));
    + cr = gdk_cairo_create(gtk_widget_get_window(widget));
    gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
    cairo_rectangle(cr,
    event->area.x, event->area.y,