Annotation of /trunk/gtkdialog3/patches/gtkdialog3-0.7.20-signal-name-conflict.patch
Parent Directory
| 
Revision Log
Revision 785 -
(hide annotations)
(download)
Wed May 6 21:09:10 2009 UTC (15 years ago) by niro
File size: 2147 byte(s)
Wed May 6 21:09:10 2009 UTC (15 years ago) by niro
File size: 2147 byte(s)
gtkdialog3 build fixes
| 1 | niro | 785 | Author: emes Date: Mon Nov 10 11:40:12 2008 GMT |
| 2 | Module: SOURCES Tag: HEAD | ||
| 3 | ---- Log message: | ||
| 4 | - added patch to resolve name conflict of 'signal' type | ||
| 5 | - find also uncompressed info page | ||
| 6 | |||
| 7 | ---- Files affected: | ||
| 8 | SOURCES: | ||
| 9 | gtkdialog-name_conflict.patch (NONE -> 1.1) (NEW) | ||
| 10 | |||
| 11 | ---- Diffs: | ||
| 12 | |||
| 13 | ================================================================ | ||
| 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 | ||
| 17 | +++ SOURCES/gtkdialog-name_conflict.patch Mon Nov 10 12:40:07 2008 | ||
| 18 | @@ -0,0 +1,43 @@ | ||
| 19 | +diff -Nurwa gtkdialog-0.7.9-v/src/glade_support.c gtkdialog-0.7.9/src/glade_support.c | ||
| 20 | +--- gtkdialog-0.7.9-v/src/glade_support.c 2006-10-30 12:19:51.000000000 +0100 | ||
| 21 | ++++ gtkdialog-0.7.9/src/glade_support.c 2008-11-10 12:32:34.511181571 +0100 | ||
| 22 | +@@ -37,10 +37,10 @@ | ||
| 23 | + * * | ||
| 24 | + * * | ||
| 25 | + *************************************************************************/ | ||
| 26 | +-typedef struct signal { | ||
| 27 | ++typedef struct _signal { | ||
| 28 | + gchar *name; | ||
| 29 | + GCallback callback; | ||
| 30 | +-} signal; | ||
| 31 | ++} _signal; | ||
| 32 | + | ||
| 33 | + /* | ||
| 34 | + ** Signal handler callbascks. | ||
| 35 | +@@ -206,7 +206,7 @@ | ||
| 36 | + static gboolean | ||
| 37 | + find_and_connect_handler( | ||
| 38 | + GtkWidget *widget, | ||
| 39 | +- signal *signals, | ||
| 40 | ++ _signal *signals, | ||
| 41 | + const gchar *signal_name, | ||
| 42 | + const gchar *handler_name) | ||
| 43 | + { | ||
| 44 | +@@ -288,7 +288,7 @@ | ||
| 45 | + gpointer user_data) | ||
| 46 | + { | ||
| 47 | + gint n; | ||
| 48 | +- signal entry_signals[] = { | ||
| 49 | ++ _signal entry_signals[] = { | ||
| 50 | + { "activate", (GCallback)on_any_entry_almost_any }, | ||
| 51 | + { "backspace", (GCallback)on_any_entry_almost_any }, | ||
| 52 | + { "copy-clipboard", (GCallback)on_any_entry_almost_any }, | ||
| 53 | +@@ -319,7 +319,7 @@ | ||
| 54 | + gpointer user_data) | ||
| 55 | + { | ||
| 56 | + variable *var; | ||
| 57 | +- signal widget_signals[] = { | ||
| 58 | ++ _signal widget_signals[] = { | ||
| 59 | + { "accel-closures-changed", (GCallback)on_any_widget_almost_any }, | ||
| 60 | + { "composited-changed", (GCallback)on_any_widget_almost_any }, | ||
| 61 | + { "grab-focus", (GCallback)on_any_widget_almost_any }, |