diff options
| -rw-r--r-- | gnome-settings-daemon/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-settings-daemon/gnome-settings-daemon.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index 8e918cdbe..5dd6c1313 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,8 @@ +2005-06-12 Sebastien Bacher <seb128@debian.org> + + * gnome-settings-daemon.c: (clipboard_manager_watch_cb): + return instead of using an assertion (Closes: #307149). + 2005-06-12 Christophe Fergeau <teuf@gnome.org> * actions/acme-volume-gstreamer.c: diff --git a/gnome-settings-daemon/gnome-settings-daemon.c b/gnome-settings-daemon/gnome-settings-daemon.c index cc22c9ba2..e1cc0e09a 100644 --- a/gnome-settings-daemon/gnome-settings-daemon.c +++ b/gnome-settings-daemon/gnome-settings-daemon.c @@ -180,7 +180,8 @@ clipboard_manager_watch_cb (Window window, } else { - g_assert (gdkwin); + if (!gdkwin) + return; gdk_window_remove_filter (gdkwin, clipboard_manager_event_filter, NULL); g_object_unref (gdkwin); } |