diff -up gnome-control-center-2.31.4/capplets/appearance/appearance-font.c.seal gnome-control-center-2.31.4/capplets/appearance/appearance-font.c
--- gnome-control-center-2.31.4/capplets/appearance/appearance-font.c.seal 2010-06-30 01:40:18.643211337 -0400
+++ gnome-control-center-2.31.4/capplets/appearance/appearance-font.c 2010-06-30 01:39:24.090212245 -0400
@@ -269,7 +269,7 @@ setup_font_sample (GtkWidget *darea,
width = extents1.xOff + extents2.xOff + 4;
height = ascent + descent + 2;
- pixmap = gdk_pixmap_new (NULL, width, height, visual->depth);
+ pixmap = gdk_pixmap_new (NULL, width, height, gdk_visual_get_depth (visual));
draw = XftDrawCreate (xdisplay, GDK_DRAWABLE_XID (pixmap), xvisual, xcolormap);
diff -up gnome-control-center-2.31.4/capplets/common/theme-thumbnail.c.seal gnome-control-center-2.31.4/capplets/common/theme-thumbnail.c
--- gnome-control-center-2.31.4/capplets/common/theme-thumbnail.c.seal 2010-06-30 01:29:37.405211687 -0400
+++ gnome-control-center-2.31.4/capplets/common/theme-thumbnail.c 2010-06-30 01:29:59.217221604 -0400
@@ -112,7 +112,7 @@ draw_window_on_pixbuf (GtkWidget *widget
gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
visual = gtk_widget_get_visual (widget);
- pixmap = gdk_pixmap_new (NULL, width, height, visual->depth);
+ pixmap = gdk_pixmap_new (NULL, width, height, gdk_visual_get_depth (visual));
gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (widget));
window = gtk_widget_get_window (widget);
diff -up gnome-control-center-2.31.4/panels/datetime/cc-timezone-map.c.seal gnome-control-center-2.31.4/panels/datetime/cc-timezone-map.c
--- gnome-control-center-2.31.4/panels/datetime/cc-timezone-map.c.seal 2010-06-30 07:56:28.519212804 -0400
+++ gnome-control-center-2.31.4/panels/datetime/cc-timezone-map.c 2010-06-30 08:01:43.982214690 -0400
@@ -233,7 +233,7 @@ cc_timezone_map_realize (GtkWidget *widg
gtk_widget_get_allocation (widget, &allocation);
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+ gtk_widget_set_realized (widget, TRUE);
attr.window_type = GDK_WINDOW_CHILD;
attr.wclass = GDK_INPUT_OUTPUT;
diff -up gnome-control-center-2.31.4/panels/display/scrollarea.c.seal gnome-control-center-2.31.4/panels/display/scrollarea.c
--- gnome-control-center-2.31.4/panels/display/scrollarea.c.seal 2010-06-30 06:53:13.368211546 -0400
+++ gnome-control-center-2.31.4/panels/display/scrollarea.c 2010-06-30 07:46:20.664214619 -0400
@@ -500,24 +500,32 @@ setup_background_cr (GdkWindow *window,
int x_offset,
int y_offset)
{
- GdkWindowObject *private = (GdkWindowObject *)window;
-
- if (private->bg_pixmap == GDK_PARENT_RELATIVE_BG && private->parent)
+ GdkPixmap *pixmap;
+ GdkWindow *parent;
+ gint x, y;
+ GdkColor bg_color;
+
+ gdk_window_get_back_pixmap (window, &pixmap, NULL);
+ parent = gdk_window_get_effective_parent (window);
+ gdk_window_get_geometry (window, &x, &y, NULL, NULL, NULL);
+ gdk_window_get_background (window, &bg_color);
+
+ if (pixmap == GDK_PARENT_RELATIVE_BG && parent)
{
- x_offset += private->x;
- y_offset += private->y;
+ x_offset += x;
+ y_offset += y;
- setup_background_cr (GDK_WINDOW (private->parent), cr, x_offset, y_offset);
+ setup_background_cr (parent, cr, x_offset, y_offset);
}
- else if (private->bg_pixmap &&
- private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
- private->bg_pixmap != GDK_NO_BG)
+ else if (pixmap &&
+ pixmap != GDK_PARENT_RELATIVE_BG &&
+ pixmap != GDK_NO_BG)
{
- gdk_cairo_set_source_pixmap (cr, private->bg_pixmap, -x_offset, -y_offset);
+ gdk_cairo_set_source_pixmap (cr, pixmap, -x_offset, -y_offset);
}
else
{
- gdk_cairo_set_source_color (cr, &private->bg_color);
+ gdk_cairo_set_source_color (cr, &bg_color);
}
}
diff -up gnome-control-center-2.31.4/shell/cc-shell-category-view.c.seal gnome-control-center-2.31.4/shell/cc-shell-category-view.c
--- gnome-control-center-2.31.4/shell/cc-shell-category-view.c.seal 2010-06-30 01:06:56.502211127 -0400
+++ gnome-control-center-2.31.4/shell/cc-shell-category-view.c 2010-06-30 01:07:55.711221673 -0400
@@ -168,21 +168,24 @@ cc_shell_category_view_style_set (GtkWid
GtkStyle *old_style)
{
CcShellCategoryViewPrivate *priv = CC_SHELL_CATEGORY_VIEW (widget)->priv;
+ GtkStyle *style;
+
+ style = gtk_widget_get_style (widget);
if (priv->header)
{
gtk_widget_modify_bg (priv->header, GTK_STATE_NORMAL,
- &widget->style->base[GTK_STATE_NORMAL]);
+ &style->base[GTK_STATE_NORMAL]);
gtk_widget_modify_fg (priv->header, GTK_STATE_NORMAL,
- &widget->style->text[GTK_STATE_NORMAL]);
+ &style->text[GTK_STATE_NORMAL]);
}
if (priv->iconview)
{
gtk_widget_modify_bg (priv->iconview, GTK_STATE_NORMAL,
- &widget->style->base[GTK_STATE_NORMAL]);
+ &style->base[GTK_STATE_NORMAL]);
gtk_widget_modify_fg (priv->iconview, GTK_STATE_NORMAL,
- &widget->style->text[GTK_STATE_NORMAL]);
+ &style->text[GTK_STATE_NORMAL]);
}
}
diff -up gnome-control-center-2.31.4/shell/gnome-control-center.c.seal gnome-control-center-2.31.4/shell/gnome-control-center.c
--- gnome-control-center-2.31.4/shell/gnome-control-center.c.seal 2010-06-30 01:08:08.610963747 -0400
+++ gnome-control-center-2.31.4/shell/gnome-control-center.c 2010-06-30 01:09:17.626974503 -0400
@@ -869,6 +869,8 @@ gnome_control_center_init (GnomeControlC
GError *err = NULL;
GtkWidget *vbox;
GnomeControlCenterPrivate *priv;
+ GtkWidget *parent;
+ GtkStyle *style;
priv = self->priv = CONTROL_CENTER_PRIVATE (self);
@@ -901,10 +903,13 @@ gnome_control_center_init (GnomeControlC
vbox = W (priv->builder, "main-vbox");
gtk_widget_set_size_request (vbox, 0, -1);
- gtk_widget_modify_bg (vbox->parent, GTK_STATE_NORMAL,
- &vbox->style->base[GTK_STATE_NORMAL]);
- gtk_widget_modify_fg (vbox->parent, GTK_STATE_NORMAL,
- &vbox->style->text[GTK_STATE_NORMAL]);
+ parent = gtk_widget_get_parent (vbox);
+ style = gtk_widget_get_style (vbox);
+
+ gtk_widget_modify_bg (parent, GTK_STATE_NORMAL,
+ &style->base[GTK_STATE_NORMAL]);
+ gtk_widget_modify_fg (parent, GTK_STATE_NORMAL,
+ &style->text[GTK_STATE_NORMAL]);
/* load the available settings panels */
fill_model (self);