← Back to branch summary

~ubuntu-dev/ubuntu/lucid/mutter/lucid-201002101912

« back to all changes in this revision

Viewing changes to src/compositor/mutter-window.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2009-08-10 19:00:42 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090810190042-cg6drmydzek5gwbh
Tags: 2.27.1git090806-0ubuntu1
* New upstream release from git repositoy, using now clutter 1.0,
  needed for last GNOME shell.
* debian/control.in: build-dep on libclutter-1.0-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/compositor/mutter-window.c
362
362
 
363
363
      clutter_container_add_actor (CLUTTER_CONTAINER (self), priv->actor);
364
364
 
 
365
      /*
 
366
       * Since we are holding a pointer to this actor independently of the
 
367
       * ClutterContainer internals, and provide a public API to access it,
 
368
       * add a reference here, so that if someone is messing about with us
 
369
       * via the container interface, we do not end up with a dangling pointer.
 
370
       * We will release it in dispose().
 
371
       */
 
372
      g_object_ref (priv->actor);
 
373
 
365
374
      g_signal_connect (priv->window, "notify::decorated",
366
375
                        G_CALLBACK (mutter_meta_window_decorated_notify), self);
367
376
    }
415
424
  info->windows = g_list_remove (info->windows, (gconstpointer) self);
416
425
  g_hash_table_remove (info->windows_by_xid, (gpointer) priv->xwindow);
417
426
 
418
 
  g_free (priv->desc);
 
427
  /*
 
428
   * Release the extra reference we took on the actor.
 
429
   */
 
430
  g_object_unref (priv->actor);
 
431
  priv->actor = NULL;
419
432
 
420
433
  G_OBJECT_CLASS (mutter_window_parent_class)->dispose (object);
421
434
}
423
436
static void
424
437
mutter_window_finalize (GObject *object)
425
438
{
 
439
  MutterWindow        *self = MUTTER_WINDOW (object);
 
440
  MutterWindowPrivate *priv = self->priv;
 
441
 
 
442
  g_free (priv->desc);
 
443
 
426
444
  G_OBJECT_CLASS (mutter_window_parent_class)->finalize (object);
427
445
}
428
446
 
768
786
   *
769
787
   * The compositor paint function repairs all windows.
770
788
   */
771
 
  clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
 
789
  clutter_actor_queue_redraw (priv->actor);
772
790
}
773
791
 
774
792
static gboolean
833
851
    mutter_window_detach (self);
834
852
 
835
853
  if (priv->needs_repair)
836
 
    clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
 
854
    clutter_actor_queue_redraw (priv->actor);
837
855
}
838
856
 
839
857
void
1512
1530
                    "pixmap-height", &pxm_height,
1513
1531
                    NULL);
1514
1532
 
1515
 
      clutter_actor_set_size (priv->actor, pxm_width, pxm_height);
1516
 
 
1517
1533
      if (priv->shadow)
1518
1534
        clutter_actor_set_size (priv->shadow, pxm_width, pxm_height);
1519
1535
 
1654
1670
  priv->shaped = shaped;
1655
1671
  priv->needs_reshape = TRUE;
1656
1672
 
1657
 
  clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
 
1673
  clutter_actor_queue_redraw (priv->actor);
1658
1674
}
1659
1675
 
1660
1676
void