mirror of
https://github.com/brl/mutter.git
synced 2025-02-18 14:14:10 +00:00
2008-02-02 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-timeline.c: Document frame number limits in new-frame signal. * clutter/x11/clutter-event-x11.c: Remove uneeded error trap (#751)
This commit is contained in:
parent
d83442476f
commit
f6602ad265
@ -1,3 +1,11 @@
|
|||||||
|
2008-02-02 Matthew Allum <mallum@openedhand.com>
|
||||||
|
|
||||||
|
* clutter/clutter-timeline.c:
|
||||||
|
Document frame number limits in new-frame signal.
|
||||||
|
|
||||||
|
* clutter/x11/clutter-event-x11.c:
|
||||||
|
Remove uneeded error trap (#751)
|
||||||
|
|
||||||
2008-02-01 Matthew Allum <mallum@openedhand.com>
|
2008-02-01 Matthew Allum <mallum@openedhand.com>
|
||||||
|
|
||||||
* clutter/cogl/cogl.h:
|
* clutter/cogl/cogl.h:
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
* In that case you might disable the common timeline pool by setting
|
* In that case you might disable the common timeline pool by setting
|
||||||
* the %CLUTTER_TIMELINE=no-pool environment variable prior to launching
|
* the %CLUTTER_TIMELINE=no-pool environment variable prior to launching
|
||||||
* your application.
|
* your application.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
@ -375,7 +376,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass)
|
|||||||
/**
|
/**
|
||||||
* ClutterTimeline::new-frame:
|
* ClutterTimeline::new-frame:
|
||||||
* @timeline: the timeline which received the signal
|
* @timeline: the timeline which received the signal
|
||||||
* @frame_num: the number of the new frame
|
* @frame_num: the number of the new frame between 0 and
|
||||||
|
* ClutterTimeline:num-frames
|
||||||
*
|
*
|
||||||
* The ::new-frame signal is emitted each time a new frame in the
|
* The ::new-frame signal is emitted each time a new frame in the
|
||||||
* timeline is reached.
|
* timeline is reached.
|
||||||
|
@ -148,12 +148,10 @@ xembed_set_info (ClutterBackendX11 *backend_x11,
|
|||||||
list[0] = MAX_SUPPORTED_XEMBED_VERSION;
|
list[0] = MAX_SUPPORTED_XEMBED_VERSION;
|
||||||
list[1] = XEMBED_MAPPED;
|
list[1] = XEMBED_MAPPED;
|
||||||
|
|
||||||
clutter_x11_trap_x_errors ();
|
|
||||||
XChangeProperty (backend_x11->xdpy, window,
|
XChangeProperty (backend_x11->xdpy, window,
|
||||||
backend_x11->atom_XEMBED_INFO,
|
backend_x11->atom_XEMBED_INFO,
|
||||||
backend_x11->atom_XEMBED_INFO, 32,
|
backend_x11->atom_XEMBED_INFO, 32,
|
||||||
PropModeReplace, (unsigned char *) list, 2);
|
PropModeReplace, (unsigned char *) list, 2);
|
||||||
clutter_x11_untrap_x_errors ();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -275,7 +273,6 @@ handle_wm_protocols_event (ClutterBackendX11 *backend_x11,
|
|||||||
False,
|
False,
|
||||||
SubstructureRedirectMask | SubstructureNotifyMask,
|
SubstructureRedirectMask | SubstructureNotifyMask,
|
||||||
(XEvent *) &xclient);
|
(XEvent *) &xclient);
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user