[nautilus-actions] Rename base_window_peek_widget() as base_window_get_widget_from_gtk()

[Pierre Wieser <pwieser src gnome org>]

commit baa5e4339ad97066e34850a11531cb7303448420
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jan 21 23:56:13 2011 +0100

    Rename base_window_peek_widget() as base_window_get_widget_from_gtk()
    
    + src/nact/nact-icon-chooser.c: Updated accordingly.

 ChangeLog                    |    6 ++++++
 src/nact/base-window.c       |    6 +++---
 src/nact/base-window.h       |   29 +++++++++++++++--------------
 src/nact/nact-icon-chooser.c |    2 +-
 4 files changed, 25 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a92e6e4..d62f579 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2011-01-21 Pierre Wieser <pwieser trychlos org>
 
 	* src/nact/base-window.c:
+	* src/nact/base-window.h (base_window_peek_widget):
+	Renamed as base_window_get_widget_from_gtk().
+
+	* src/nact/nact-icon-chooser.c: Updated accordingly.
+
+	* src/nact/base-window.c:
 	* src/nact/base-window.h (base_window_get_named_toplevel):
 	Renamed as base_window_get_gtk_toplevel_by_name().
 
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index 403404e..3835f7b 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -890,7 +890,7 @@ base_window_get_widget( const BaseWindow *window, const gchar *name )
 }
 
 /**
- * base_window_peek_widget:
+ * base_window_get_widget_from_gtk:
  * @window: the #GtkWindow toplevel.
  * @name: the name of the searched child.
  *
@@ -899,9 +899,9 @@ base_window_get_widget( const BaseWindow *window, const gchar *name )
  * released by the caller.
  */
 GtkWidget *
-base_window_peek_widget( GtkWindow *window, const gchar *name )
+base_window_get_widget_from_gtk( GtkWindow *window, const gchar *name )
 {
-	static const gchar *thisfn = "base_window_peek_widget";
+	static const gchar *thisfn = "base_window_get_widget_from_gtk";
 	GtkWidget *widget;
 
 	g_return_val_if_fail( GTK_IS_WINDOW( window ), NULL );
diff --git a/src/nact/base-window.h b/src/nact/base-window.h
index 6dd7257..691f9e6 100644
--- a/src/nact/base-window.h
+++ b/src/nact/base-window.h
@@ -232,21 +232,22 @@ GType base_window_get_type( void );
 gboolean         base_window_init( BaseWindow *window );
 int              base_window_run( BaseWindow *window );
 
-BaseApplication *base_window_get_application( const BaseWindow *window );
+BaseApplication *base_window_get_application         ( const BaseWindow *window );
+BaseWindow      *base_window_get_parent              ( const BaseWindow *window );
+GtkWindow       *base_window_get_gtk_toplevel        ( const BaseWindow *window );
 GtkWindow       *base_window_get_gtk_toplevel_by_name( const BaseWindow *window, const gchar *name );
-BaseWindow      *base_window_get_parent( const BaseWindow *window );
-GtkWindow       *base_window_get_gtk_toplevel( const BaseWindow *window );
-GtkWidget       *base_window_get_widget( const BaseWindow *window, const gchar *name );
-GtkWidget       *base_window_peek_widget( GtkWindow *window, const gchar *name );
-gboolean         base_window_is_willing_to_quit( const BaseWindow *window );
-
-void             base_window_display_error_dlg  ( const BaseWindow *parent, const gchar *primary, const gchar *secondary );
-gboolean         base_window_display_yesno_dlg  ( const BaseWindow *parent, const gchar *primary, const gchar *secondary );
-void             base_window_display_message_dlg( const BaseWindow *parent, GSList *message );
-
-gulong           base_window_signal_connect( BaseWindow *window, GObject *instance, const gchar *signal, GCallback fn );
-gulong           base_window_signal_connect_after( BaseWindow *window, GObject *instance, const gchar *signal, GCallback fn );
-gulong           base_window_signal_connect_by_name( BaseWindow *window, const gchar *name, const gchar *signal, GCallback fn );
+GtkWidget       *base_window_get_widget              ( const BaseWindow *window, const gchar *name );
+GtkWidget       *base_window_get_widget_from_gtk     ( GtkWindow *window, const gchar *name );
+
+gboolean         base_window_is_willing_to_quit      ( const BaseWindow *window );
+
+void             base_window_display_error_dlg       ( const BaseWindow *parent, const gchar *primary, const gchar *secondary );
+gboolean         base_window_display_yesno_dlg       ( const BaseWindow *parent, const gchar *primary, const gchar *secondary );
+void             base_window_display_message_dlg     ( const BaseWindow *parent, GSList *message );
+
+gulong           base_window_signal_connect          ( BaseWindow *window, GObject *instance, const gchar *signal, GCallback fn );
+gulong           base_window_signal_connect_after    ( BaseWindow *window, GObject *instance, const gchar *signal, GCallback fn );
+gulong           base_window_signal_connect_by_name  ( BaseWindow *window, const gchar *name, const gchar *signal, GCallback fn );
 gulong           base_window_signal_connect_with_data( BaseWindow *window, GObject *instance, const gchar *signal, GCallback fn, void *user_data );
 
 G_END_DECLS
diff --git a/src/nact/nact-icon-chooser.c b/src/nact/nact-icon-chooser.c
index 456bb17..1124647 100644
--- a/src/nact/nact-icon-chooser.c
+++ b/src/nact/nact-icon-chooser.c
@@ -656,7 +656,7 @@ on_destroy( GtkWidget *widget, GdkEvent *event, void *foo )
 
 	/* clear the various models
 	 */
-	context_view = GTK_TREE_VIEW( base_window_peek_widget( GTK_WINDOW( widget ), "ThemedTreeView" ));
+	context_view = GTK_TREE_VIEW( base_window_get_widget_from_gtk( GTK_WINDOW( widget ), "ThemedTreeView" ));
 	context_store = GTK_LIST_STORE( gtk_tree_view_get_model( context_view ));
 
 	if( gtk_tree_model_get_iter_first( GTK_TREE_MODEL( context_store ), &context_iter )){