--- trunk/gtkdialog3/patches/gtkdialog3-0.7.20-signal-name-conflict.patch	2009/05/06 21:09:10	785
+++ trunk/gtkdialog3/patches/gtkdialog3-0.7.20-signal-name-conflict.patch	2009/05/06 21:14:21	786
@@ -1,61 +1,43 @@
-Author: emes                         Date: Mon Nov 10 11:40:12 2008 GMT
-Module: SOURCES                       Tag: HEAD
----- Log message:
-- added patch to resolve name conflict of 'signal' type
-- find also uncompressed info page
-
----- Files affected:
-SOURCES:
-   gtkdialog-name_conflict.patch (NONE -> 1.1)  (NEW)
-
----- Diffs:
-
-================================================================
-Index: SOURCES/gtkdialog-name_conflict.patch
-diff -u /dev/null SOURCES/gtkdialog-name_conflict.patch:1.1
---- /dev/null	Mon Nov 10 12:40:13 2008
-+++ SOURCES/gtkdialog-name_conflict.patch	Mon Nov 10 12:40:07 2008
-@@ -0,0 +1,43 @@
-+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 },
+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 },