From f6602ad265d7b85e2cf342add83460f9196aacef Mon Sep 17 00:00:00 2001 From: Matthew Allum Date: Sat, 2 Feb 2008 23:39:53 +0000 Subject: [PATCH] 2008-02-02 Matthew Allum * clutter/clutter-timeline.c: Document frame number limits in new-frame signal. * clutter/x11/clutter-event-x11.c: Remove uneeded error trap (#751) --- ChangeLog | 8 ++++++++ clutter/clutter-timeline.c | 6 ++++-- clutter/x11/clutter-event-x11.c | 3 --- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d0ce371a..92565eb16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-02-02 Matthew Allum + + * 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 * clutter/cogl/cogl.h: diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c index 6f942d415..ad24a5a31 100644 --- a/clutter/clutter-timeline.c +++ b/clutter/clutter-timeline.c @@ -37,6 +37,7 @@ * In that case you might disable the common timeline pool by setting * the %CLUTTER_TIMELINE=no-pool environment variable prior to launching * your application. + * */ #ifdef HAVE_CONFIG_H @@ -375,7 +376,8 @@ clutter_timeline_class_init (ClutterTimelineClass *klass) /** * ClutterTimeline::new-frame: * @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 * timeline is reached. @@ -979,7 +981,7 @@ clutter_timeline_clone (ClutterTimeline *timeline) * * Creates a new #ClutterTimeline with a duration of @msecs using * the value of the ClutterTimeline:fps property to compute the - * equivalent number of frames. + * equivalent number of frames. * * Return value: the newly created #ClutterTimeline * diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c index d4db33872..bde6304ae 100644 --- a/clutter/x11/clutter-event-x11.c +++ b/clutter/x11/clutter-event-x11.c @@ -148,12 +148,10 @@ xembed_set_info (ClutterBackendX11 *backend_x11, list[0] = MAX_SUPPORTED_XEMBED_VERSION; list[1] = XEMBED_MAPPED; - clutter_x11_trap_x_errors (); XChangeProperty (backend_x11->xdpy, window, backend_x11->atom_XEMBED_INFO, backend_x11->atom_XEMBED_INFO, 32, PropModeReplace, (unsigned char *) list, 2); - clutter_x11_untrap_x_errors (); } void @@ -275,7 +273,6 @@ handle_wm_protocols_event (ClutterBackendX11 *backend_x11, False, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent *) &xclient); - return FALSE; }