devhelp r1191 - in trunk: . src

[rhult svn gnome org]

Author: rhult
Date: Fri Oct 10 14:25:33 2008
New Revision: 1191
URL: http://svn.gnome.org/viewvc/devhelp?rev=1191&view=rev

Log:
2008-10-10  Richard Hult  <richard imendio com>

	* src/dh-search.[ch]: Remove dh_search_grab_focus().
	* src/dh-window.c: Replace the use of the above with
	gtk_widget_grab_focus().


Modified:
   trunk/ChangeLog
   trunk/src/dh-search.c
   trunk/src/dh-search.h
   trunk/src/dh-window.c

Modified: trunk/src/dh-search.c
==============================================================================
--- trunk/src/dh-search.c	(original)
+++ trunk/src/dh-search.c	Fri Oct 10 14:25:33 2008
@@ -645,15 +645,3 @@
                         g_idle_add ((GSourceFunc) search_filter_idle, search);
         }
 }
-
-void
-dh_search_grab_focus (DhSearch *search)
-{
-        DhSearchPriv *priv;
-
-        g_return_if_fail (DH_IS_SEARCH (search));
-
-        priv = GET_PRIVATE (search);
-
-        gtk_widget_grab_focus (priv->entry);
-}

Modified: trunk/src/dh-search.h
==============================================================================
--- trunk/src/dh-search.h	(original)
+++ trunk/src/dh-search.h	Fri Oct 10 14:25:33 2008
@@ -51,6 +51,5 @@
 void       dh_search_set_search_string (DhSearch    *search,
                                         const gchar *str,
                                         const gchar *book_id);
-void       dh_search_grab_focus        (DhSearch    *search);
 
 #endif /* __DH_SEARCH_H__ */

Modified: trunk/src/dh-window.c
==============================================================================
--- trunk/src/dh-window.c	(original)
+++ trunk/src/dh-window.c	Fri Oct 10 14:25:33 2008
@@ -350,7 +350,7 @@
         priv = window->priv;
 
         gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->control_notebook), 1);
-        dh_search_grab_focus (DH_SEARCH (priv->search));
+        gtk_widget_grab_focus (priv->search);
 }
 
 static void
@@ -887,7 +887,7 @@
                 gtk_widget_grab_focus (priv->book_tree);
         } else {
                 gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->control_notebook), 1);
-                dh_search_grab_focus (DH_SEARCH (priv->search));
+                gtk_widget_grab_focus (priv->search);
         }
         g_free (tab);
 }
@@ -1471,8 +1471,7 @@
         priv = window->priv;
 
         gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->control_notebook), 1);
-
-        dh_search_grab_focus (DH_SEARCH (priv->search));
+        gtk_widget_grab_focus (priv->search);
 }
 
 /* Only call this with a URI that is known to be in the docs. */