Merge lp:~seb128/update-notifier/work-under-wayland into lp:update-notifier/ubuntu

[Sebastien Bacher]

* src/clipboard.c, src/update-notifier.c, src/Makefile.am:
  - don't use the xorg clipboard to do single instance, that doesn't work
    under wayland, replace it with a file lock (lp: #1697381)

* src/clipboard.c, src/update-notifier.c, src/Makefile.am:
  - don't use the xorg clipboard to do single instance, that doesn't work
    under wayland, replace it with a file lock (lp: #1697381)

[Brian Murray (brian-murray)]

This looks good to me, aside of one in-line comment, thanks!

review: Needs Fixing

[Sebastien Bacher (seb128)]

ok, I don't think any change is needed, I connected the code and bug manually on launchpad, let me know if that's enough for you

[Brian Murray (brian-murray)]

That's fine then thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-09-05 21:48:13 +0000
+++ debian/changelog	2017-09-06 09:34:16 +0000
@@ -1,3 +1,11 @@
+update-notifier (3.186) UNRELEASED; urgency=medium
+
+  * src/clipboard.c, src/update-notifier.c, src/Makefile.am:
+    - don't use the xorg clipboard to do single instance, that doesn't work 
+      under wayland, replace it with a file lock (lp: #1697381) 
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 06 Sep 2017 11:29:31 +0200
+
 update-notifier (3.185) artful; urgency=medium
 
   * src/livepatch.c: Use ngettext to correctly handle the plural form, thanks

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2017-08-21 17:30:53 +0000
+++ src/Makefile.am	2017-09-06 09:34:16 +0000
@@ -17,7 +17,6 @@
 
 update_notifier_SOURCES = update-notifier.c \
                            update-notifier.h \
-			   clipboard.c \
 			   rfc822.h\
 			   rfc822.c\
 			   hooks.h\

=== removed file 'src/clipboard.c'
--- src/clipboard.c	2011-07-13 14:54:42 +0000
+++ src/clipboard.c	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * src/clipboard.c - X clipboard hack to detect if daemon is running
- *
- * Elliot Lee <[e-mail]>
- *
- * (C) Copyright 1999 Red Hat, Inc.
- *
- * Licensed under the GNU GPL v2.  See COPYING.
- */
-
-#include "config.h"
-
-#include <gdk/gdkx.h>
-
-#include "update-notifier.h"
-
-/*
- * clipboard_get_func - dummy get_func for gtk_clipboard_set_with_data ()
- */
-static void
-clipboard_get_func (GtkClipboard *clipboard __attribute__((__unused__)),
-		   GtkSelectionData *selection_data __attribute__((__unused__)),
-		    guint info __attribute__((__unused__)),
-		    gpointer user_data_or_owner __attribute__((__unused__)))
-{
-}
-
-/*
- * clipboard_clear_func - dummy clear_func for gtk_clipboard_set_with_data ()
- */
-static void
-clipboard_clear_func (GtkClipboard *clipboard __attribute__((__unused__)),
-		      gpointer user_data_or_owner __attribute__((__unused__)))
-{
-}
-
-/*
- * up_get_clipboard - try and get the CLIPBOARD_NAME clipboard
- *
- * Returns TRUE if successfully retrieved and FALSE otherwise.
- */
-gboolean
-up_get_clipboard (void)
-{
-	static const GtkTargetEntry targets[] = { {CLIPBOARD_NAME, 0, 0} };
-	gboolean retval = FALSE;
-	GtkClipboard *clipboard;
-	Atom atom;
-	Display *display;
-
-	atom = gdk_x11_get_xatom_by_name (CLIPBOARD_NAME);
-	display = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
-
-	XGrabServer (display);
-
-	if (XGetSelectionOwner (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 (display);
-	gdk_flush ();
-
-	return retval;
-}

=== modified file 'src/update-notifier.c'
--- src/update-notifier.c	2015-08-12 16:19:33 +0000
+++ src/update-notifier.c	2017-09-06 09:34:16 +0000
@@ -28,6 +28,8 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <errno.h>
+#include <sys/file.h>
 #include <grp.h>
 #include <pwd.h>
 #include <limits.h>
@@ -46,7 +48,6 @@
 #include "trayappletui.h"
 
 /* some prototypes */
-extern gboolean up_get_clipboard (void);
 gboolean update_timer_finished(gpointer data);
 
 // the time when we check for fam events, in seconds
@@ -535,6 +536,8 @@
 {
 	UpgradeNotifier *un;
 	GError *error = NULL;
+	int pid_file, rc;
+	gchar *lockfn;
 
 	// init
 	if(!gtk_init_with_args (&argc, &argv,
@@ -582,7 +585,11 @@
 	}
 
 	// check if it is running already
-	if (!up_get_clipboard ()) {
+	lockfn = g_build_filename (g_get_user_runtime_dir (), "update-notifier.pid", NULL);
+	pid_file = open (lockfn, O_CREAT | O_RDWR, 0600);
+	g_free (lockfn);
+	rc = flock(pid_file, LOCK_EX | LOCK_NB);
+	if (rc) {
 	   g_warning ("already running?");
 	   return 1;
 	}