summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <maclas@gmx.de>2004-07-09 02:44:24 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-07-09 02:44:24 +0000
commit0e0a2bc0e603056a745a0f2bc8de770eb230e0c5 (patch)
treec9533238afcd1eff25281e9715ba85295dc872b8
parentb3fbcef83159de5a109b9e72c7d139a45a7b11ee (diff)
downloadgdk-pixbuf-0e0a2bc0e603056a745a0f2bc8de770eb230e0c5.tar.gz
Improve the EXPANDER_MAX warning.
Thu Jul 8 22:38:58 2004 Matthias Clasen <maclas@gmx.de> * gtk/gtktreeview.c: Improve the EXPANDER_MAX warning.
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-2-104
-rw-r--r--ChangeLog.pre-2-64
-rw-r--r--ChangeLog.pre-2-84
-rw-r--r--gtk/gtktreeview.c11
5 files changed, 22 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4acf52e2d..c4e998632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 8 22:38:58 2004 Matthias Clasen <maclas@gmx.de>
+
+ * gtk/gtktreeview.c: Improve the EXPANDER_MAX warning.
+
2004-07-08 Federico Mena Quintero <federico@ximian.com>
Fix #139290:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4acf52e2d..c4e998632 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Thu Jul 8 22:38:58 2004 Matthias Clasen <maclas@gmx.de>
+
+ * gtk/gtktreeview.c: Improve the EXPANDER_MAX warning.
+
2004-07-08 Federico Mena Quintero <federico@ximian.com>
Fix #139290:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4acf52e2d..c4e998632 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Thu Jul 8 22:38:58 2004 Matthias Clasen <maclas@gmx.de>
+
+ * gtk/gtktreeview.c: Improve the EXPANDER_MAX warning.
+
2004-07-08 Federico Mena Quintero <federico@ximian.com>
Fix #139290:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4acf52e2d..c4e998632 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Thu Jul 8 22:38:58 2004 Matthias Clasen <maclas@gmx.de>
+
+ * gtk/gtktreeview.c: Improve the EXPANDER_MAX warning.
+
2004-07-08 Federico Mena Quintero <federico@ximian.com>
Fix #139290:
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 2192169f5..5ecaad0ae 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -11816,8 +11816,7 @@ gtk_tree_view_get_search_equal_func (GtkTreeView *tree_view)
/**
* gtk_tree_view_set_search_equal_func:
* @tree_view: A #GtkTreeView
- * @search_equal_func: the compare function to use during the search, or %NULL
- * to restore the default function
+ * @search_equal_func: the compare function to use during the search
* @search_user_data: user data to pass to @search_equal_func, or %NULL
* @search_destroy: Destroy notifier for @search_user_data, or %NULL
*
@@ -11832,6 +11831,7 @@ gtk_tree_view_set_search_equal_func (GtkTreeView *tree_view,
GtkDestroyNotify search_destroy)
{
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+ g_return_if_fail (search_equal_func !=NULL);
if (tree_view->priv->search_destroy)
(* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);
@@ -12513,11 +12513,12 @@ check_expander_max (gint height,
}
if (!is_separator)
- g_warning ("height less than expander size;\n"
- "please report this in http://bugzilla.gnome.org/show_bug.cgi?id=145528\n");
+ g_warning ("height less than expander size (%d < %d);\n"
+ "please report this in http://bugzilla.gnome.org/show_bug.cgi?id=145528\n",
+ height, expander_size);
}
- return height;
+ return height ? height : expander_size;
}