summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPadraig O'Briain <padraig.obriain@sun.com>2002-09-17 21:56:51 +0000
committerMikael Hallendal <hallski@src.gnome.org>2002-09-17 21:56:51 +0000
commit678c76b68327436c1d8b389b9bc4c77f5eb0e02c (patch)
treef86fe9980554f83e105900a41b6892afbc4e0e10
parenta6aad832d7f830228b851dac41ad1d37a7f0ce1b (diff)
downloadyelp-678c76b68327436c1d8b389b9bc4c77f5eb0e02c.tar.gz
- Remove redundant call to gtk_tree_path_copy(). - Add casts to fix
2002-09-03 Padraig O'Briain <padraig.obriain@sun.com> * src/yelp-view-content.c (content_reader_finished_cb): - Remove redundant call to gtk_tree_path_copy(). - Add casts to fix compiler warnings on Solaris. - Do not focus HtmlView widget if we have a row in the content tree. (Fixes #91708)
-rw-r--r--ChangeLog8
-rw-r--r--src/yelp-view-content.c10
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b26ec9c..a3c9b736 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-03 Padraig O'Briain <padraig.obriain@sun.com>
+
+ * src/yelp-view-content.c (content_reader_finished_cb):
+ - Remove redundant call to gtk_tree_path_copy().
+ - Add casts to fix compiler warnings on Solaris.
+ - Do not focus HtmlView widget if we have a row in the content
+ tree. (Fixes #91708)
+
2002-09-17 Narayana Pattipati <narayana.pattipati@wipro.com>
* src/yelp-pregenerate.c (main): added an error message.
diff --git a/src/yelp-view-content.c b/src/yelp-view-content.c
index 5652bac7..db3a18ee 100644
--- a/src/yelp-view-content.c
+++ b/src/yelp-view-content.c
@@ -309,11 +309,9 @@ content_reader_finished_cb (YelpReader *reader,
gtk_tree_view_expand_row (GTK_TREE_VIEW (priv->content_tree),
path, TRUE);
- parent = gtk_tree_path_copy (path);
-
g_signal_handlers_block_by_func (
selection,
- content_tree_selection_changed_cb,
+ (gpointer) content_tree_selection_changed_cb,
view);
/* gtk_tree_selection_select_path (selection, path); */
@@ -322,7 +320,7 @@ content_reader_finished_cb (YelpReader *reader,
g_signal_handlers_unblock_by_func (
selection,
- content_tree_selection_changed_cb,
+ (gpointer) content_tree_selection_changed_cb,
view);
while (gtk_tree_path_up (path)) {
@@ -333,10 +331,12 @@ content_reader_finished_cb (YelpReader *reader,
gtk_tree_path_free (path);
gtk_tree_path_free (parent);
+
+ } else {
+ gtk_widget_grab_focus (priv->html_widget);
}
gdk_window_set_cursor (priv->html_widget->window, NULL);
- gtk_widget_grab_focus (priv->html_widget);
}
static void