Silently return NULL if the widget is not realized. (#316023, Guillaume

2005-09-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_create_row_drag_icon):
	* gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): Silently
	return NULL if the widget is not realized.  (#316023,
	Guillaume Cottenceau)

diff --git a/ChangeLog b/ChangeLog
index db7628eb5cdee93739356ae8485d633d5a998819..8d8b7e5277617177594677cebd56d1aedf178824 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_create_row_drag_icon): 
+       * gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): Silently
+       return NULL if the widget is not realized.  (#316023,
+       Guillaume Cottenceau)
+
 2005-09-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/gdk.symbols: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index db7628eb5cdee93739356ae8485d633d5a998819..8d8b7e5277617177594677cebd56d1aedf178824 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-09-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_create_row_drag_icon): 
+       * gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): Silently
+       return NULL if the widget is not realized.  (#316023,
+       Guillaume Cottenceau)
+
 2005-09-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/gdk.symbols: 

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 1a68ba96fce4108d2a778cee7afd3e325b6b900b..28cacfdf6100859d3ec19a8dc30688848cd5c25a 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -6658,8 +6658,14 @@ gtk_icon_view_create_drag_icon (GtkIconView *icon_view,
   gint index;
   GdkRectangle area;
 
+  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), NULL);
+  g_return_val_if_fail (path != NULL, NULL);
+
   widget = GTK_WIDGET (icon_view);
 
+  if (!GTK_WIDGET_REALIZED (widget))
+    return NULL;
+
   index = gtk_tree_path_get_indices (path)[0];
 
   for (l = icon_view->priv->items; l; l = l->next) 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index fb3fe4222ec088f8d3deedd5999f7d8572e83b3b..50c8b522760b81e33e9589dc3986aca9d0404c55 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12190,8 +12190,8 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,
  * @tree_view: a #GtkTreeView
  * @path: a #GtkTreePath in @tree_view
  *
- * Creates a #GdkPixmap representation of the row at @path.  This image is used
- * for a drag icon.
+ * Creates a #GdkPixmap representation of the row at @path.  
+ * This image is used for a drag icon.
  *
  * Return value: a newly-allocated pixmap of the drag icon.
  **/
@@ -12214,8 +12214,14 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView  *tree_view,
   gint bin_window_width;
   gboolean is_separator = FALSE;
 
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+  g_return_val_if_fail (path != NULL, NULL);
+
   widget = GTK_WIDGET (tree_view);
 
+  if (!GTK_WIDGET_REALIZED (tree_view))
+    return NULL;
+
   depth = gtk_tree_path_get_depth (path);
 
   _gtk_tree_view_find_node (tree_view,