summaryrefslogtreecommitdiff
path: root/gtk/gtkdnd.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2015-11-30 00:55:43 +0100
committerBenjamin Otte <otte@redhat.com>2015-12-02 00:29:30 +0100
commitafad393b15631b18f76708599deb2ea0f097620c (patch)
tree7276b1d50a05ca3da6573b087e93ab6ff3ac6554 /gtk/gtkdnd.c
parent2ce67f00983a5205adec2d4b637c3968f7a5989c (diff)
downloadgtk+-afad393b15631b18f76708599deb2ea0f097620c.tar.gz
iconhelper: Refactor ensure_surface()
Make gtk_icon_helper_ensure_surface() a private function that just ensures the surface was loaded. Add gtk_icon_helper_load_surface() that is called by the above function and the dnd code to actually load the surface.
Diffstat (limited to 'gtk/gtkdnd.c')
-rw-r--r--gtk/gtkdnd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 396f14b4dc..a91c7872d1 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -884,8 +884,8 @@ gtk_drag_get_cursor (GtkWidget *widget,
_gtk_icon_helper_get_size (info->icon_helper,
gtk_widget_get_style_context (widget),
&icon_width, &icon_height);
- icon_surface = _gtk_icon_helper_ensure_surface (info->icon_helper,
- gtk_widget_get_style_context (widget));
+ icon_surface = gtk_icon_helper_load_surface (info->icon_helper,
+ gtk_widget_get_style_context (widget));
icon_x = info->hot_x;
icon_y = info->hot_y;
@@ -2791,7 +2791,7 @@ set_icon_helper (GdkDragContext *context,
gtk_widget_set_size_request (window, width, height);
- source = _gtk_icon_helper_ensure_surface (helper, gtk_widget_get_style_context (window));
+ source = gtk_icon_helper_load_surface (helper, gtk_widget_get_style_context (window));
surface = gdk_window_create_similar_surface (gdk_screen_get_root_window (screen),
CAIRO_CONTENT_COLOR,
width, height);