diff options
author | Nils Wallménius <nils@rockbox.org> | 2009-10-11 09:40:47 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2009-10-11 09:40:47 +0000 |
commit | 8e33c2f17f90f178af1fd4d1d09fb498f6752a2a (patch) | |
tree | 3644b4c62a159bd1696195ebc615e55a606621f5 | |
parent | 7f836fd8692c445a49dca7078ed4eb81bb7a3d8e (diff) | |
download | rockbox-8e33c2f17f90f178af1fd4d1d09fb498f6752a2a.tar.gz rockbox-8e33c2f17f90f178af1fd4d1d09fb498f6752a2a.zip |
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
-rw-r--r-- | apps/gui/list.c | 2 | ||||
-rw-r--r-- | apps/gui/list.h | 4 | ||||
-rw-r--r-- | apps/plugin.h | 2 |
3 files changed, 4 insertions, 4 deletions
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) | |||
418 | * both the title and icon. Use NOICON if there is no icon. | 418 | * both the title and icon. Use NOICON if there is no icon. |
419 | */ | 419 | */ |
420 | void gui_synclist_set_title(struct gui_synclist * gui_list, | 420 | void gui_synclist_set_title(struct gui_synclist * gui_list, |
421 | const char * title, enum themable_icons icon) | 421 | char * title, enum themable_icons icon) |
422 | { | 422 | { |
423 | gui_list->title = title; | 423 | gui_list->title = title; |
424 | gui_list->title_icon = icon; | 424 | 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 | |||
118 | /* The data that will be passed to the callback function YOU implement */ | 118 | /* The data that will be passed to the callback function YOU implement */ |
119 | void * data; | 119 | void * data; |
120 | /* The optional title, set to NULL for none */ | 120 | /* The optional title, set to NULL for none */ |
121 | const char * title; | 121 | char * title; |
122 | /* Optional title icon */ | 122 | /* Optional title icon */ |
123 | enum themable_icons title_icon; | 123 | enum themable_icons title_icon; |
124 | bool show_selection_marker; /* set to true by default */ | 124 | bool show_selection_marker; /* set to true by default */ |
@@ -166,7 +166,7 @@ extern void gui_synclist_add_item(struct gui_synclist * lists); | |||
166 | extern void gui_synclist_del_item(struct gui_synclist * lists); | 166 | extern void gui_synclist_del_item(struct gui_synclist * lists); |
167 | extern void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll); | 167 | extern void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll); |
168 | extern void gui_synclist_flash(struct gui_synclist * lists); | 168 | extern void gui_synclist_flash(struct gui_synclist * lists); |
169 | extern void gui_synclist_set_title(struct gui_synclist * lists, const char * title, | 169 | extern void gui_synclist_set_title(struct gui_synclist * lists, char * title, |
170 | enum themable_icons icon); | 170 | enum themable_icons icon); |
171 | extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists, | 171 | extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists, |
172 | bool hide); | 172 | 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 { | |||
352 | void (*gui_synclist_limit_scroll)(struct gui_synclist * lists, bool scroll); | 352 | void (*gui_synclist_limit_scroll)(struct gui_synclist * lists, bool scroll); |
353 | bool (*gui_synclist_do_button)(struct gui_synclist * lists, | 353 | bool (*gui_synclist_do_button)(struct gui_synclist * lists, |
354 | int *action, enum list_wrap wrap); | 354 | int *action, enum list_wrap wrap); |
355 | void (*gui_synclist_set_title)(struct gui_synclist *lists, const char* title, | 355 | void (*gui_synclist_set_title)(struct gui_synclist *lists, char* title, |
356 | enum themable_icons icon); | 356 | enum themable_icons icon); |
357 | enum yesno_res (*gui_syncyesno_run)(const struct text_message * main_message, | 357 | enum yesno_res (*gui_syncyesno_run)(const struct text_message * main_message, |
358 | const struct text_message * yes_message, | 358 | const struct text_message * yes_message, |