GNOME Bugzilla – Bug 646084
FT dialog should have a Close button
Last modified: 2011-04-08 10:10:34 UTC
All the dialogs but this one have one.
Created attachment 185409 [details] [review] http://git.collabora.co.uk/?p=user/cassidy/empathy;a=shortlog;h=refs/heads/close-ft-646084 src/empathy-ft-manager.c | 44 +++++++++++++++++++++++++++----------------- src/empathy-ft-manager.ui | 13 +++++++++++++ 2 files changed, 40 insertions(+), 17 deletions(-)
+ if (g_hash_table_size (priv->ft_handler_to_row_ref) > 0) + { + /* There is still FTs on flight, just hide the window */ + DEBUG ("Hiding window"); + gtk_widget_hide (priv->window); + return TRUE; + } + + return FALSE; +} Shouldn't we gtk_widget_destroy (priv->window) in an else { } clause? Otherwise if there are no pending FT, when/how is the window closed?
Indeed, nice catch. We just have to do it in the close button case: with the delete-event signal, the propagation of the signal destroy the window in GTK+ directly. I updated the branch.
Created attachment 185416 [details] [review] http://git.collabora.co.uk/?p=user/cassidy/empathy;a=shortlog;h=refs/heads/close-ft-646084 src/empathy-ft-manager.c | 47 ++++++++++++++++++++++++++++---------------- src/empathy-ft-manager.ui | 13 ++++++++++++ 2 files changed, 43 insertions(+), 17 deletions(-)
++
Merged to master. This problem has been fixed in the development version. The fix will be available in the next major software release. Thank you for your bug report.