[maemo-commits] [maemo-commits] r18530 - in projects/haf/trunk/clutter0.8: clutter debian

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-05-28 17:40:37 +0300 (Thu, 28 May 2009)
New Revision: 18530

Modified:
   projects/haf/trunk/clutter0.8/clutter/clutter-private.h
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
  * clutter/clutter-private.h: added blank #define for g_object_freeze_notify
    and g_object_thaw_notify, as these caused excessive slowness and we don't
    need threading support.


Modified: projects/haf/trunk/clutter0.8/clutter/clutter-private.h
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/clutter-private.h	2009-05-28 14:09:31 UTC (rev 18529)
+++ projects/haf/trunk/clutter0.8/clutter/clutter-private.h	2009-05-28 14:40:37 UTC (rev 18530)
@@ -77,8 +77,8 @@
   ClutterActor *motion_last_actor;
 
   gint          click_count;
-  gint          previous_x; 
-  gint          previous_y; 
+  gint          previous_x;
+  gint          previous_y;
   guint32       previous_time;
   gint          previous_button_number;
 };
@@ -87,12 +87,12 @@
 
 struct _ClutterMainContext
 {
-  ClutterBackend  *backend;            /* holds a pointer to the windowing 
+  ClutterBackend  *backend;            /* holds a pointer to the windowing
                                           system backend */
   ClutterStageManager *stage_manager;  /* stages */
   GQueue          *events_queue;       /* the main event queue */
 
-  guint            is_initialized : 1;  
+  guint            is_initialized : 1;
   guint            motion_events_per_actor : 1;/* set for enter/leave events */
   guint            defer_display_setup : 1;
   guint            options_parsed : 1;
@@ -104,8 +104,8 @@
   guint            motion_frequency;   /* Motion events per second */
   gint             num_reactives;      /* Num of reactive actors */
 
-  ClutterIDPool   *id_pool;            /* mapping between reused integer ids 
-                                        * and actors 
+  ClutterIDPool   *id_pool;            /* mapping between reused integer ids
+                                        * and actors
                                         */
   guint            frame_rate;         /* Default FPS */
   gboolean         disable_skip_frames;/* Should timeline not skip frames */
@@ -114,8 +114,8 @@
                                         * (or NULL if there is no pointer grab
                                         */
   ClutterActor    *keyboard_grab_actor; /* The actor having the pointer grab
-                                         * (or NULL if there is no pointer 
-                                         *  grab) 
+                                         * (or NULL if there is no pointer
+                                         *  grab)
                                          */
   GSList          *shaders;            /* stack of overridden shaders */
 
@@ -216,6 +216,10 @@
 void _clutter_actor_apply_modelview_transform_recursive (ClutterActor *self,
 						       ClutterActor *ancestor);
 
+// Big hack to remove threading calls
+#define g_object_freeze_notify(X)
+#define g_object_thaw_notify(X)
+
 G_END_DECLS
 
 #endif /* _HAVE_CLUTTER_PRIVATE_H */

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-05-28 14:09:31 UTC (rev 18529)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-05-28 14:40:37 UTC (rev 18530)
@@ -12,6 +12,9 @@
   * clutter/cogl/gles/cogl-texture.c: changed 'if !cogl_is_texture' to
     g_return_if_fail, as we don't want these runtime checks, and 
     cogl_is_texture is *very* slow (linear search)
+  * clutter/clutter-private.h: added blank #define for g_object_freeze_notify
+    and g_object_thaw_notify, as these caused excessive slowness and we don't
+    need threading support.
 
   Kimmo:
   * clutter/clutter-stage.[ch]: Added clutter_stage_set_shaped_mode for