diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2006-08-30 20:48:16 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2006-08-30 20:48:16 +0000 |
| commit | a61f25dfe9dcf1f29852d917779529d26e762ea5 (patch) | |
| tree | c4e13a95f78c22ae705234ad8deda6cea4fa1973 /libs/gtkmm2ext/popup.cc | |
| parent | 6535cd1b1dbab7cc59a356c81d92dbc2cf25333b (diff) | |
** requires svn jack ** Hardware monitoring should work, some canvas scrolling speed improvement, don't disconcertingly churn the disk if jack auto-start fails, mixer visibility state is saved per session, slow down meters a bit (too much?), zoom cleanups, remove some unused variables, use rwlock for tempo state for no reason other than that it might be useful one day, fix compiler warning.
git-svn-id: svn://localhost/ardour2/trunk@873 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/popup.cc')
| -rw-r--r-- | libs/gtkmm2ext/popup.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/gtkmm2ext/popup.cc b/libs/gtkmm2ext/popup.cc index a8ffc4af66..0b150eefe1 100644 --- a/libs/gtkmm2ext/popup.cc +++ b/libs/gtkmm2ext/popup.cc @@ -74,7 +74,7 @@ PopUp::remove () hide (); if (popdown_time != 0 && timeout != -1) { - gtk_timeout_remove (timeout); + g_source_remove (timeout); } if (delete_on_hide) { @@ -94,7 +94,7 @@ PopUp::touch () show_all (); if (popdown_time != 0) { - timeout = gtk_timeout_add (popdown_time, + timeout = g_timeout_add (popdown_time, remove_prompt_timeout, this); } @@ -127,12 +127,12 @@ PopUp::on_delete_event (GdkEventAny* ev) hide(); if (popdown_time != 0 && timeout != -1) { - gtk_timeout_remove (timeout); + g_source_remove (timeout); } if (delete_on_hide) { std::cerr << "deleting prompter\n" << endl; - gtk_idle_add (idle_delete, this); + g_idle_add (idle_delete, this); } return true; |