[Xfce4-commits] <xfce4-clipman-plugin:master> collector: Check instance types of GtkClipboard (bug 6323)

[Mike Massonnet]

Updating branch refs/heads/master
         to a21833e6eb4e942d6eec5b52efb8309d2f42c048 (commit)
       from 6167c3a5bae9dfcce3710127ae28d14b66e02f46 (commit)

commit a21833e6eb4e942d6eec5b52efb8309d2f42c048
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Wed Oct 19 22:01:39 2011 +0200

    collector: Check instance types of GtkClipboard (bug 6323)

 panel-plugin/collector.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/panel-plugin/collector.c b/panel-plugin/collector.c
index a2705d0..10aa7b5 100644
--- a/panel-plugin/collector.c
+++ b/panel-plugin/collector.c
@@ -93,6 +93,8 @@ cb_clipboard_owner_change (ClipmanCollector *collector,
   gchar *text;
   GdkPixbuf *image;
 
+  g_return_if_fail (GTK_IS_CLIPBOARD (collector->priv->default_clipboard) && GTK_IS_CLIPBOARD (collector->priv->primary_clipboard));
+
   /* Jump over if collector is inhibited */
   if (collector->priv->inhibit)
     {
@@ -151,6 +153,8 @@ cb_check_primary_clipboard (ClipmanCollector *collector)
   GdkModifierType state;
   gchar *text;
 
+  g_return_if_fail (GTK_IS_CLIPBOARD (collector->priv->default_clipboard) && GTK_IS_CLIPBOARD (collector->priv->primary_clipboard));
+
   /* Postpone until the selection is done */
   gdk_window_get_pointer (NULL, NULL, NULL, &state);
   if (state & (GDK_BUTTON1_MASK|GDK_SHIFT_MASK))