brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WARNING: Massive revert commit

Browse Source 
Revert all the work that happened on the master branch.

Sadly, this is the only way to merge the current development branch back
into master.

It is now abundantly clear that I merged the 1.99 branch far too soon,
and that Clutter 2.0 won't happen any time soon, if at all.

Since having the development happen on a separate branch throws a lot of
people into confusion, let's undo the clutter-1.99 → master merge, and
move back the development of Clutter to the master branch.

In order to do so, we need to do some surgery to the Git repository.

First, we do a massive revert in a single commit of all that happened
since the switch to 1.99 and the API version bump done with the
89a2862b05 commit. The history is too long
to be reverted commit by commit without being extremely messy.
This commit is contained in:
Emmanuele Bassi
2015-01-03 20:34:20 +00:00
parent c3c89332f6
commit 77ec8774a0
348 changed files with 59887 additions and 34751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
clutter/clutter-script-private.h
View File

@ -88,10 +88,13 @@ typedef struct {
gchar *name;
gchar *handler;
gchar *object;
gchar *state;
gchar *target;
GConnectFlags flags;
guint is_handler : 1;
guint warp_to : 1;
} SignalInfo;
void property_info_free (gpointer data);
@ -116,12 +119,17 @@ gboolean _clutter_script_flags_from_string (GType gtype,
const gchar *string,
gint *flags_value);
gboolean _clutter_script_parse_rect (ClutterScript *script,
gboolean _clutter_script_parse_knot (ClutterScript *script,
JsonNode *node,
ClutterRect *rect);
ClutterKnot *knot);
gboolean _clutter_script_parse_geometry (ClutterScript *script,
JsonNode *node,
ClutterGeometry *geometry);
gboolean _clutter_script_parse_color (ClutterScript *script,
JsonNode *node,
ClutterColor *color);
GObject *_clutter_script_parse_alpha (ClutterScript *script,
JsonNode *node);
gboolean _clutter_script_parse_point (ClutterScript *script,
JsonNode *node,
ClutterPoint *point);