[gnome-keyring] Cleanup gkr_unix_signal and move to egg component

[Stefan Walter <stefw src gnome org>]

commit e78027e151bbaff82ab8799aec13c7be5002311b
Author: Stef Walter <stef memberwebs com>
Date:   Sun May 10 14:45:18 2009 +0000

    Cleanup gkr_unix_signal and move to egg component
    
    Also update tests to new style.
---
 common/Makefile.am                                |    3 +-
 common/tests/Makefile.am                          |    3 +-
 daemon/gkr-daemon.c                               |    8 +++---
 egg/Makefile.am                                   |    1 +
 common/gkr-unix-signal.c => egg/egg-unix-signal.c |   10 +++---
 common/gkr-unix-signal.h => egg/egg-unix-signal.h |   14 +++++-----
 egg/tests/Makefile.am                             |    1 +
 {common => egg}/tests/unit-test-signal.c          |   29 +++++++++-----------
 8 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index 3c2ce4a..d5f2991 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -22,8 +22,7 @@ libgkr_common_la_SOURCES = \
 	gkr-async.c gkr-async.h \
 	gkr-cleanup.c gkr-cleanup.h \
 	gkr-location.c gkr-location.h \
-	gkr-location-watch.c gkr-location-watch.h \
-	gkr-unix-signal.c gkr-unix-signal.h
+	gkr-location-watch.c gkr-location-watch.h
 
 libgkr_common_la_LIBADD = \
 	$(top_builddir)/egg/libegg.la \
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index 239755b..fbcfe7e 100644
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -2,8 +2,7 @@ UNIT_AUTO = \
 	unit-test-async.c \
 	unit-test-cleanup.c \
 	unit-test-location.c \
-	unit-test-location-watch.c \
-	unit-test-signal.c
+	unit-test-location-watch.c
 
 UNIT_PROMPT = 
 
diff --git a/daemon/gkr-daemon.c b/daemon/gkr-daemon.c
index 3d0212d..e1ec935 100644
--- a/daemon/gkr-daemon.c
+++ b/daemon/gkr-daemon.c
@@ -27,11 +27,11 @@
 
 #include "common/gkr-async.h"
 #include "common/gkr-cleanup.h"
-#include "common/gkr-unix-signal.h"
 
 #include "egg/egg-libgcrypt.h"
 #include "egg/egg-secure-memory.h"
 #include "egg/egg-unix-credentials.h"
+#include "egg/egg-unix-signal.h"
 
 #include "keyrings/gkr-keyring-login.h"
 
@@ -745,9 +745,9 @@ main (int argc, char *argv[])
 	prepare_logging();
 
 	signal (SIGPIPE, SIG_IGN);
-	gkr_unix_signal_connect (ctx, SIGINT, signal_handler, NULL);
-	gkr_unix_signal_connect (ctx, SIGHUP, signal_handler, NULL);
-	gkr_unix_signal_connect (ctx, SIGTERM, signal_handler, NULL);
+	egg_unix_signal_connect (ctx, SIGINT, signal_handler, NULL);
+	egg_unix_signal_connect (ctx, SIGHUP, signal_handler, NULL);
+	egg_unix_signal_connect (ctx, SIGTERM, signal_handler, NULL);
              
 	/* TODO: Do we still need this? XFCE still seems to use it. */
 	slave_lifetime_to_fd ();
diff --git a/egg/Makefile.am b/egg/Makefile.am
index 153b262..3c429a8 100644
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -28,6 +28,7 @@ libegg_la_SOURCES = \
 	egg-unix-credentials.c egg-unix-credentials.h \
 	egg-secure-memory.c egg-secure-memory.h \
 	egg-symkey.c egg-symkey.h \
+	egg-unix-signal.c egg-unix-signal.h \
 	$(BUILT_SOURCES)
 	
 asn1-def-pk.h: pk.asn
diff --git a/common/gkr-unix-signal.c b/egg/egg-unix-signal.c
similarity index 94%
rename from common/gkr-unix-signal.c
rename to egg/egg-unix-signal.c
index 9610f50..dfd42d9 100644
--- a/common/gkr-unix-signal.c
+++ b/egg/egg-unix-signal.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* gkr-unix-signal.c - integrate unix signals into the main loop
+/* egg-unix-signal.c - integrate unix signals into the main loop
 
    Copyright (C) 2007 Stefan Walter
 
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "gkr-unix-signal.h"
+#include "egg-unix-signal.h"
 
 #include <glib.h>
 
@@ -156,7 +156,7 @@ static gboolean
 signal_events_dispatch (GSource *source, GSourceFunc callback, gpointer user_data)
 {
 	SignalWatch *sw = (SignalWatch*)source;
-	GkrUnixSignalHandler func = (GkrUnixSignalHandler)callback;
+	EggUnixSignalHandler func = (EggUnixSignalHandler)callback;
 
 	wakeup_drain ();
 	
@@ -191,8 +191,8 @@ static GSourceFuncs signal_events_functions = {
 };
 
 guint 
-gkr_unix_signal_connect (GMainContext *ctx, guint sig, 
-                         GkrUnixSignalHandler func, gpointer user_data)
+egg_unix_signal_connect (GMainContext *ctx, guint sig,
+                         EggUnixSignalHandler func, gpointer user_data)
 {
 	SignalWatch *sw;
 	GSource *src;
diff --git a/common/gkr-unix-signal.h b/egg/egg-unix-signal.h
similarity index 74%
rename from common/gkr-unix-signal.h
rename to egg/egg-unix-signal.h
index 7e0a82f..aa32050 100644
--- a/common/gkr-unix-signal.h
+++ b/egg/egg-unix-signal.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* gkr-unix-signal.h - integrate unix signals into the main loop
+/* egg-unix-signal.h - integrate unix signals into the main loop
 
    Copyright (C) 2007 Stefan Walter
 
@@ -21,14 +21,14 @@
    Author: Stef Walter <stef memberwebs com>
 */
 
-#ifndef GKRUNIXSIGNAL_H_
-#define GKRUNIXSIGNAL_H_
+#ifndef EGGUNIXSIGNAL_H_
+#define EGGUNIXSIGNAL_H_
 
 #include <glib.h>
 
-typedef gboolean (*GkrUnixSignalHandler)     (guint sig, gpointer user_data);
+typedef gboolean (*EggUnixSignalHandler)     (guint sig, gpointer user_data);
 
-guint    gkr_unix_signal_connect             (GMainContext *ctx, guint sig, 
-                                              GkrUnixSignalHandler handler, gpointer user_data);
+guint    egg_unix_signal_connect             (GMainContext *ctx, guint sig,
+                                              EggUnixSignalHandler handler, gpointer user_data);
 
-#endif /* GKRUNIXSIGNAL_H_ */
+#endif /* EGGUNIXSIGNAL_H_ */
diff --git a/egg/tests/Makefile.am b/egg/tests/Makefile.am
index 8fa5c6e..dec508c 100644
--- a/egg/tests/Makefile.am
+++ b/egg/tests/Makefile.am
@@ -13,6 +13,7 @@ UNIT_AUTO = \
 	unit-test-secmem.c \
 	unit-test-symkey.c \
 	unit-test-openssl.c \
+	unit-test-signal.c \
 	$(BUILT_SOURCES)
 
 UNIT_PROMPT = 
diff --git a/common/tests/unit-test-signal.c b/egg/tests/unit-test-signal.c
similarity index 74%
rename from common/tests/unit-test-signal.c
rename to egg/tests/unit-test-signal.c
index 9b31150..3a53338 100644
--- a/common/tests/unit-test-signal.c
+++ b/egg/tests/unit-test-signal.c
@@ -33,7 +33,7 @@
 
 #include "run-auto-test.h"
 
-#include "common/gkr-unix-signal.h"
+#include "egg/egg-unix-signal.h"
 
 /* 
  * Each test looks like (on one line):
@@ -52,7 +52,6 @@ static guint last_signal = 0;
 static const gchar *test_arg = "data";
 
 typedef struct _SignalParam {
-	CuTest *cu;
 	const gchar *argument;
 } SignalParam;
 
@@ -60,51 +59,49 @@ static gboolean
 handle_signal (guint sig, gpointer data)
 {
 	SignalParam *param = (SignalParam*)data;
-	CuAssert(param->cu, "user data not passed properly", param->argument == test_arg);
+	g_assert_cmpstr (param->argument, ==, test_arg);
 	last_signal = sig;
 	test_mainloop_quit ();
 	return TRUE;
 }
 
-void unit_test_unix_signal (CuTest* cu)
+DEFINE_TEST(unix_signal)
 {
 	SignalParam param;
 	GMainContext *ctx;
 	
-	param.cu = cu;
 	param.argument = test_arg;
 	
 	ctx = g_main_loop_get_context (test_mainloop_get ());
-	gkr_unix_signal_connect (ctx, SIGHUP, handle_signal, &param);
-	gkr_unix_signal_connect (ctx, SIGINT, handle_signal, &param);
+	egg_unix_signal_connect (ctx, SIGHUP, handle_signal, &param);
+	egg_unix_signal_connect (ctx, SIGINT, handle_signal, &param);
 
 	raise (SIGHUP);
 	test_mainloop_run (2000);
-	CuAssert (cu, "signal not handled", last_signal == SIGHUP);
+	g_assert_cmpint (last_signal, ==, SIGHUP);
 
 	raise (SIGINT);
 	test_mainloop_run (2000);
-	CuAssert (cu, "signal not handled", last_signal == SIGINT);
+	g_assert_cmpint (last_signal, ==, SIGINT);
 
-	gkr_unix_signal_connect (ctx, SIGTERM, handle_signal, &param);
+	egg_unix_signal_connect (ctx, SIGTERM, handle_signal, &param);
 	raise (SIGTERM);
 	test_mainloop_run (2000);
-	CuAssert (cu, "signal not handled", last_signal == SIGTERM);
+	g_assert_cmpint (last_signal, ==, SIGTERM);
 }		
 
-void unit_test_unix_sig_remove (CuTest* cu)
+DEFINE_TEST(unix_sig_remove)
 {
 	SignalParam param;
 	guint id;
 
-	param.cu = cu;
 	param.argument = test_arg;
 		
-	id = gkr_unix_signal_connect (g_main_loop_get_context (test_mainloop_get ()),
+	id = egg_unix_signal_connect (g_main_loop_get_context (test_mainloop_get ()),
 	                              SIGCONT, handle_signal, &param);
 	raise (SIGCONT);
 	test_mainloop_run (2000);
-	CuAssert (cu, "signal not handled", last_signal == SIGCONT);
+	g_assert_cmpint (last_signal, ==, SIGCONT);
 	
 	/* Remove the handler */
 	last_signal = 0;	
@@ -113,5 +110,5 @@ void unit_test_unix_sig_remove (CuTest* cu)
 	/* Should be ignored */
 	raise (SIGCONT);
 	test_mainloop_run (2000);
-	CuAssert (cu, "signal handler not removed properly", last_signal == 0);
+	g_assert_cmpint (last_signal, ==, 0);
 }