Merge branch 'master' into chaz

[chaz/openbox] / obrender / render.c

diff --git a/obrender/render.c b/obrender/render.c
index 7a3420429116fb808f6444333185b460ae353557..fe9a2a80dd27669b8888b226ab0b62655e52b23a 100644 (file)
--- a/obrender/render.c
+++ b/obrender/render.c
@@ -204,7 +204,6 @@ RrAppearance *RrAppearanceNew(const RrInstance *inst, gint numtex)
 
   out = g_slice_new0(RrAppearance);
   out->inst = inst;
-  out->ref = 1;
   out->textures = numtex;
   out->surface.bevel_light_adjust = 128;
   out->surface.bevel_dark_adjust = 64;
@@ -232,13 +231,6 @@ void RrAppearanceClearTextures(RrAppearance *a)
     memset(a->texture, 0, a->textures * sizeof(RrTexture));
 }
 
-/* shallow copy means up the ref count and return it */
-RrAppearance *RrAppearanceCopyShallow(RrAppearance *orig)
-{
-    orig->ref++;
-    return orig;
-}
-
 /* deep copy of orig, means reset ref to 1 on copy
  * and copy each thing memwise. */
 RrAppearance *RrAppearanceCopy(RrAppearance *orig)
@@ -247,7 +239,6 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig)
     RrAppearance *copy = g_slice_new(RrAppearance);
 
     copy->inst = orig->inst;
-    copy->ref = 1;
 
     spo = &(orig->surface);
     spc = &(copy->surface);