From 49d8745278805ede5c41bae3c299e14ba40457bf Mon Sep 17 00:00:00 2001
From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 10 Sep 2008 22:30:50 +0000
Subject: Merge changes from CUPS 1.4svn-r7932.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@957 a1ca3aef-8c08-0410-bb20-df032aa958be
---
 notifier/Dependencies |  3 +++
 notifier/Makefile     | 12 ++++--------
 notifier/dbus.c       |  6 ++++--
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'notifier')

diff --git a/notifier/Dependencies b/notifier/Dependencies
index a27cdfea4..8f5cfed1d 100644
--- a/notifier/Dependencies
+++ b/notifier/Dependencies
@@ -1,5 +1,8 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
+dbus.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+dbus.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+dbus.o: ../cups/string.h ../config.h
 mailto.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
 mailto.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 mailto.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
diff --git a/notifier/Makefile b/notifier/Makefile
index 2c80380a6..1f63c8497 100644
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -64,10 +64,6 @@ install:	all install-data install-headers install-libs install-exec
 install-data:
 	$(INSTALL_DIR) -m 775 $(CACHEDIR)/rss
 	-chgrp $(CUPS_GROUP) $(CACHEDIR)/rss
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		cp $(NOTIFIERS) $(SYMROOT); \
-	fi
 
 
 #
@@ -80,6 +76,10 @@ install-exec:
 	for file in $(NOTIFIERS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/notifier; \
 	done
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		cp $(NOTIFIERS) $(SYMROOT); \
+	fi
 
 
 #
@@ -125,10 +125,6 @@ dbus:	dbus.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o dbus dbus.o $(DBUS_NOTIFIERLIBS) $(LIBS)
 
-dbus.o:	dbus.h
-dbus.h:	dbus-notifier.xml
-	dbus-binding-tool --mode=glib-server $< >$@
-
 
 #
 # mailto
diff --git a/notifier/dbus.c b/notifier/dbus.c
index 1f1c43a21..4b51b6258 100644
--- a/notifier/dbus.c
+++ b/notifier/dbus.c
@@ -16,6 +16,8 @@
  *
  * Contents:
  *
+ *   main()         - Read events and send DBUS notifications.
+ *   acquire_lock() - Acquire a lock so we only have a single notifier running.
  */
 
 /*
@@ -154,7 +156,7 @@ enum
  * Local functions...
  */
 
-static int	acquire_lock(int *fd);
+static int	acquire_lock(int *fd, char *lockfile, size_t locksize);
 
 
 /*
@@ -201,7 +203,7 @@ main(int  argc,				/* I - Number of command-line args */
     return (1);
   }
 
-  if (strcmp(argv[1], "dbus:"))
+  if (strncmp(argv[1], "dbus:", 5))
   {
     fprintf(stderr, "ERROR: Bad URI \"%s\"!\n", argv[1]);
     return (1);
-- 
cgit v1.2.1