After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 646084 - FT dialog should have a Close button
FT dialog should have a Close button
Status: RESOLVED FIXED
Product: empathy
Classification: Core
Component: File Transfer
2.33.x
Other Linux
: Normal enhancement
: 3.2
Assigned To: empathy-maint
Depends on:
Blocks:
 
 
Reported: 2011-03-29 11:57 UTC by Guillaume Desmottes
Modified: 2011-04-08 10:10 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
http://git.collabora.co.uk/?p=user/cassidy/empathy;a=shortlog;h=refs/heads/close-ft-646084 (3.18 KB, patch)
2011-04-07 11:12 UTC, Guillaume Desmottes
none Details | Review
http://git.collabora.co.uk/?p=user/cassidy/empathy;a=shortlog;h=refs/heads/close-ft-646084 (3.39 KB, patch)
2011-04-07 12:08 UTC, Guillaume Desmottes
none Details | Review

Description Guillaume Desmottes 2011-03-29 11:57:21 UTC
All the dialogs but this one have one.
Comment 1 Guillaume Desmottes 2011-04-07 11:12:15 UTC
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(-)
Comment 2 Emilio Pozuelo Monfort 2011-04-07 11:28:22 UTC
+  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?
Comment 3 Guillaume Desmottes 2011-04-07 12:08:33 UTC
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.
Comment 4 Guillaume Desmottes 2011-04-07 12:08:43 UTC
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(-)
Comment 5 Emilio Pozuelo Monfort 2011-04-07 12:36:49 UTC
++
Comment 6 Guillaume Desmottes 2011-04-08 10:10:34 UTC
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.