if (priv->edit_mode > 0)
{
GdkCursor *cursor;
+ GdkScreen *screen;
GdkPixbuf *pixbuf = NULL;
-
- cursor = gdk_cursor_new (GDK_HAND2);
+
+ screen = gtk_widget_get_screen (GTK_WIDGET (etoolbar));
+
+ cursor = gdk_cursor_new_for_display (gdk_screen_get_display (screen),
+ GDK_HAND2);
gdk_window_set_cursor (widget->window, cursor);
gdk_cursor_unref (cursor);
priv->visibility_paths = NULL;
}
+ g_free (priv->popup_path);
+ priv->popup_path = NULL;
+
if (priv->manager != NULL)
{
if (priv->visibility_id)
GdkVisual *visual;
gint icon_width;
gint icon_height;
+ GdkScreen *screen;
icon_width = DEFAULT_ICON_WIDTH;
- if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_default (),
+ screen = gtk_widget_get_screen (widget);
+
+ if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen),
GTK_ICON_SIZE_LARGE_TOOLBAR,
NULL,
&icon_height))