[gnome-screenshot] screenshot: don't use an X selection to ensure a single instance
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-screenshot] screenshot: don't use an X selection to ensure a single instance
- Date: Thu, 26 Jan 2012 00:20:19 +0000 (UTC)
commit 1adb8ba3e46eef36f3814b429bed0f6b7f264f47
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Jan 25 17:53:41 2012 -0500
screenshot: don't use an X selection to ensure a single instance
Now that we use GApplication this is no longer needed \o/
src/screenshot-utils.c | 59 ------------------------------------------------
1 files changed, 0 insertions(+), 59 deletions(-)
---
diff --git a/src/screenshot-utils.c b/src/screenshot-utils.c
index a8b0854..37338a7 100644
--- a/src/screenshot-utils.c
+++ b/src/screenshot-utils.c
@@ -36,59 +36,6 @@
#include "screenshot-config.h"
#include "screenshot-utils.h"
-static GtkWidget *selection_window;
-
-#define SELECTION_NAME "_GNOME_PANEL_SCREENSHOT"
-
-/* To make sure there is only one screenshot taken at a time,
- * (Imagine key repeat for the print screen key) we hold a selection
- * until we are done taking the screenshot
- */
-gboolean
-screenshot_grab_lock (void)
-{
- GdkAtom selection_atom;
- gboolean result = FALSE;
-
- selection_atom = gdk_atom_intern (SELECTION_NAME, FALSE);
- gdk_x11_grab_server ();
-
- if (gdk_selection_owner_get (selection_atom) != NULL)
- goto out;
-
- selection_window = gtk_invisible_new ();
- gtk_widget_show (selection_window);
-
- if (!gtk_selection_owner_set (selection_window,
- gdk_atom_intern (SELECTION_NAME, FALSE),
- GDK_CURRENT_TIME))
- {
- gtk_widget_destroy (selection_window);
- selection_window = NULL;
- goto out;
- }
-
- result = TRUE;
-
- out:
- gdk_x11_ungrab_server ();
- gdk_flush ();
-
- return result;
-}
-
-void
-screenshot_release_lock (void)
-{
- if (selection_window)
- {
- gtk_widget_destroy (selection_window);
- selection_window = NULL;
- }
-
- gdk_flush ();
-}
-
static GdkWindow *
screenshot_find_active_window (void)
{
@@ -645,9 +592,6 @@ screenshot_get_pixbuf (GdkRectangle *rectangle)
GError *error = NULL;
GDBusConnection *connection;
- if (!screenshot_grab_lock ())
- exit (0);
-
path = g_build_filename (g_get_user_cache_dir (), "gnome-screenshot", NULL);
g_mkdir_with_parents (path, 0700);
@@ -710,9 +654,6 @@ screenshot_get_pixbuf (GdkRectangle *rectangle)
if (screenshot != NULL)
screenshot_play_sound_effect ();
- /* release now the lock */
- screenshot_release_lock ();
-
g_free (path);
g_free (tmpname);
g_free (filename);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]