[metacity/wip/gtk-theme: 44/51] frames: Rename layout to text_layout

[Alberts Muktupāvels <muktupavels src gnome org>]

commit df613422d0c96ef3be1fc8f10c34d04a2239439e
Author: Florian Müllner <fmuellner gnome org>
Date:   Sat Sep 27 08:10:59 2014 +0200

    frames: Rename layout to text_layout
    
    ... to differentiate PangoLayout from MetaFrameLayout.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741917

 src/ui/frames.c |   40 +++++++++++++++++-----------------------
 src/ui/frames.h |    2 +-
 2 files changed, 18 insertions(+), 24 deletions(-)
---
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 8c63cba..96fe6bb 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -403,15 +403,14 @@ queue_recalc_func (gpointer key, gpointer value, gpointer data)
   invalidate_whole_window (frames, frame);
   meta_core_queue_frame_resize (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                                 frame->xwindow);
-  if (frame->layout)
+  if (frame->text_layout)
     {
       /* save title to recreate layout */
       g_free (frame->title);
 
-      frame->title = g_strdup (pango_layout_get_text (frame->layout));
+      frame->title = g_strdup (pango_layout_get_text (frame->text_layout));
 
-      g_object_unref (G_OBJECT (frame->layout));
-      frame->layout = NULL;
+      g_clear_object (&frame->text_layout);
     }
 }
 
@@ -516,31 +515,30 @@ meta_frames_ensure_layout (MetaFrames  *frames,
 
   if (style != frame->cache_style)
     {
-      if (frame->layout)
+      if (frame->text_layout)
         {
           /* save title to recreate layout */
           g_free (frame->title);
 
-          frame->title = g_strdup (pango_layout_get_text (frame->layout));
+          frame->title = g_strdup (pango_layout_get_text (frame->text_layout));
 
-          g_object_unref (G_OBJECT (frame->layout));
-          frame->layout = NULL;
+          g_clear_object (&frame->text_layout);
         }
     }
 
   frame->cache_style = style;
 
-  if (frame->layout == NULL)
+  if (frame->text_layout == NULL)
     {
       gpointer key, value;
       PangoFontDescription *font_desc;
       int size;
 
-      frame->layout = gtk_widget_create_pango_layout (widget, frame->title);
+      frame->text_layout = gtk_widget_create_pango_layout (widget, frame->title);
 
-      pango_layout_set_ellipsize (frame->layout, PANGO_ELLIPSIZE_END);
-      pango_layout_set_auto_dir (frame->layout, FALSE);
-      pango_layout_set_single_paragraph_mode (frame->layout, TRUE);
+      pango_layout_set_ellipsize (frame->text_layout, PANGO_ELLIPSIZE_END);
+      pango_layout_set_auto_dir (frame->text_layout, FALSE);
+      pango_layout_set_single_paragraph_mode (frame->text_layout, TRUE);
 
       if (g_getenv ("USE_METACITY_THEME") != NULL)
         {
@@ -577,7 +575,7 @@ meta_frames_ensure_layout (MetaFrames  *frames,
                                 GINT_TO_POINTER (frame->text_height));
         }
 
-      pango_layout_set_font_description (frame->layout,
+      pango_layout_set_font_description (frame->text_layout,
                                          font_desc);
 
       pango_font_description_free (font_desc);
@@ -695,7 +693,7 @@ meta_frames_manage_window (MetaFrames *frames,
 
   frame->xwindow = xwindow;
   frame->cache_style = NULL;
-  frame->layout = NULL;
+  frame->text_layout = NULL;
   frame->text_height = -1;
   frame->title = NULL;
   frame->expose_delayed = FALSE;
@@ -745,8 +743,8 @@ meta_frames_unmanage_window (MetaFrames *frames,
 
       gdk_window_destroy (frame->window);
 
-      if (frame->layout)
-        g_object_unref (G_OBJECT (frame->layout));
+      if (frame->text_layout)
+        g_object_unref (G_OBJECT (frame->text_layout));
 
       if (frame->title)
         g_free (frame->title);
@@ -1287,11 +1285,7 @@ meta_frames_set_title (MetaFrames *frames,
   g_free (frame->title);
   frame->title = g_strdup (title);
 
-  if (frame->layout)
-    {
-      g_object_unref (frame->layout);
-      frame->layout = NULL;
-    }
+  g_clear_object (&frame->text_layout);
 
   invalidate_whole_window (frames, frame);
 }
@@ -2698,7 +2692,7 @@ meta_frames_paint (MetaFrames   *frames,
                          flags,
                          w,
                          h,
-                         frame->layout,
+                         frame->text_layout,
                          frame->text_height,
                          &button_layout,
                          button_states,
diff --git a/src/ui/frames.h b/src/ui/frames.h
index c52fa71..6e4fae0 100644
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@@ -76,7 +76,7 @@ struct _MetaUIFrame
   GdkWindow *window;
   MetaStyleInfo *style_info;
   MetaFrameStyle *cache_style;
-  PangoLayout *layout;
+  PangoLayout *text_layout;
   int text_height;
   char *title; /* NULL once we have a layout */
   guint expose_delayed : 1;