diff options
author | Diego Escalante Urrelo <descalante@igalia.com> | 2011-10-10 10:42:06 +0800 |
---|---|---|
committer | Diego Escalante Urrelo <descalante@igalia.com> | 2011-10-11 08:47:08 +0800 |
commit | 14c5b69240de9dcbdbdb6bc7308665beb16231aa (patch) | |
tree | 1cd773d59e479b4f51f44805a75e43fa9380f9f8 /lib/egg/egg-toolbars-model.c | |
parent | 40a217ddb38600445eb8cac0e95f659e68e83c53 (diff) | |
download | gsoc2013-epiphany-14c5b69240de9dcbdbdb6bc7308665beb16231aa.tar gsoc2013-epiphany-14c5b69240de9dcbdbdb6bc7308665beb16231aa.tar.gz gsoc2013-epiphany-14c5b69240de9dcbdbdb6bc7308665beb16231aa.tar.bz2 gsoc2013-epiphany-14c5b69240de9dcbdbdb6bc7308665beb16231aa.tar.lz gsoc2013-epiphany-14c5b69240de9dcbdbdb6bc7308665beb16231aa.tar.xz gsoc2013-epiphany-14c5b69240de9dcbdbdb6bc7308665beb16231aa.tar.zst gsoc2013-epiphany-14c5b69240de9dcbdbdb6bc7308665beb16231aa.zip |
lib/egg: update from libegg master
Drop GtkTable usage, sync our changes upstream.
Diffstat (limited to 'lib/egg/egg-toolbars-model.c')
-rw-r--r-- | lib/egg/egg-toolbars-model.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c index b431d6edb..31a6d5eeb 100644 --- a/lib/egg/egg-toolbars-model.c +++ b/lib/egg/egg-toolbars-model.c @@ -675,6 +675,10 @@ static void egg_toolbars_model_class_init (EggToolbarsModelClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + volatile GType flags_type; /* work around gcc's optimiser */ + + /* make sure the flags type is known */ + flags_type = EGG_TYPE_TB_MODEL_FLAGS; object_class->finalize = egg_toolbars_model_finalize; @@ -740,7 +744,6 @@ egg_toolbars_model_finalize (GObject *object) (GNodeForeachFunc) toolbar_node_free, model); g_node_destroy (model->priv->toolbars); g_hash_table_destroy (model->priv->flags); - g_list_free (model->priv->types); G_OBJECT_CLASS (egg_toolbars_model_parent_class)->finalize (object); } |