[Xfce4-commits] <thunar:master> Hide status icon prior to destroying it (bug #6891). Patch by Xavier D.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 8a9a5174448ff5699f6935c04b3c86642634fb92 (commit)
       from 15d09e647bba5ee2999873e13025143809e712fc (commit)

commit 8a9a5174448ff5699f6935c04b3c86642634fb92
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Mon Dec 6 10:34:51 2010 +0100

    Hide status icon prior to destroying it (bug #6891). Patch by Xavier D.
    
    This appears to be a bug in GTK+. If the status icon is not hidden
    before it is destroyed, it will sometimes not disappear (the
    notification area will never receive a "removed" signal). For more
    information please see
    
      http://bugzilla.gnome.org/show_bug.cgi?id=589860

 NEWS                            |    2 ++
 thunar/thunar-progress-dialog.c |    7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 9024237..0760930 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 1.1.x
 =====
 - Fix unused variable warning when building with GLib < 2.20.
+- Fix file operation status icon not disappearing by hiding the icon
+  prior to destroying it (bug #6891). Patch by Xavier D.
 
 1.1.5
 =====
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index ab8155c..ca9409c 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -1,6 +1,6 @@
 /* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
- * Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
+ * Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of the GNU General Public License as
@@ -131,7 +131,10 @@ thunar_progress_dialog_finalize (GObject *object)
 
   /* destroy the status icon */
   if (dialog->status_icon != NULL)
-    g_object_unref (dialog->status_icon);
+    {
+      gtk_status_icon_set_visible (dialog->status_icon, FALSE);
+      g_object_unref (dialog->status_icon);
+    }
 
   /* free the view list */
   g_list_free (dialog->views);