isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1269 - mingw32 building failed at clutter-media.c

Browse Source 
* clutter/clutter-media.c: Rename the 'ERROR' signal enum to
	'ERROR_SIGNAL' otherwise it clashes with windgi.h. Thanks to David
	Kedves
This commit is contained in:
Neil Roberts 2008-11-21 16:18:38 +00:00
parent 8ca07482dd
commit 1c4bd93b11
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-11-21 Neil Roberts <neil@linux.intel.com>
Bug 1269 - mingw32 building failed at clutter-media.c
* clutter/clutter-media.c: Rename the 'ERROR' signal enum to
'ERROR_SIGNAL' otherwise it clashes with windgi.h. Thanks to David
Kedves
2008-11-21 Neil Roberts <neil@linux.intel.com> 2008-11-21 Neil Roberts <neil@linux.intel.com>
* clutter/pango/cogl-pango.h: Include pango/pango.h to get * clutter/pango/cogl-pango.h: Include pango/pango.h to get

10
clutter/clutter-media.c
View File

@ -47,8 +47,8 @@
enum enum
{ {
EOS, EOS_SIGNAL,
ERROR, ERROR_SIGNAL, /* can't be called 'ERROR' otherwise it clashes with wingdi.h */
LAST_SIGNAL LAST_SIGNAL
}; };
@ -174,7 +174,7 @@ clutter_media_base_init (gpointer g_iface)
* *
* Since: 0.2 * Since: 0.2
*/ */
media_signals[EOS] = media_signals[EOS_SIGNAL] =
g_signal_new ("eos", g_signal_new ("eos",
CLUTTER_TYPE_MEDIA, CLUTTER_TYPE_MEDIA,
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
@ -191,7 +191,7 @@ clutter_media_base_init (gpointer g_iface)
* *
* Since: 0.2 * Since: 0.2
*/ */
media_signals[ERROR] = media_signals[ERROR_SIGNAL] =
g_signal_new ("error", g_signal_new ("error",
CLUTTER_TYPE_MEDIA, CLUTTER_TYPE_MEDIA,
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
@ -432,7 +432,7 @@ clutter_media_set_filename (ClutterMedia *media,
if (uri_error) if (uri_error)
{ {
g_signal_emit (media, media_signals[ERROR], 0, uri_error); g_signal_emit (media, media_signals[ERROR_SIGNAL], 0, uri_error);
g_error_free (uri_error); g_error_free (uri_error);
return; return;
} }