[mutter] frames: Revert the logic here when the frame type updates



commit 4d1d8e831e85fa5d46188312103be4ed569fa674
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Dec 31 21:42:00 2014 -0800

    frames: Revert the logic here when the frame type updates
    
    When the frame type updates, we were doing something funky that
    caused us to reset the title used for the text layout here. I can't
    really think of any place that it would trigger, and in testing I
    haven't hit this either, so let's just remove the fancy logic and
    assert this.

 src/ui/frames.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 7acdcf7..ee248f2 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -391,11 +391,7 @@ meta_frames_ensure_layout (MetaFrames     *frames,
     {
       if (frame->text_layout)
         {
-          /* save title to recreate layout */
-          g_free (frame->title);
-
-          frame->title = g_strdup (pango_layout_get_text (frame->text_layout));
-
+          g_assert (g_str_equal (frame->title, pango_layout_get_text (frame->text_layout)));
           g_clear_object (&frame->text_layout);
         }
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]