gtkdialog3/patches/gtkdialog3-0.7.20-signal-name-conflict.patch

diff -Nurwa gtkdialog-0.7.9-v/src/glade_support.c gtkdialog-0.7.9/src/glade_support.c
--- gtkdialog-0.7.9-v/src/glade_support.c	2006-10-30 12:19:51.000000000 +0100
+++ gtkdialog-0.7.9/src/glade_support.c	2008-11-10 12:32:34.511181571 +0100
@@ -37,10 +37,10 @@
  *                                                                       *
  *                                                                       *
  *************************************************************************/
-typedef struct signal {
+typedef struct _signal {
 	gchar     *name;
 	GCallback callback;
-} signal;
+} _signal;
 
 /*
 ** Signal handler callbascks.
@@ -206,7 +206,7 @@
 static gboolean
 find_and_connect_handler(
 		GtkWidget *widget,
-		signal *signals,
+		_signal *signals,
 		const gchar *signal_name,
 		const gchar *handler_name)
 {
@@ -288,7 +288,7 @@
 		gpointer user_data)
 {
 	gint n;
-	signal entry_signals[] = {
+	_signal entry_signals[] = {
 		{ "activate",           (GCallback)on_any_entry_almost_any },
 		{ "backspace",          (GCallback)on_any_entry_almost_any },
 		{ "copy-clipboard",     (GCallback)on_any_entry_almost_any },
@@ -319,7 +319,7 @@
 		gpointer user_data)
 {
 	variable *var;
-	signal widget_signals[] = {
+	_signal widget_signals[] = {
 		{ "accel-closures-changed",    (GCallback)on_any_widget_almost_any },
 		{ "composited-changed",        (GCallback)on_any_widget_almost_any },
 		{ "grab-focus",                (GCallback)on_any_widget_almost_any },
1	diff -Nurwa gtkdialog-0.7.9-v/src/glade_support.c gtkdialog-0.7.9/src/glade_support.c
2	--- gtkdialog-0.7.9-v/src/glade_support.c 2006-10-30 12:19:51.000000000 +0100
3	+++ gtkdialog-0.7.9/src/glade_support.c 2008-11-10 12:32:34.511181571 +0100
4	@@ -37,10 +37,10 @@
5	* *
6	* *
7	*************************************************************************/
8	-typedef struct signal {
9	+typedef struct _signal {
10	gchar *name;
11	GCallback callback;
12	-} signal;
13	+} _signal;
14
15	/*
16	** Signal handler callbascks.
17	@@ -206,7 +206,7 @@
18	static gboolean
19	find_and_connect_handler(
20	GtkWidget *widget,
21	- signal *signals,
22	+ _signal *signals,
23	const gchar *signal_name,
24	const gchar *handler_name)
25	{
26	@@ -288,7 +288,7 @@
27	gpointer user_data)
28	{
29	gint n;
30	- signal entry_signals[] = {
31	+ _signal entry_signals[] = {
32	{ "activate", (GCallback)on_any_entry_almost_any },
33	{ "backspace", (GCallback)on_any_entry_almost_any },
34	{ "copy-clipboard", (GCallback)on_any_entry_almost_any },
35	@@ -319,7 +319,7 @@
36	gpointer user_data)
37	{
38	variable *var;
39	- signal widget_signals[] = {
40	+ _signal widget_signals[] = {
41	{ "accel-closures-changed", (GCallback)on_any_widget_almost_any },
42	{ "composited-changed", (GCallback)on_any_widget_almost_any },
43	{ "grab-focus", (GCallback)on_any_widget_almost_any },