[Xfce4-commits] <xfce4-screenshooter:master> Use gdk function for the running clipboard manager.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 66b30c57cc779adf36d3e8f3fb50f3018b845b31 (commit)
       from 43b338fd44a25ba821a92db7d5f061079f73b932 (commit)

commit 66b30c57cc779adf36d3e8f3fb50f3018b845b31
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Nov 8 14:42:01 2009 +0100

    Use gdk function for the running clipboard manager.
    
    Thanks to Mike for noticing this function.

 lib/screenshooter-dialogs.c |    3 ++-
 lib/screenshooter-utils.c   |   12 ------------
 lib/screenshooter-utils.h   |    4 ----
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/lib/screenshooter-dialogs.c b/lib/screenshooter-dialogs.c
index aa3dbe2..7592795 100644
--- a/lib/screenshooter-dialogs.c
+++ b/lib/screenshooter-dialogs.c
@@ -941,7 +941,8 @@ GtkWidget *screenshooter_actions_dialog_new (ScreenshotData *sd)
   gtk_widget_set_tooltip_text (save_radio_button, _("Save the screenshot to a PNG file"));
   gtk_box_pack_start (GTK_BOX (actions_box), save_radio_button, FALSE, FALSE, 0);
 
-  if (sd->plugin || screenshooter_clipboard_manager ())
+  if (sd->plugin ||
+      gdk_display_supports_clipboard_persistence (gdk_display_get_default ()))
     {
       /* Copy to clipboard radio button */
       clipboard_radio_button =
diff --git a/lib/screenshooter-utils.c b/lib/screenshooter-utils.c
index 178d820..477596f 100644
--- a/lib/screenshooter-utils.c
+++ b/lib/screenshooter-utils.c
@@ -369,15 +369,3 @@ screenshooter_f1_key (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 
   return FALSE;
 }
-
-gboolean
-screenshooter_clipboard_manager (void)
-{
-  Display *display;
-  Atom atom;
-
-  display = GDK_DISPLAY ();
-  atom = XInternAtom (display, "CLIPBOARD_MANAGER", FALSE);
-  return XGetSelectionOwner (display, atom);
-}
-
diff --git a/lib/screenshooter-utils.h b/lib/screenshooter-utils.h
index e1bff5f..f40929a 100644
--- a/lib/screenshooter-utils.h
+++ b/lib/screenshooter-utils.h
@@ -55,9 +55,5 @@ void      screenshooter_open_help             (void);
 gboolean  screenshooter_f1_key                (GtkWidget      *widget,
                                                GdkEventKey    *event,
                                                gpointer        user_data);
-gboolean  screenshooter_clipboard_manager     (void);
-
-
-
 
 #endif