From 8e33c2f17f90f178af1fd4d1d09fb498f6752a2a Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Sun, 11 Oct 2009 09:40:47 +0000 Subject: revert r23093 and r 23094, since the title pointer is used to modify the title of the list from the callback function in one place git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23096 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/list.c | 2 +- apps/gui/list.h | 4 ++-- apps/plugin.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'apps') diff --git a/apps/gui/list.c b/apps/gui/list.c index ccd8337c5a..d7ecdccd30 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -418,7 +418,7 @@ void gui_list_screen_scroll_out_of_view(bool enable) * both the title and icon. Use NOICON if there is no icon. */ void gui_synclist_set_title(struct gui_synclist * gui_list, - const char * title, enum themable_icons icon) + char * title, enum themable_icons icon) { gui_list->title = title; gui_list->title_icon = icon; diff --git a/apps/gui/list.h b/apps/gui/list.h index 7865dddc08..ed61889083 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h @@ -118,7 +118,7 @@ struct gui_synclist /* The data that will be passed to the callback function YOU implement */ void * data; /* The optional title, set to NULL for none */ - const char * title; + char * title; /* Optional title icon */ enum themable_icons title_icon; bool show_selection_marker; /* set to true by default */ @@ -166,7 +166,7 @@ extern void gui_synclist_add_item(struct gui_synclist * lists); extern void gui_synclist_del_item(struct gui_synclist * lists); extern void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll); extern void gui_synclist_flash(struct gui_synclist * lists); -extern void gui_synclist_set_title(struct gui_synclist * lists, const char * title, +extern void gui_synclist_set_title(struct gui_synclist * lists, char * title, enum themable_icons icon); extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists, bool hide); diff --git a/apps/plugin.h b/apps/plugin.h index 12ad3c07f1..b060104373 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -352,7 +352,7 @@ struct plugin_api { void (*gui_synclist_limit_scroll)(struct gui_synclist * lists, bool scroll); bool (*gui_synclist_do_button)(struct gui_synclist * lists, int *action, enum list_wrap wrap); - void (*gui_synclist_set_title)(struct gui_synclist *lists, const char* title, + void (*gui_synclist_set_title)(struct gui_synclist *lists, char* title, enum themable_icons icon); enum yesno_res (*gui_syncyesno_run)(const struct text_message * main_message, const struct text_message * yes_message, -- cgit v1.2.3