Attachment 48340 Details for Bug 114226

[patch] Proposed fix. Only allow the applet to load once.

resapplet-rml-bnc-114226-1.patch (text/plain), 3.76 KB, created by Robert Love on 2005-08-31 16:43:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Love

Created: 2005-08-31 16:43:19 UTC

Size: 3.76 KB

patch

obsolete

>Index: src/Makefile.am
>===================================================================
>RCS file: /cvs/gnome/resapplet/src/Makefile.am,v
>retrieving revision 1.4
>diff -u -u -r1.4 Makefile.am
>--- src/Makefile.am	12 Aug 2005 20:21:17 -0000	1.4
>+++ src/Makefile.am	31 Aug 2005 16:41:02 -0000
>@@ -19,6 +19,8 @@
> resapplet_SOURCES =	\
> 	eggtrayicon.c	\
> 	eggtrayicon.h	\
>+	clipboard.c	\
>+	clipboard.h	\
> 	resapplet.c
> 
> resapplet_LDADD = @RESAPPLET_LIBS@
>Index: src/clipboard.c
>===================================================================
>RCS file: src/clipboard.c
>diff -N src/clipboard.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/clipboard.c	31 Aug 2005 16:41:02 -0000
>@@ -0,0 +1,72 @@
>+/*
>+ * src/clipboard.c - X clipboard hack to detect if daemon is running
>+ *
>+ * Elliot Lee <sopwith@redhat.com>
>+ *
>+ * (C) Copyright 1999 Red Hat, Inc.
>+ *
>+ * Licensed under the GNU GPL v2.  See COPYING.
>+ */
>+
>+#include "config.h"
>+
>+#include <gnome.h>
>+#include <gconf/gconf-client.h>
>+#include <gdk/gdkx.h>
>+
>+#include "clipboard.h"
>+
>+/*
>+ * clipboard_get_func - dummy get_func for gtk_clipboard_set_with_data ()
>+ */
>+static void
>+clipboard_get_func (GtkClipboard *clipboard G_GNUC_UNUSED,
>+		    GtkSelectionData *selection_data G_GNUC_UNUSED,
>+		    guint info G_GNUC_UNUSED,
>+		    gpointer user_data_or_owner G_GNUC_UNUSED)
>+{
>+}
>+
>+/*
>+ * clipboard_clear_func - dummy clear_func for gtk_clipboard_set_with_data ()
>+ */
>+static void
>+clipboard_clear_func (GtkClipboard *clipboard G_GNUC_UNUSED,
>+		      gpointer user_data_or_owner G_GNUC_UNUSED)
>+{
>+}
>+
>+/*
>+ * resapplet_get_clipboard - try and get the CLIPBOARD_NAME clipboard
>+ *
>+ * Returns TRUE if successfully retrieved and FALSE otherwise.
>+ */
>+gboolean
>+resapplet_get_clipboard (void)
>+{
>+	static const GtkTargetEntry targets[] = { {CLIPBOARD_NAME, 0, 0} };
>+	gboolean retval = FALSE;
>+	GtkClipboard *clipboard;
>+	Atom atom;
>+
>+	atom = gdk_x11_get_xatom_by_name (CLIPBOARD_NAME);
>+
>+	XGrabServer (GDK_DISPLAY ());
>+
>+	if (XGetSelectionOwner (GDK_DISPLAY (), atom) != None)
>+		goto out;
>+
>+	clipboard = gtk_clipboard_get (gdk_atom_intern (CLIPBOARD_NAME, FALSE));
>+
>+	if (gtk_clipboard_set_with_data (clipboard, targets,
>+					 G_N_ELEMENTS (targets),
>+					 clipboard_get_func,
>+					 clipboard_clear_func, NULL))
>+		retval = TRUE;
>+
>+out:
>+	XUngrabServer (GDK_DISPLAY ());
>+	gdk_flush ();
>+
>+	return retval;
>+}
>Index: src/clipboard.h
>===================================================================
>RCS file: src/clipboard.h
>diff -N src/clipboard.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/clipboard.h	31 Aug 2005 16:41:02 -0000
>@@ -0,0 +1,8 @@
>+#ifndef __RESAPPLET_H__
>+#define __RESAPPLET_H__
>+
>+#define CLIPBOARD_NAME		"RESAPPLET_SELECTION"
>+
>+gboolean resapplet_get_clipboard (void);
>+
>+#endif	/* __RESAPPLET_H__ */
>Index: src/resapplet.c
>===================================================================
>RCS file: /cvs/gnome/resapplet/src/resapplet.c,v
>retrieving revision 1.31
>diff -u -u -r1.31 resapplet.c
>--- src/resapplet.c	22 Aug 2005 21:47:19 -0000	1.31
>+++ src/resapplet.c	31 Aug 2005 16:41:03 -0000
>@@ -22,6 +22,7 @@
> #include <gconf/gconf-client.h>
> #include <gtk/gtk.h>
> 
>+#include "clipboard.h"
> #include "eggtrayicon.h"
> 
> #include "config.h"
>@@ -100,7 +101,7 @@
> {
> 	ScreenInfo *current_screen;
> 	GdkWindow *root;
>-	const char *tip;
>+	char *tip;
> 	gint gdk_depth;
> 	guint depth;
> 	
>@@ -904,7 +905,14 @@
> 
> 	client = gnome_master_client ();
> 	gnome_client_set_restart_command (client, argc, argv);
>-	gnome_client_set_restart_style (client, GNOME_RESTART_IF_RUNNING);
>+	if (resapplet_get_clipboard ())
>+		gnome_client_set_restart_style (client,
>+						GNOME_RESTART_IF_RUNNING);
>+	else {
>+		/* if we are already running, silently exit */
>+		gnome_client_set_restart_style (client, GNOME_RESTART_NEVER);
>+		return 1;
>+	}
> 
> 	gtk_init (&argc, &argv);
>

Actions: View | Diff

Attachments on bug 114226: 48223 | 48225 | 48340