[Commits] htmlview.c 1.1.2.6 1.1.2.7

[colin at claws-mail.org]

Update of /home/claws-mail/plugins/gtkhtml2_viewer/libgtkhtml/view
In directory claws-mail:/tmp/cvs-serv535/libgtkhtml/view

Modified Files:
      Tag: gtk2
	htmlview.c 
Log Message:
2011-10-22 [colin]	0.31.0cvs3

	* src/claws.def
	* src/gtkhtml2_viewer.c
	* libgtkhtml/a11y/htmlviewaccessible.c
	* libgtkhtml/layout/html/htmlboxembedded.c
	* libgtkhtml/layout/html/htmlboxembeddedentry.c
	* libgtkhtml/layout/html/htmlembedded.c
	* libgtkhtml/view/htmlview.c
		Update following Claws 3.7.10.41

Index: htmlview.c
===================================================================
RCS file: /home/claws-mail/plugins/gtkhtml2_viewer/libgtkhtml/view/Attic/htmlview.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- htmlview.c	24 Oct 2010 16:48:03 -0000	1.1.2.6
+++ htmlview.c	22 Oct 2011 17:10:09 -0000	1.1.2.7
@@ -868,7 +868,7 @@
 	GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (view));
 	gboolean blink;
 
-	if (gtkut_widget_has_focus (GTK_WIDGET(view)) &&
+	if (gtk_widget_has_focus (GTK_WIDGET(view)) &&
 	    cursor_showing &&
 	    html_view_get_selection_bound (view) == html_view_get_cursor_position (view)) {
 		g_object_get (settings, "gtk-cursor-blink", &blink, NULL);
@@ -894,7 +894,7 @@
 	if (!html_view_get_cursor_visible (view)) {
 		html_view_set_cursor_visible (view, 1);
 
-		if (gtkut_widget_has_focus (GTK_WIDGET(view)) && 
+		if (gtk_widget_has_focus (GTK_WIDGET(view)) && 
 		    (html_view_get_selection_bound (view) == html_view_get_cursor_position (view)))
 			gtk_widget_queue_draw (GTK_WIDGET (view));
 	}
@@ -906,7 +906,7 @@
 	if (html_view_get_cursor_visible (view)) {
 		html_view_set_cursor_visible (view, 0);
 
-		if (gtkut_widget_has_focus (GTK_WIDGET(view)) && 
+		if (gtk_widget_has_focus (GTK_WIDGET(view)) && 
 		    html_view_get_selection_bound (view) == html_view_get_cursor_position (view))
 			gtk_widget_queue_draw (GTK_WIDGET (view));
 	}
@@ -925,13 +925,13 @@
 
 	view = HTML_VIEW (data);
 
-	if (!gtkut_widget_has_focus (GTK_WIDGET(view))) {
+	if (!gtk_widget_has_focus (GTK_WIDGET(view))) {
 		g_warning ("HtmlView - did not receive focus-out-event. If you\n"
 			   "connect a handler to this signal, it must return\n"
 			   "FALSE so the entry gets the event as well");
 	}
 
-	g_assert (gtkut_widget_has_focus (GTK_WIDGET(view)));
+	g_assert (gtk_widget_has_focus (GTK_WIDGET(view)));
 	g_assert (html_view_get_selection_bound (view) == html_view_get_cursor_position (view));
 
 	if (html_view_get_cursor_visible (view)) {
@@ -1769,7 +1769,7 @@
 		view->relayout_idle_id = 0;
 	}
 
-	if (gtkut_widget_has_focus (GTK_WIDGET(view))) {
+	if (gtk_widget_has_focus (GTK_WIDGET(view))) {
 		if (view->document->focus_element == NULL &&
 		    view->document->dom_document) {
 			html_document_update_focus_element (view->document, html_focus_iterator_next_element (view->document->dom_document, NULL));
@@ -1866,7 +1866,7 @@
 		/* Check that the document has not been deleted */
 		if (view->root->dom_node) {
 			html_box_paint (view->root, view->painter, area, 0, 0);
-			if (gtkut_widget_has_focus (GTK_WIDGET(view)) &&
+			if (gtk_widget_has_focus (GTK_WIDGET(view)) &&
 			    (html_view_get_selection_bound (view) == html_view_get_cursor_position (view)) &&
 			    html_view_get_cursor_visible (view))
 				html_view_draw_cursor (view);
@@ -2338,7 +2338,7 @@
 
 	view = HTML_VIEW (widget);
 
-	if (!gtkut_widget_is_drawable (widget) || (event->window != GTK_LAYOUT (view)->bin_window))
+	if (!gtk_widget_is_drawable (widget) || (event->window != GTK_LAYOUT (view)->bin_window))
 		return FALSE;
 
 	html_view_paint (view, &event->area);
@@ -2388,7 +2388,7 @@
 		return FALSE;
 	html_view_set_button (view, event->button);
 
-	if (!gtkut_widget_has_focus (widget))
+	if (!gtk_widget_has_focus (widget))
 		gtk_widget_grab_focus (widget);
 	
 	html_event_button_press (view, event);
@@ -2557,7 +2557,7 @@
 
 	/* Handle special case when we haven't any focusable elements */
 	if (new_focus_element == NULL) {
-		if (!gtkut_widget_has_focus (widget)) {
+		if (!gtk_widget_has_focus (widget)) {
 			gtk_widget_grab_focus (widget);
 			return TRUE;
 		} 
@@ -3084,7 +3084,7 @@
 html_view_init (HtmlView *view)
 {
 	gtkut_widget_set_can_focus(GTK_WIDGET(view), TRUE);
-	  
+
 	view->node_table = g_hash_table_new (g_direct_hash, g_direct_equal);
 	view->document = NULL;
 	view->root = NULL;