Mercurial > audlegacy
changeset 3279:065ae0990247 trunk
Automated merge with ssh://hg.atheme.org//hg/audacious
| author | William Pitcock <nenolod@atheme-project.org> |
|---|---|
| date | Thu, 09 Aug 2007 03:13:25 -0500 |
| parents | 04df6bd984ad (current diff) 949480cc9d98 (diff) |
| children | a26138e391ee |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/ui_main.c Thu Aug 09 03:13:01 2007 -0500 +++ b/src/audacious/ui_main.c Thu Aug 09 03:13:25 2007 -0500 @@ -523,7 +523,7 @@ static void mainwin_refresh_visible(void) { - if (!bmp_active_skin) + if (!bmp_active_skin || !cfg.player_visible) return; gtk_widget_show_all(mainwin);
--- a/src/audacious/ui_skinned_playlist.c Thu Aug 09 03:13:01 2007 -0500 +++ b/src/audacious/ui_skinned_playlist.c Thu Aug 09 03:13:25 2007 -0500 @@ -160,7 +160,6 @@ playlist->prev_selected = -1; playlist->prev_min = -1; playlist->prev_max = -1; - playlist->tooltips = TRUE; g_object_set_data(G_OBJECT(playlist), "timer_id", GINT_TO_POINTER(0)); g_object_set_data(G_OBJECT(playlist), "timer_active", GINT_TO_POINTER(0)); @@ -812,7 +811,6 @@ if (nr == -1) return FALSE; - pl->tooltips = FALSE; if (event->button == 3) { GList* selection = playlist_get_selected(playlist); if (g_list_find(selection, GINT_TO_POINTER(nr)) == NULL) { @@ -862,6 +860,8 @@ priv->dragging = TRUE; } playlistwin_update_list(playlist); + ui_skinned_playlist_popup_hide(widget); + ui_skinned_playlist_popup_timer_stop(widget); return TRUE; } @@ -873,9 +873,11 @@ priv->dragging = FALSE; priv->auto_drag_down = FALSE; priv->auto_drag_up = FALSE; - UI_SKINNED_PLAYLIST(widget)->tooltips = TRUE; gtk_widget_queue_draw(widget); } + + ui_skinned_playlist_popup_hide(widget); + ui_skinned_playlist_popup_timer_stop(widget); return TRUE; }
--- a/src/audacious/ui_skinned_playlist.h Thu Aug 09 03:13:01 2007 -0500 +++ b/src/audacious/ui_skinned_playlist.h Thu Aug 09 03:13:25 2007 -0500 @@ -48,7 +48,6 @@ gint first; gint num_visible; gint prev_selected, prev_min, prev_max; - gboolean tooltips; gboolean drag_motion; gint drag_motion_x, drag_motion_y; gint fheight;