summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlynn Foster <glynn.foster@sun.com>2005-01-17 01:33:23 +0000
committerGlynn Foster <gman@src.gnome.org>2005-01-17 01:33:23 +0000
commitbc282cfa65502ea8d8a84553162f5690b8bf328c (patch)
treeeeb2f5672fc4f2624c9f7f4fb8a73fe1f3639ec9
parentUpdated German translation. (diff)
downloadzenity-bc282cfa65502ea8d8a84553162f5690b8bf328c.tar.gz
zenity-bc282cfa65502ea8d8a84553162f5690b8bf328c.tar.bz2
zenity-bc282cfa65502ea8d8a84553162f5690b8bf328c.zip
Patch from Ed Catmur to fix the list dialog on stdin. Fixes #164152.
2005-01-17 Glynn Foster <glynn.foster@sun.com> * src/tree.c: Patch from Ed Catmur to fix the list dialog on stdin. Fixes #164152. * src/about.c, THANKS: Update.
-rw-r--r--ChangeLog6
-rw-r--r--THANKS1
-rw-r--r--src/about.c1
-rw-r--r--src/tree.c4
4 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6572c8ca..5549a60e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-17 Glynn Foster <glynn.foster@sun.com>
+
+ * src/tree.c: Patch from Ed Catmur to fix the list dialog
+ on stdin. Fixes #164152.
+ * src/about.c, THANKS: Update.
+
2005-01-11 Glynn Foster <glynn.foster@sun.com>
* configure.in: post release bump.
diff --git a/THANKS b/THANKS
index 637ebc4d..584075e0 100644
--- a/THANKS
+++ b/THANKS
@@ -13,6 +13,7 @@
"Ross Burton <ross burtonini com>",
"Damien Carbery <damien carbery sun com>",
"Anders Carlsson <andersca codefactory se>",
+ "Ed Catmur <ed catmur co uk>",
"Nicholas Curran <quasar austar net au>",
"John Fleck <jfleck inkstain net>",
"Sebastian Heinlein <glatzor pimpzkru de>",
diff --git a/src/about.c b/src/about.c
index d6fc9083..d64d6777 100644
--- a/src/about.c
+++ b/src/about.c
@@ -61,6 +61,7 @@ static const gchar *author_credits[] = {
"Ross Burton <ross burtonini com>",
"Damien Carbery <damien carbery sun com>",
"Anders Carlsson <andersca codefactory se>",
+ "Ed Catmur <ed catmur co uk>",
"Nicholas Curran <quasar austar net au>",
"John Fleck <jfleck inkstain net>",
"Sebastian Heinlein <glatzor pimpzkru de>",
diff --git a/src/tree.c b/src/tree.c
index 49c1d782..63fe4aee 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -440,13 +440,13 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data)
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view), TRUE);
if (tree_data->radiobox || tree_data->checkbox) {
- if (tree_data->data)
+ if (tree_data->data && *tree_data->data)
zenity_tree_fill_entries (GTK_TREE_VIEW (tree_view), tree_data->data, n_columns, TRUE, tree_data->editable);
else
zenity_tree_fill_entries_from_stdin (GTK_TREE_VIEW (tree_view), n_columns, TRUE, tree_data->editable);
}
else {
- if (tree_data->data)
+ if (tree_data->data && *tree_data->data)
zenity_tree_fill_entries (GTK_TREE_VIEW (tree_view), tree_data->data, n_columns, FALSE, tree_data->editable);
else
zenity_tree_fill_entries_from_stdin (GTK_TREE_VIEW (tree_view), n_columns, FALSE, tree_data->editable);
bgstack15