summaryrefslogtreecommitdiff
path: root/gtk/window-decorator/style.c
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-02-22 17:44:25 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-02-22 17:44:25 +0800
commit3aa694aa2bb9e2fd32b9c406816520f0c61d0122 (patch)
tree63d5786ac2cbaf05bcf16a2cea3861e438b226a7 /gtk/window-decorator/style.c
parent7c0ba7303eb16626346a05d14e7832eef27eac5c (diff)
parent96eaecceaccccb2c857e565c9e24ba8de457054e (diff)
downloadcompiz-with-glib-mainloop-3aa694aa2bb9e2fd32b9c406816520f0c61d0122.tar.gz
compiz-with-glib-mainloop-3aa694aa2bb9e2fd32b9c406816520f0c61d0122.tar.bz2
Merge branch 'master' of git://git.compiz.org/compiz/coreHEADmaster
Conflicts: gtk/window-decorator/decorator.c
Diffstat (limited to 'gtk/window-decorator/style.c')
-rw-r--r--gtk/window-decorator/style.c28
1 files changed, 26 insertions, 2 deletions
diff --git a/gtk/window-decorator/style.c b/gtk/window-decorator/style.c
index 5090ff6..f3d9d50 100644
--- a/gtk/window-decorator/style.c
+++ b/gtk/window-decorator/style.c
@@ -1,3 +1,24 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Reveman <davidr@novell.com>
+ */
+
#include "gtk-window-decorator.h"
void
@@ -23,19 +44,22 @@ update_style (GtkWidget *widget)
}
void
-style_changed (GtkWidget *widget)
+style_changed (GtkWidget *widget,
+ void *user_data)
{
GdkDisplay *gdkdisplay;
GdkScreen *gdkscreen;
WnckScreen *screen;
+ PangoContext *context = (PangoContext *) user_data;
+
gdkdisplay = gdk_display_get_default ();
gdkscreen = gdk_display_get_default_screen (gdkdisplay);
screen = wnck_screen_get_default ();
update_style (widget);
- pango_cairo_context_set_resolution (pango_context,
+ pango_cairo_context_set_resolution (context,
gdk_screen_get_resolution (gdkscreen));
decorations_changed (screen);