[metacity] theme: add MetaTheme parameter to meta_theme_create_style_info

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

commit 7f47012171e0041e3c25677400d88b54d8f81c9b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Jan 16 17:39:35 2016 +0200

    theme: add MetaTheme parameter to meta_theme_create_style_info

 src/ui/frames.c         |   10 +++++++---
 src/ui/preview-widget.c |    3 ++-
 src/ui/theme-viewer.c   |    4 ++--
 src/ui/theme.c          |    3 ++-
 src/ui/theme.h          |    3 ++-
 src/ui/ui.c             |    5 ++---
 6 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 68dfc8b..aa532c5 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -184,7 +184,9 @@ meta_frames_get_theme_variant (MetaFrames  *frames,
   style_info = g_hash_table_lookup (frames->style_variants, variant);
   if (style_info == NULL)
     {
-      style_info = meta_theme_create_style_info (gtk_widget_get_screen (GTK_WIDGET (frames)), variant);
+      style_info = meta_theme_create_style_info (meta_theme_get_current (),
+                                                 gtk_widget_get_screen (GTK_WIDGET (frames)),
+                                                 variant);
       g_hash_table_insert (frames->style_variants, g_strdup (variant), style_info);
     }
 
@@ -196,18 +198,20 @@ update_style_contexts (MetaFrames *frames)
 {
   MetaStyleInfo *style_info;
   GList *variants, *variant;
+  MetaTheme *theme;
   GdkScreen *screen;
 
+  theme = meta_theme_get_current ();
   screen = gtk_widget_get_screen (GTK_WIDGET (frames));
 
   if (frames->normal_style)
     meta_style_info_unref (frames->normal_style);
-  frames->normal_style = meta_theme_create_style_info (screen, NULL);
+  frames->normal_style = meta_theme_create_style_info (theme, screen, NULL);
 
   variants = g_hash_table_get_keys (frames->style_variants);
   for (variant = variants; variant; variant = variants->next)
     {
-      style_info = meta_theme_create_style_info (screen, (char *)variant->data);
+      style_info = meta_theme_create_style_info (theme, screen, (char *)variant->data);
       g_hash_table_insert (frames->style_variants,
                            g_strdup (variant->data), style_info);
     }
diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c
index 32d27b3..ac7b844 100644
--- a/src/ui/preview-widget.c
+++ b/src/ui/preview-widget.c
@@ -262,7 +262,8 @@ meta_preview_realize (GtkWidget *widget)
 
   GTK_WIDGET_CLASS (meta_preview_parent_class)->realize (widget);
 
-  preview->style_info = meta_theme_create_style_info (gtk_widget_get_screen (widget),
+  preview->style_info = meta_theme_create_style_info (preview->theme,
+                                                      gtk_widget_get_screen (widget),
                                                       NULL);
 }
 
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index 1c1f023..80cbf03 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -926,7 +926,7 @@ main (int argc, char **argv)
 
   gtk_widget_realize (window);
 
-  style_info = meta_theme_create_style_info (gtk_widget_get_screen (window), NULL);
+  style_info = meta_theme_create_style_info (global_theme, gtk_widget_get_screen (window), NULL);
   gtk_style_context_get (style_info->styles[META_STYLE_ELEMENT_DECORATION],
                          GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL);
   meta_style_info_unref (style_info);
@@ -1053,7 +1053,7 @@ run_theme_benchmark (void)
   widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_realize (widget);
 
-  style_info = meta_theme_create_style_info (gtk_widget_get_screen (widget), NULL);
+  style_info = meta_theme_create_style_info (global_theme, gtk_widget_get_screen (widget), NULL);
 
   meta_theme_get_frame_borders (global_theme,
                                 style_info,
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 9bef104..0b288ab 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -6024,7 +6024,8 @@ create_style_context (GType            widget_type,
 }
 
 MetaStyleInfo *
-meta_theme_create_style_info (GdkScreen   *screen,
+meta_theme_create_style_info (MetaTheme   *theme,
+                              GdkScreen   *screen,
                               const gchar *variant)
 {
   MetaStyleInfo *style_info;
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 6535897..8560d82 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -1006,7 +1006,8 @@ double meta_theme_get_title_scale (MetaTheme     *theme,
                                    MetaFrameType  type,
                                    MetaFrameFlags flags);
 
-MetaStyleInfo* meta_theme_create_style_info (GdkScreen     *screen,
+MetaStyleInfo* meta_theme_create_style_info (MetaTheme     *theme,
+                                             GdkScreen     *screen,
                                              const gchar   *variant);
 MetaStyleInfo* meta_style_info_ref          (MetaStyleInfo *style);
 void           meta_style_info_unref        (MetaStyleInfo *style_info);
diff --git a/src/ui/ui.c b/src/ui/ui.c
index c5f61ec..e8e3382 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -677,13 +677,12 @@ meta_ui_theme_get_frame_borders (MetaUI           *ui,
       MetaStyleInfo *style_info = NULL;
       MetaTheme *current;
 
-      style_info = meta_theme_create_style_info (screen, NULL);
+      current = meta_theme_get_current ();
+      style_info = meta_theme_create_style_info (current, screen, NULL);
 
       context = gtk_widget_get_pango_context (GTK_WIDGET (ui->frames));
       font_desc = meta_prefs_get_titlebar_font ();
 
-      current = meta_theme_get_current ();
-
       if (!font_desc)
         {
           if (current->is_gtk_theme == FALSE)