Menu
▾
▴
[xine-cvs] CVS: xine-ui/src/xitk actions.c,1.242,1.243 control.c,1.102,1.103 event_sender.c,1.24,1.25 event_sender.h,1.9,1.10 help.c,1.12,1.13 help.h,1.4,1.5 kbindings.c,1.116,1.117 kbindings.h,1.52,1.53 panel.c,1.208,1.209 playlist.c,1.151,1.152 setup.c,1.96,1.97 setup.h,1.9,1.10 skins.c,1.73,1.74 skins.h,1.10,1.11 viewlog.c,1.48,1.49 viewlog.h,1.11,1.12
|
From: Daniel Caujolle-B. <f1...@us...> - 2004-06-13 11:44:30
|
Update of /cvsroot/xine/xine-ui/src/xitk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24664 Modified Files: actions.c control.c event_sender.c event_sender.h help.c help.h kbindings.c kbindings.h panel.c playlist.c setup.c setup.h skins.c skins.h viewlog.c viewlog.h Log Message: fix last shm problems Index: actions.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/actions.c,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- actions.c 29 May 2004 08:47:51 -0000 1.242 +++ actions.c 13 Jun 2004 11:44:12 -0000 1.243 @@ -43,6 +43,7 @@ extern gGui_t *gGui; extern _panel_t *panel; +filebrowser_t *load_stream = NULL, *load_sub = NULL; static pthread_mutex_t new_pos_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -569,11 +570,27 @@ } gGui->on_quit = 1; - + panel_deinit(); playlist_deinit(); - control_deinit(); mrl_browser_deinit(); + control_deinit(); + + setup_end(); + viewlog_end(); + kbedit_end(); + event_sender_end(); + stream_infos_end(); + tvset_end(); + pplugin_end(); + help_end(); + download_skin_end(); + + if(load_stream) + filebrowser_end(load_stream); + if(load_sub) + filebrowser_end(load_sub); + gui_deinit(); if(video_window_is_visible()) @@ -592,10 +609,6 @@ // gui_set_fullscreen_mode(NULL,NULL); #endif - destroy_mrl_browser(); - control_exit(NULL, NULL); - playlist_exit(NULL, NULL); - osd_deinit(); config_update_num("gui.amp_level", gGui->mixer.amp_level); @@ -1596,7 +1609,7 @@ if(gGui->use_root_window) setup_toggle_visibility(NULL, NULL); else - setup_exit(NULL, NULL); + setup_end(); } } @@ -1610,7 +1623,7 @@ if(gGui->use_root_window) event_sender_toggle_visibility(NULL, NULL); else - event_sender_exit(NULL, NULL); + event_sender_end(); } } @@ -1679,7 +1692,7 @@ if(gGui->use_root_window) viewlog_toggle_visibility(NULL, NULL); else - viewlog_exit(NULL, NULL); + viewlog_end(); } } @@ -1693,7 +1706,7 @@ if(gGui->use_root_window) kbedit_toggle_visibility(NULL, NULL); else - kbedit_exit(NULL, NULL); + kbedit_end(); } } @@ -1707,7 +1720,7 @@ if(gGui->use_root_window) help_toggle_visibility(NULL, NULL); else - help_exit(NULL, NULL); + help_end(); } } @@ -1874,10 +1887,15 @@ static void fileselector_cancel_callback(filebrowser_t *fb) { char *cur_dir = filebrowser_get_current_dir(fb); - if(cur_dir && strlen(cur_dir)) { - snprintf(gGui->curdir, sizeof(gGui->curdir), "%s", cur_dir); - config_update_string("input.file_origin_path", gGui->curdir); + if(fb == load_stream) { + if(cur_dir && strlen(cur_dir)) { + snprintf(gGui->curdir, sizeof(gGui->curdir), "%s", cur_dir); + config_update_string("input.file_origin_path", gGui->curdir); + } + load_stream = NULL; } + else if(fb == load_sub) + load_sub = NULL; } static void fileselector_callback(filebrowser_t *fb) { @@ -1911,6 +1929,8 @@ gui_play(NULL, NULL); } } + + load_stream = NULL; } static void fileselector_all_callback(filebrowser_t *fb) { @@ -1962,20 +1982,26 @@ free(files); } + + load_stream = NULL; } void gui_file_selector(void) { filebrowser_callback_button_t cbb[3]; - - cbb[0].label = _("Select"); - cbb[0].callback = fileselector_callback; - cbb[0].need_a_file = 0; - cbb[1].label = _("Select all"); - cbb[1].callback = fileselector_all_callback; - cbb[1].need_a_file = 0; - cbb[2].callback = fileselector_cancel_callback; - cbb[2].need_a_file = 0; - (void *) create_filebrowser(_("Stream(s) loading"), gGui->curdir, &cbb[0], &cbb[1], &cbb[2]); + + if(load_stream) + filebrowser_raise_window(load_stream); + else { + cbb[0].label = _("Select"); + cbb[0].callback = fileselector_callback; + cbb[0].need_a_file = 0; + cbb[1].label = _("Select all"); + cbb[1].callback = fileselector_all_callback; + cbb[1].need_a_file = 0; + cbb[2].callback = fileselector_cancel_callback; + cbb[2].need_a_file = 0; + load_stream = create_filebrowser(_("Stream(s) loading"), gGui->curdir, &cbb[0], &cbb[1], &cbb[2]); + } } static void subselector_callback(filebrowser_t *fb) { @@ -2012,41 +2038,49 @@ } free(file); } + + load_sub = NULL; } void gui_select_sub(void) { if(gGui->playlist.num) { - filebrowser_callback_button_t cbb; - mediamark_t *mmk; - - mmk = mediamark_get_current_mmk(); - - if(mmk) { - char *path, *open_path; - - cbb.label = _("Select"); - cbb.callback = subselector_callback; - cbb.need_a_file = 1; + if(load_sub) + filebrowser_raise_window(load_sub); + else { + filebrowser_callback_button_t cbb[2]; + mediamark_t *mmk; - path = mmk->sub ? mmk->sub : mmk->mrl; + mmk = mediamark_get_current_mmk(); - if(mrl_look_like_file(path)) { - char *p; + if(mmk) { + char *path, *open_path; - xine_strdupa(open_path, path); + cbb[0].label = _("Select"); + cbb[0].callback = subselector_callback; + cbb[0].need_a_file = 1; + cbb[1].callback = fileselector_cancel_callback; + cbb[1].need_a_file = 0; + + path = mmk->sub ? mmk->sub : mmk->mrl; - if(!strncasecmp(path, "file:", 5)) - path += 5; - - p = strrchr(open_path, '/'); - if (p && strlen(p)) - *p = '\0'; + if(mrl_look_like_file(path)) { + char *p; + + xine_strdupa(open_path, path); + + if(!strncasecmp(path, "file:", 5)) + path += 5; + + p = strrchr(open_path, '/'); + if (p && strlen(p)) + *p = '\0'; + } + else + open_path = gGui->curdir; + + load_sub = create_filebrowser(_("Pick a subtitle file"), open_path, &cbb[0], NULL, &cbb[1]); } - else - open_path = gGui->curdir; - - (void *) create_filebrowser(_("Pick a subtitle file"), open_path, &cbb, NULL, NULL); } } } Index: control.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/control.c,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- control.c 20 May 2004 01:08:10 -0000 1.102 +++ control.c 13 Jun 2004 11:44:12 -0000 1.103 @@ -494,7 +494,7 @@ if(control) { if(control_is_visible()) control_toggle_visibility(NULL, NULL); - xitk_unregister_event_handler(&control->widget_key); + control_exit(NULL, NULL); } } Index: event_sender.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/event_sender.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- event_sender.c 26 Apr 2004 21:31:44 -0000 1.24 +++ event_sender.c 13 Jun 2004 11:44:13 -0000 1.25 @@ -291,7 +291,7 @@ } } -void event_sender_exit(xitk_widget_t *w, void *data) { +static void event_sender_exit(xitk_widget_t *w, void *data) { if(eventer) { window_info_t wi; @@ -368,7 +368,7 @@ } } -static void event_sender_end(xitk_widget_t *w, void *data) { +void event_sender_end(void) { event_sender_exit(NULL, NULL); } @@ -666,7 +666,7 @@ lb.button_type = CLICK_BUTTON; lb.label = _("Close"); lb.align = ALIGN_CENTER; - lb.callback = event_sender_end; + lb.callback = event_sender_exit; lb.state_callback = NULL; lb.userdata = NULL; lb.skin_element_name = NULL; Index: event_sender.h =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/event_sender.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- event_sender.h 13 Apr 2004 19:55:47 -0000 1.9 +++ event_sender.h 13 Jun 2004 11:44:13 -0000 1.10 @@ -26,7 +26,7 @@ void event_sender_sticky_cb(void *data, xine_cfg_entry_t *cfg); void event_sender_panel(void); -void event_sender_exit(xitk_widget_t *, void *); +void event_sender_end(void); void event_sender_move(int x, int y); int event_sender_is_visible(void); int event_sender_is_running(void); Index: help.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/help.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- help.c 26 Apr 2004 21:31:44 -0000 1.12 +++ help.c 13 Jun 2004 11:44:13 -0000 1.13 @@ -220,18 +220,7 @@ } } -static void help_handle_event(XEvent *event, void *data) { - - switch(event->type) { - - case KeyPress: - if(xitk_get_key_pressed(event) == XK_Escape) - help_exit(NULL, NULL); - break; - } -} - -void help_exit(xitk_widget_t *w, void *data) { +static void help_exit(xitk_widget_t *w, void *data) { if(help) { window_info_t wi; @@ -283,12 +272,23 @@ } } +static void help_handle_event(XEvent *event, void *data) { + + switch(event->type) { + + case KeyPress: + if(xitk_get_key_pressed(event) == XK_Escape) + help_exit(NULL, NULL); + break; + } +} + void help_raise_window(void) { if(help != NULL) raise_window(xitk_window_get_window(help->xwin), help->visible, help->running); } -static void help_end(xitk_widget_t *w, void *data) { +void help_end(void) { help_exit(NULL, NULL); } @@ -439,7 +439,7 @@ lb.button_type = CLICK_BUTTON; lb.label = _("Close"); lb.align = ALIGN_CENTER; - lb.callback = help_end; + lb.callback = help_exit; lb.state_callback = NULL; lb.userdata = NULL; lb.skin_element_name = NULL; Index: help.h =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/help.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- help.h 13 Apr 2004 19:55:47 -0000 1.4 +++ help.h 13 Jun 2004 11:44:13 -0000 1.5 @@ -25,7 +25,7 @@ #define HELP_H void help_panel(void); -void help_exit(xitk_widget_t *, void *); +void help_end(void); int help_is_visible(void); int help_is_running(void); void help_toggle_visibility(xitk_widget_t *, void *); Index: kbindings.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/kbindings.c,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- kbindings.c 12 Jun 2004 08:57:17 -0000 1.116 +++ kbindings.c 13 Jun 2004 11:44:13 -0000 1.117 @@ -1544,7 +1544,7 @@ /* * */ -void kbedit_exit(xitk_widget_t *w, void *data) { +static void kbedit_exit(xitk_widget_t *w, void *data) { if(kbedit) { window_info_t wi; @@ -1714,7 +1714,7 @@ /* * Forget and dismiss kbeditor */ -static void kbedit_done(xitk_widget_t *w, void *data) { +void kbedit_end(void) { kbedit_exit(NULL, NULL); } @@ -2160,7 +2160,7 @@ lb.button_type = CLICK_BUTTON; lb.label = _("Done"); lb.align = ALIGN_CENTER; - lb.callback = kbedit_done; + lb.callback = kbedit_exit; lb.state_callback = NULL; lb.userdata = NULL; lb.skin_element_name = NULL; Index: kbindings.h =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/kbindings.h,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- kbindings.h 15 Apr 2004 15:32:40 -0000 1.52 +++ kbindings.h 13 Jun 2004 11:44:17 -0000 1.53 @@ -190,7 +190,7 @@ char *kbindings_get_shortcut(kbinding_t *, char *); void kbedit_window(void); -void kbedit_exit(xitk_widget_t *, void *); +void kbedit_end(void); int kbedit_is_visible(void); int kbedit_is_running(void); void kbedit_toggle_visibility(xitk_widget_t *, void *); Index: panel.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/panel.c,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- panel.c 20 May 2004 01:08:11 -0000 1.208 +++ panel.c 13 Jun 2004 11:44:17 -0000 1.209 @@ -39,7 +39,7 @@ extern gGui_t *gGui; -_panel_t *panel; +_panel_t *panel = NULL; void panel_update_nextprev_tips(void) { @@ -132,6 +132,46 @@ } +static void panel_exit(xitk_widget_t *w, void *data) { + + if(panel) { + window_info_t wi; + + panel->visible = 0; + + if((xitk_get_window_info(panel->widget_key, &wi))) { + config_update_num ("gui.panel_x", wi.x); + config_update_num ("gui.panel_y", wi.y); + WINDOW_INFO_ZERO(&wi); + } + + xitk_unregister_event_handler(&panel->widget_key); + + XLockDisplay(gGui->display); + XUnmapWindow(gGui->display, gGui->panel_window); + XUnlockDisplay(gGui->display); + + xitk_destroy_widgets(panel->widget_list); + + XLockDisplay(gGui->display); + XDestroyWindow(gGui->display, gGui->panel_window); + Imlib_destroy_image(gGui->imlib_data, panel->bg_image); + XUnlockDisplay(gGui->display); + + gGui->panel_window = None; + xitk_list_free((XITK_WIDGET_LIST_LIST(panel->widget_list))); + + XLockDisplay(gGui->display); + XFreeGC(gGui->display, (XITK_WIDGET_LIST_GC(panel->widget_list))); + XUnlockDisplay(gGui->display); + + free(panel->widget_list); + + free(panel); + panel = NULL; + } +} + /* * Change the current skin. */ @@ -996,7 +1036,7 @@ void panel_deinit(void) { if(panel_is_visible()) _panel_toggle_visibility(NULL, NULL); - xitk_unregister_event_handler(&panel->widget_key); + panel_exit(NULL, NULL); } void panel_reparent(void) { Index: playlist.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/playlist.c,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- playlist.c 27 May 2004 03:53:18 -0000 1.151 +++ playlist.c 13 Jun 2004 11:44:17 -0000 1.152 @@ -66,9 +66,11 @@ char **playlist_mrls; char **playlist_idents; int playlist_len; + } _playlist_t; -static _playlist_t *playlist; +static filebrowser_t *load_fb = NULL, *save_fb = NULL; +static _playlist_t *playlist; void playlist_handle_event(XEvent *event, void *data); @@ -348,24 +350,34 @@ free(file); } + load_fb = NULL; playlist_reactivate(); } static void _playlist_cancel_callback(filebrowser_t *fb) { + if(fb == load_fb) + load_fb = NULL; + else if(fb == save_fb) + save_fb = NULL; + playlist_reactivate(); } void playlist_load_playlist(xitk_widget_t *w, void *data) { filebrowser_callback_button_t cbb[2]; char buffer[XITK_PATH_MAX + XITK_NAME_MAX + 1]; - snprintf(buffer, sizeof(buffer), "%s%s", xine_get_homedir(), "/.xine/playlist.tox"); - - cbb[0].label = _("Load"); - cbb[0].callback = _playlist_load_callback; - cbb[0].need_a_file = 1; - cbb[1].callback = _playlist_cancel_callback; - - playlist_deactivate(); - (void *) create_filebrowser(_("Load a playlist"), buffer, &cbb[0], NULL, &cbb[1]); + if(load_fb) + filebrowser_raise_window(load_fb); + else { + snprintf(buffer, sizeof(buffer), "%s%s", xine_get_homedir(), "/.xine/playlist.tox"); + + cbb[0].label = _("Load"); + cbb[0].callback = _playlist_load_callback; + cbb[0].need_a_file = 1; + cbb[1].callback = _playlist_cancel_callback; + + playlist_deactivate(); + load_fb = create_filebrowser(_("Load a playlist"), buffer, &cbb[0], NULL, &cbb[1]); + } } /* @@ -378,6 +390,7 @@ mediamark_save_mediamarks(file); free(file); } + save_fb = NULL; playlist_reactivate(); } void playlist_save_playlist(xitk_widget_t *w, void *data) { @@ -385,15 +398,19 @@ char buffer[XITK_PATH_MAX + XITK_NAME_MAX + 1]; if(gGui->playlist.num) { - snprintf(buffer, sizeof(buffer), "%s%s", xine_get_homedir(), "/.xine/playlist.tox"); - - cbb[0].label = _("Save"); - cbb[0].callback = _playlist_save_callback; - cbb[0].need_a_file = 1; - cbb[1].callback = _playlist_cancel_callback; - - playlist_deactivate(); - (void *) create_filebrowser(_("Save a playlist"), buffer, &cbb[0], NULL, &cbb[1]); + if(save_fb) + filebrowser_raise_window(save_fb); + else { + snprintf(buffer, sizeof(buffer), "%s%s", xine_get_homedir(), "/.xine/playlist.tox"); + + cbb[0].label = _("Save"); + cbb[0].callback = _playlist_save_callback; + cbb[0].need_a_file = 1; + cbb[1].callback = _playlist_cancel_callback; + + playlist_deactivate(); + save_fb = create_filebrowser(_("Save a playlist"), buffer, &cbb[0], NULL, &cbb[1]); + } } } @@ -623,6 +640,11 @@ */ void playlist_exit(xitk_widget_t *w, void *data) { + if(load_fb) + filebrowser_end(load_fb); + if(save_fb) + filebrowser_end(save_fb); + if(playlist) { window_info_t wi; @@ -667,7 +689,6 @@ } - /* * return 1 if playlist editor is ON */ @@ -957,7 +978,13 @@ if(playlist) { if(playlist_is_visible()) playlist_toggle_visibility(NULL, NULL); - xitk_unregister_event_handler(&playlist->widget_key); + playlist_exit(NULL, NULL); + } + else { + if(load_fb) + filebrowser_end(load_fb); + if(save_fb) + filebrowser_end(save_fb); } } Index: setup.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/setup.c,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- setup.c 20 May 2004 01:08:12 -0000 1.96 +++ setup.c 13 Jun 2004 11:44:17 -0000 1.97 @@ -178,7 +178,6 @@ static _setup_t *setup = NULL; -static void setup_end(xitk_widget_t *, void *); static void setup_change_section(xitk_widget_t *, void *, int); static void add_widget_to_list(xitk_widget_t *w) { @@ -188,7 +187,7 @@ /* * Leaving setup panel, release memory. */ -void setup_exit(xitk_widget_t *w, void *data) { +static void setup_exit(xitk_widget_t *w, void *data) { if(setup) { window_info_t wi; @@ -370,7 +369,7 @@ static void setup_ok(xitk_widget_t *w, void *data) { setup_apply(w, data); - setup_end(w, data); + setup_exit(w, data); } /* @@ -1026,7 +1025,7 @@ /* * */ -static void setup_end(xitk_widget_t *w, void *data) { +void setup_end(void) { setup_exit(NULL, NULL); } @@ -1173,7 +1172,7 @@ lb.button_type = CLICK_BUTTON; lb.label = _("Close"); lb.align = ALIGN_CENTER; - lb.callback = setup_end; + lb.callback = setup_exit; lb.state_callback = NULL; lb.userdata = NULL; lb.skin_element_name = NULL; Index: setup.h =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/setup.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- setup.h 13 Apr 2004 19:55:49 -0000 1.9 +++ setup.h 13 Jun 2004 11:44:17 -0000 1.10 @@ -31,11 +31,11 @@ #include "xitk.h" void setup_panel(void); -void setup_exit(xitk_widget_t *, void *); int setup_is_visible(void); int setup_is_running(void); void setup_toggle_visibility(xitk_widget_t *, void *); void setup_raise_window(void); void setup_reparent(void); +void setup_end(void); #endif Index: skins.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/skins.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- skins.c 4 Jun 2004 11:59:33 -0000 1.73 +++ skins.c 13 Jun 2004 11:44:17 -0000 1.74 @@ -676,45 +676,47 @@ return slxs; } -static void download_skin_cancel(xitk_widget_t *w, void *data) { +static void download_skin_exit(xitk_widget_t *w, void *data) { int i; - xitk_unregister_event_handler(&skdloader->widget_key); - - xitk_image_free_image(gGui->imlib_data, &skdloader->preview_image); - - xitk_destroy_widgets(skdloader->widget_list); - xitk_window_destroy_window(gGui->imlib_data, skdloader->xwin); - - skdloader->xwin = NULL; - - xitk_list_free((XITK_WIDGET_LIST_LIST(skdloader->widget_list))); - - XLockDisplay(gGui->display); - XFreeCursor(gGui->display, skdloader->cursor[NORMAL_CURS]); - XFreeCursor(gGui->display, skdloader->cursor[WAIT_CURS]); - XFreeGC(gGui->display, (XITK_WIDGET_LIST_GC(skdloader->widget_list))); - XUnlockDisplay(gGui->display); - - free(skdloader->widget_list); - - for(i = 0; i < skdloader->num; i++) { - SAFE_FREE(skdloader->slxs[i]->name); - SAFE_FREE(skdloader->slxs[i]->author.name); - SAFE_FREE(skdloader->slxs[i]->author.email); - SAFE_FREE(skdloader->slxs[i]->skin.href); - SAFE_FREE(skdloader->slxs[i]->skin.preview); - free(skdloader->slxs[i]); - free(skdloader->entries[i]); + if(skdloader) { + xitk_unregister_event_handler(&skdloader->widget_key); + + xitk_image_free_image(gGui->imlib_data, &skdloader->preview_image); + + xitk_destroy_widgets(skdloader->widget_list); + xitk_window_destroy_window(gGui->imlib_data, skdloader->xwin); + + skdloader->xwin = NULL; + + xitk_list_free((XITK_WIDGET_LIST_LIST(skdloader->widget_list))); + + XLockDisplay(gGui->display); + XFreeCursor(gGui->display, skdloader->cursor[NORMAL_CURS]); + XFreeCursor(gGui->display, skdloader->cursor[WAIT_CURS]); + XFreeGC(gGui->display, (XITK_WIDGET_LIST_GC(skdloader->widget_list))); + XUnlockDisplay(gGui->display); + + free(skdloader->widget_list); + + for(i = 0; i < skdloader->num; i++) { + SAFE_FREE(skdloader->slxs[i]->name); + SAFE_FREE(skdloader->slxs[i]->author.name); + SAFE_FREE(skdloader->slxs[i]->author.email); + SAFE_FREE(skdloader->slxs[i]->skin.href); + SAFE_FREE(skdloader->slxs[i]->skin.preview); + free(skdloader->slxs[i]); + free(skdloader->entries[i]); + } + + free(skdloader->slxs); + free(skdloader->entries); + + skdloader->num = 0; + + free(skdloader); + skdloader = NULL; } - - free(skdloader->slxs); - free(skdloader->entries); - - skdloader->num = 0; - - free(skdloader); - skdloader = NULL; } static void download_update_blank_preview(void) { @@ -990,7 +992,7 @@ if(download.error) free(download.error); - download_skin_cancel(w, NULL); + download_skin_exit(w, NULL); } static void download_skin_handle_event(XEvent *event, void *data) { @@ -1041,7 +1043,7 @@ break; case XK_Escape: - download_skin_cancel(NULL, NULL); + download_skin_exit(NULL, NULL); break; } } @@ -1049,6 +1051,10 @@ } } + +void download_skin_end(void) { + download_skin_exit(NULL, NULL); +} void download_skin(char *url) { #ifdef HAVE_TAR @@ -1207,7 +1213,7 @@ lb.button_type = CLICK_BUTTON; lb.label = _("Cancel"); lb.align = ALIGN_CENTER; - lb.callback = download_skin_cancel; + lb.callback = download_skin_exit; lb.state_callback = NULL; lb.userdata = NULL; lb.skin_element_name = NULL; Index: skins.h =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/skins.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- skins.h 13 Apr 2004 19:55:49 -0000 1.10 +++ skins.h 13 Jun 2004 11:44:17 -0000 1.11 @@ -37,5 +37,6 @@ void select_new_skin(int selected); void download_skin(char *url); const char *skin_get_current_skin_dir(void); +void download_skin_end(void); #endif Index: viewlog.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/viewlog.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- viewlog.c 27 Apr 2004 20:20:11 -0000 1.48 +++ viewlog.c 13 Jun 2004 11:44:17 -0000 1.49 @@ -69,12 +69,10 @@ static _viewlog_t *viewlog = NULL; -static void viewlog_end(xitk_widget_t *, void *); - /* * Leaving setup panel, release memory. */ -void viewlog_exit(xitk_widget_t *w, void *data) { +static void viewlog_exit(xitk_widget_t *w, void *data) { if(viewlog) { window_info_t wi; @@ -342,7 +340,7 @@ /* * Leave viewlog window. */ -static void viewlog_end(xitk_widget_t *w, void *data) { +void viewlog_end(void) { viewlog_exit(NULL, NULL); } @@ -459,7 +457,7 @@ lb.button_type = CLICK_BUTTON; lb.label = _("Close"); lb.align = ALIGN_CENTER; - lb.callback = viewlog_end; + lb.callback = viewlog_exit; lb.state_callback = NULL; lb.userdata = NULL; lb.skin_element_name = NULL; Index: viewlog.h =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/viewlog.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- viewlog.h 13 Apr 2004 19:55:49 -0000 1.11 +++ viewlog.h 13 Jun 2004 11:44:17 -0000 1.12 @@ -31,11 +31,11 @@ #include "xitk.h" void viewlog_panel(void); -void viewlog_exit(xitk_widget_t *, void *); int viewlog_is_visible(void); int viewlog_is_running(void); void viewlog_toggle_visibility(xitk_widget_t *, void *); void viewlog_raise_window(void); void viewlog_reparent(void); +void viewlog_end(void); #endif |