[Xfce4-commits] <xfce4-panel:master> Remove a useless warning from the systray.

Nick Schermer noreply at xfce.org
Thu Jun 10 19:08:01 CEST 2010


Updating branch refs/heads/master
         to 655e11d8cadda8357e5315ab10e2bc5a8cab64f3 (commit)
       from 9b964cf8528b74ab0d5b8e27c8bc3787001c2e9f (commit)

commit 655e11d8cadda8357e5315ab10e2bc5a8cab64f3
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Jun 10 19:06:03 2010 +0200

    Remove a useless warning from the systray.

 plugins/systray/systray-manager.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/systray/systray-manager.c b/plugins/systray/systray-manager.c
index 11731b1..1cfa938 100644
--- a/plugins/systray/systray-manager.c
+++ b/plugins/systray/systray-manager.c
@@ -448,13 +448,13 @@ systray_manager_unregister (SystrayManager *manager)
 
   /* remove our handling of the selection if we're the owner */
   owner = gdk_selection_owner_get_for_display (display, manager->selection_atom);
-  if (owner != invisible->window
-      || !gdk_selection_owner_set_for_display (display,
-                                               NULL,
-                                               manager->selection_atom,
-                                               gdk_x11_get_server_time (invisible->window),
-                                               TRUE))
-    panel_assert_not_reached ();
+  if (owner == invisible->window)
+    {
+      gdk_selection_owner_set_for_display (display, NULL,
+                                           manager->selection_atom,
+                                           gdk_x11_get_server_time (invisible->window),
+                                           TRUE);
+    }
 
   /* remove window filter */
   gdk_window_remove_filter (invisible->window,



More information about the Xfce4-commits mailing list