Mercurial > audlegacy
changeset 486:c4a560cb40f9 trunk
[svn] Always on top fix.
| author | nenolod |
|---|---|
| date | Mon, 23 Jan 2006 14:07:43 -0800 |
| parents | 59739d266dba |
| children | a2478a8475ee |
| files | audacious/main.c audacious/main.h audacious/mainwin.c |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/audacious/main.c Mon Jan 23 13:53:26 2006 -0800 +++ b/audacious/main.c Mon Jan 23 14:07:43 2006 -0800 @@ -312,6 +312,7 @@ gboolean pposition_broken = FALSE; +gboolean starting_up = TRUE; static GSList * get_feature_list(void) @@ -1031,12 +1032,13 @@ if (cfg.playlist_visible) playlistwin_show(); - /* FIXME: move this away */ hint_set_always(cfg.always_on_top); playlist_start_get_info_thread(); mainwin_attach_idle_func(); + starting_up = FALSE; + gtk_main(); GDK_THREADS_LEAVE(); @@ -1048,6 +1050,8 @@ mainwin_set_info_text(); playlist_start_get_info_thread(); + starting_up = FALSE; + for (;;) { /* headless eventloop */
--- a/audacious/main.h Mon Jan 23 13:53:26 2006 -0800 +++ b/audacious/main.h Mon Jan 23 14:07:43 2006 -0800 @@ -135,6 +135,8 @@ extern GList *dock_window_list; extern gboolean pposition_broken; +extern gboolean starting_up; + void bmp_config_save(void); void bmp_config_load(void);
--- a/audacious/mainwin.c Mon Jan 23 13:53:26 2006 -0800 +++ b/audacious/mainwin.c Mon Jan 23 14:07:43 2006 -0800 @@ -2429,7 +2429,10 @@ mainwin_menurow->mr_always_selected = GTK_CHECK_MENU_ITEM(item)->active; cfg.always_on_top = mainwin_menurow->mr_always_selected; widget_draw(WIDGET(mainwin_menurow)); - hint_set_always(cfg.always_on_top); + + if (starting_up == FALSE) + hint_set_always(cfg.always_on_top); + break; case MAINWIN_OPT_STICKY: cfg.sticky = GTK_CHECK_MENU_ITEM(item)->active;