commit 46982d123439958212b73ba491a7935ee7ee67b0
author Alexander Larsson <alexl@redhat.com> Wed Feb 08 14:35:51 2012 +0100
committer Alexander Larsson <alexl@redhat.com> Wed Feb 08 14:35:51 2012 +0100
tree 6d77cc690140d8a0d016f124f7f4faed3fd874d8
parent f9d9b26d980762baa6a259559792330f9783a748

GtkWidgetPath: No need to lazily initiate GtkBitmaps

We already handle NULL meaning an initialized empty bitmask.

gtk/gtkwidgetpath.c

diff --git a/gtk/gtkwidgetpath.c b/gtk/gtkwidgetpath.c
index 5247936..ed5bb80 100644
--- a/gtk/gtkwidgetpath.c
+++ b/gtk/gtkwidgetpath.c
@@ -137,11 +137,8 @@
     dest->siblings = gtk_widget_path_ref (src->siblings);
   dest->sibling_index = src->sibling_index;
 
-  if (src->regions)
-    dest->regions = _gtk_bitmask_copy (src->regions);
-
-  if (src->classes)
-    dest->classes = _gtk_bitmask_copy (src->classes);
+  dest->regions = _gtk_bitmask_copy (src->regions);
+  dest->classes = _gtk_bitmask_copy (src->classes);
 }
 
 /**
@@ -223,11 +220,8 @@
 
       elem = &g_array_index (path->elems, GtkPathElement, i);
 
-      if (elem->regions)
-        _gtk_bitmask_free (elem->regions);
-
-      if (elem->classes)
-        _gtk_bitmask_free (elem->classes);
+      _gtk_bitmask_free (elem->regions);
+      _gtk_bitmask_free (elem->classes);
 
       if (elem->siblings)
         gtk_widget_path_unref (elem->siblings);
@@ -721,9 +715,6 @@
 
   elem = &g_array_index (path->elems, GtkPathElement, pos);
 
-  if (!elem->classes)
-    elem->classes = _gtk_bitmask_new ();
-
   _gtk_bitmask_set (&elem->classes, _gtk_style_class_get_mask (name), TRUE);
 }
 
@@ -742,9 +733,6 @@
 
   elem = &g_array_index (path->elems, GtkPathElement, pos);
 
-  if (!elem->classes)
-    elem->classes = _gtk_bitmask_new ();
-
   _gtk_bitmask_union (&elem->classes, classes);
 }
 
@@ -775,9 +763,6 @@
 
   elem = &g_array_index (path->elems, GtkPathElement, pos);
 
-  if (!elem->classes)
-    elem->classes = _gtk_bitmask_new ();
-
   _gtk_bitmask_set (&elem->classes, _gtk_style_class_get_mask (name), FALSE);
 }
 
@@ -952,9 +937,6 @@
 
   elem = &g_array_index (path->elems, GtkPathElement, pos);
 
-  if (!elem->regions)
-    elem->regions = _gtk_bitmask_new ();
-
   region = _gtk_style_region_get_mask (name);
   i = region * GTK_REGION_FLAGS_NUM_BITS;
 
@@ -980,9 +962,6 @@
 
   elem = &g_array_index (path->elems, GtkPathElement, pos);
 
-  if (!elem->regions)
-    elem->regions = _gtk_bitmask_new ();
-
   _gtk_bitmask_union (&elem->regions, regions);
 }