From 5562c9a553fe539d0d1fbf05dba89b1b1f577fae Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 8 Nov 2014 22:08:29 +0000 Subject: Continue doxygen error cleanup. --- gtk/scaffolding.c | 11 +++-------- gtk/scaffolding.h | 9 ++++++++- gtk/tabs.h | 7 ++++--- gtk/window.c | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) (limited to 'gtk') diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index d18044069..7e6692a3c 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -2257,13 +2257,8 @@ struct nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel) return g; } -/** - * set the title in the window - * - * \param gw The gui window to set title on - * \param title The title to set (may be NULL) - */ -void gui_window_set_title(struct gui_window *gw, const char *title) +/* exported function documented in gtk/scaffolding.h */ +void nsgtk_window_set_title(struct gui_window *gw, const char *title) { struct nsgtk_scaffolding *gs = nsgtk_get_scaffold(gw); int title_len; @@ -2632,7 +2627,7 @@ void nsgtk_scaffolding_set_top_level(struct gui_window *gw) nsgtk_scaffolding_set_icon(gw); /* Ensure the window's title bar is updated */ - gui_window_set_title(gw, browser_window_get_title(bw)); + nsgtk_window_set_title(gw, browser_window_get_title(bw)); } diff --git a/gtk/scaffolding.h b/gtk/scaffolding.h index 7d21a68d7..887d6587a 100644 --- a/gtk/scaffolding.h +++ b/gtk/scaffolding.h @@ -235,7 +235,14 @@ gboolean nsgtk_window_url_changed(GtkWidget *, GdkEventKey *, gpointer); nserror nsgtk_scaffolding_new_tab(struct gui_window *gw); /* core acessors */ -void gui_window_set_title(struct gui_window *g, const char *title); +/** + * set the title in the window + * + * \param gw The gui window to set title on + * \param title The title to set which may be NULL + */ +void nsgtk_window_set_title(struct gui_window *gw, const char *title); + nserror gui_window_set_url(struct gui_window *g, struct nsurl *url); void gui_window_start_throbber(struct gui_window *g); void gui_window_stop_throbber(struct gui_window *g); diff --git a/gtk/tabs.h b/gtk/tabs.h index 036efb1e5..440d61336 100644 --- a/gtk/tabs.h +++ b/gtk/tabs.h @@ -28,9 +28,10 @@ void nsgtk_tab_add(struct gui_window *window, GtkWidget *tab_contents, bool back * * The tab title will be set to the parameter * - * @note currently only called from gui_window_set_title() - * @param g the gui window to set tab title for. - * @param title The title text which may not be NULL. + * \note currently only called from nsgtk_window_set_title() + * + * \param g the gui window to set tab title for. + * \param title The title text which may not be NULL. */ void nsgtk_tab_set_title(struct gui_window *g, const char *title); void nsgtk_tab_options_changed(GtkNotebook *notebook); diff --git a/gtk/window.c b/gtk/window.c index 1f70822bf..1b6e6ccbe 100644 --- a/gtk/window.c +++ b/gtk/window.c @@ -1307,7 +1307,7 @@ static struct gui_window_table window_table = { .start_selection = gui_window_start_selection, /* from scaffold */ - .set_title = gui_window_set_title, + .set_title = nsgtk_window_set_title, .set_url = gui_window_set_url, .start_throbber = gui_window_start_throbber, .stop_throbber = gui_window_stop_throbber, -- cgit v1.2.3