Merge lp:~muktupavels/compiz/fix-for-1404054 into lp:compiz/0.9.12

[Alberts Muktupāvels]

Fix crash with titlebar-uses-system-font enabled. LP: #1404054

Fix crash with titlebar-uses-system-font enabled. LP: #1404054

[lp:~muktupavels/compiz/fix-for-1404054]

3919. By Alberts Muktupāvels on 2014-12-19

Avoid a pango critical when titlebar-uses-system-font is enabled.

3920. By Alberts Muktupāvels on 2014-12-19

Fix indentation.

3921. By Alberts Muktupāvels on 2014-12-19

Another indentation fix

[Stephen M. Webb (bregma)]

Verified this works.

review: Approve

=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2014-10-29 13:30:19 +0000
+++ gtk/window-decorator/decorator.c	2014-12-19 13:47:26 +0000
@@ -151,6 +151,11 @@
     {
         GtkCssProvider *provider = gtk_css_provider_get_default ();
         GtkStyleContext *context = gtk_style_context_new ();
+        GtkWidgetPath *path = gtk_widget_path_new ();
+
+        gtk_widget_path_prepend_type (path, GTK_TYPE_WIDGET);
+        gtk_style_context_set_path (context, path);
+        gtk_widget_path_free (path);
 
         gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
 

=== modified file 'gtk/window-decorator/gwd-settings-notified.c'
--- gtk/window-decorator/gwd-settings-notified.c	2012-09-06 10:12:08 +0000
+++ gtk/window-decorator/gwd-settings-notified.c	2014-12-19 13:47:26 +0000
@@ -76,14 +76,22 @@
     gwd_decor_frame_ref (frame);
 
     if (frame->titlebar_font)
-	pango_font_description_free (frame->titlebar_font);
-
-    frame->titlebar_font = pango_font_description_from_string (font_str);
-
-    scale = (*theme_get_title_scale) (frame);
-
-    pango_font_description_set_size (frame->titlebar_font,
-				     MAX (pango_font_description_get_size (frame->titlebar_font) * scale, 1));
+    {
+        pango_font_description_free (frame->titlebar_font);
+        frame->titlebar_font = NULL;
+    }
+
+    if (font_str)
+    {
+        gint size;
+
+        frame->titlebar_font = pango_font_description_from_string (font_str);
+
+        scale = (*theme_get_title_scale) (frame);
+        size = MAX (pango_font_description_get_size (frame->titlebar_font) * scale, 1);
+
+        pango_font_description_set_size (frame->titlebar_font, size);
+    }
 
     gwd_decor_frame_unref (frame);
 }