Diff of /trunk/gtkdialog3/patches/gtkdialog3-0.7.20-signal-name-conflict.patch

Parent Directory | Revision Log | Patch

	revision 785 by niro, Wed May 6 21:09:10 2009 UTC	revision 786 by niro, Wed May 6 21:14:21 2009 UTC
#	Line 1	Line 1
1	Author: emes                         Date: Mon Nov 10 11:40:12 2008 GMT	diff -Nurwa gtkdialog-0.7.9-v/src/glade_support.c gtkdialog-0.7.9/src/glade_support.c
2	Module: SOURCES                       Tag: HEAD	--- gtkdialog-0.7.9-v/src/glade_support.c 2006-10-30 12:19:51.000000000 +0100
3	---- Log message:	+++ gtkdialog-0.7.9/src/glade_support.c 2008-11-10 12:32:34.511181571 +0100
4	- added patch to resolve name conflict of 'signal' type	@@ -37,10 +37,10 @@
5	- find also uncompressed info page	*                                                                       *
6		*                                                                       *
7	---- Files affected:	*************************************************************************/
8	SOURCES:	-typedef struct signal {
9	gtkdialog-name_conflict.patch (NONE -> 1.1)  (NEW)	+typedef struct _signal {
10		gchar     *name;
11	---- Diffs:	GCallback callback;
12		-} signal;
13	================================================================	+} _signal;
14	Index: SOURCES/gtkdialog-name_conflict.patch
15	diff -u /dev/null SOURCES/gtkdialog-name_conflict.patch:1.1	/*
16	--- /dev/null Mon Nov 10 12:40:13 2008	** Signal handler callbascks.
17	+++ SOURCES/gtkdialog-name_conflict.patch Mon Nov 10 12:40:07 2008	@@ -206,7 +206,7 @@
18	@@ -0,0 +1,43 @@	static gboolean
19	+diff -Nurwa gtkdialog-0.7.9-v/src/glade_support.c gtkdialog-0.7.9/src/glade_support.c	find_and_connect_handler(
20	+--- gtkdialog-0.7.9-v/src/glade_support.c 2006-10-30 12:19:51.000000000 +0100	GtkWidget *widget,
21	++++ gtkdialog-0.7.9/src/glade_support.c 2008-11-10 12:32:34.511181571 +0100	- signal *signals,
22	+@@ -37,10 +37,10 @@	+ _signal *signals,
23	+  *                                                                       *	const gchar *signal_name,
24	+  *                                                                       *	const gchar *handler_name)
25	+  *************************************************************************/	{
26	+-typedef struct signal {	@@ -288,7 +288,7 @@
27	++typedef struct _signal {	gpointer user_data)
28	+ gchar     *name;	{
29	+ GCallback callback;	gint n;
30	+-} signal;	- signal entry_signals[] = {
31	++} _signal;	+ _signal entry_signals[] = {
32	+	{ "activate",           (GCallback)on_any_entry_almost_any },
33	+ /*	{ "backspace",          (GCallback)on_any_entry_almost_any },
34	+ ** Signal handler callbascks.	{ "copy-clipboard",     (GCallback)on_any_entry_almost_any },
35	+@@ -206,7 +206,7 @@	@@ -319,7 +319,7 @@
36	+ static gboolean	gpointer user_data)
37	+ find_and_connect_handler(	{
38	+ GtkWidget *widget,	variable *var;
39	+- signal *signals,	- signal widget_signals[] = {
40	++ _signal *signals,	+ _signal widget_signals[] = {
41	+ const gchar *signal_name,	{ "accel-closures-changed",    (GCallback)on_any_widget_almost_any },
42	+ const gchar *handler_name)	{ "composited-changed",        (GCallback)on_any_widget_almost_any },
43	+ {	{ "grab-focus",                (GCallback)on_any_widget_almost_any },
	+@@ -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 },

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.785   changed lines   Added in v.786