diff options
author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
---|---|---|
committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
commit | 1d153c1cf91edce537bc64efb01b5a496b35518e (patch) | |
tree | de8ba4359a0341bd0c8c6e1a7495f4f39fb565f1 /src/ephy-spinner.c | |
parent | b50b7039d3b52f33df94e5a3526d9f43a51401ad (diff) | |
parent | 6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6 (diff) | |
download | gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.gz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.bz2 gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.lz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.xz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.zst gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.zip |
Merge commit 'upstream/master' into mc5
Conflicts:
libempathy-gtk/empathy-account-widget.c
src/empathy.c
Diffstat (limited to 'src/ephy-spinner.c')
-rw-r--r-- | src/ephy-spinner.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ephy-spinner.c b/src/ephy-spinner.c index 30ffa57c1..e7285bc0d 100644 --- a/src/ephy-spinner.c +++ b/src/ephy-spinner.c @@ -666,8 +666,8 @@ ephy_spinner_expose (GtkWidget *widget, return FALSE; } - gc = gdk_gc_new (widget->window); - gdk_draw_pixbuf (widget->window, gc, pixbuf, + gc = gdk_gc_new (gtk_widget_get_window (widget)); + gdk_draw_pixbuf (gtk_widget_get_window (widget), gc, pixbuf, dest.x - x_offset - widget->allocation.x, dest.y - y_offset - widget->allocation.y, dest.x, dest.y, |