applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make build works with GSEAL

Browse source
This commit is contained in:
Jonh Wendell 2010-06-25 10:31:34 -03:00 • committed by Thomas Wood
parent 59f894bf1b
commit 91c5e26bcf
5 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
capplets/appearance/appearance-font.c
View file

@ -269,7 +269,7 @@ setup_font_sample (GtkWidget *darea,
width = extents1.xOff + extents2.xOff + 4; width = extents1.xOff + extents2.xOff + 4;
height = ascent + descent + 2; 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); draw = XftDrawCreate (xdisplay, GDK_DRAWABLE_XID (pixmap), xvisual, xcolormap);

2
capplets/common/theme-thumbnail.c
View file

@ -112,7 +112,7 @@ draw_window_on_pixbuf (GtkWidget *widget)
gtk_window_get_size (GTK_WINDOW (widget), &width, &height); gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
visual = gtk_widget_get_visual (widget); 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)); gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (widget));
window = gtk_widget_get_window (widget); window = gtk_widget_get_window (widget);

30
panels/display/scrollarea.c
View file

@ -500,24 +500,32 @@ setup_background_cr (GdkWindow *window,
int x_offset, int x_offset,
int y_offset) int y_offset)
{ {
GdkWindowObject *private = (GdkWindowObject *)window; GdkPixmap *pixmap;
GdkWindow *parent;
if (private->bg_pixmap == GDK_PARENT_RELATIVE_BG && private->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; x_offset += x;
y_offset += private->y; 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 && else if (pixmap &&
private->bg_pixmap != GDK_PARENT_RELATIVE_BG && pixmap != GDK_PARENT_RELATIVE_BG &&
private->bg_pixmap != GDK_NO_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 else
{ {
gdk_cairo_set_source_color (cr, &private->bg_color); gdk_cairo_set_source_color (cr, &bg_color);
} }
} }

9
shell/cc-shell-category-view.c
View file

@ -168,21 +168,22 @@ cc_shell_category_view_style_set (GtkWidget *widget,
GtkStyle *old_style) GtkStyle *old_style)
{ {
CcShellCategoryViewPrivate *priv = CC_SHELL_CATEGORY_VIEW (widget)->priv; CcShellCategoryViewPrivate *priv = CC_SHELL_CATEGORY_VIEW (widget)->priv;
GtkStyle *style = gtk_widget_get_style (widget);
if (priv->header) if (priv->header)
{ {
gtk_widget_modify_bg (priv->header, GTK_STATE_NORMAL, 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, gtk_widget_modify_fg (priv->header, GTK_STATE_NORMAL,
&widget->style->text[GTK_STATE_NORMAL]); &style->text[GTK_STATE_NORMAL]);
} }
if (priv->iconview) if (priv->iconview)
{ {
gtk_widget_modify_bg (priv->iconview, GTK_STATE_NORMAL, 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, gtk_widget_modify_fg (priv->iconview, GTK_STATE_NORMAL,
&widget->style->text[GTK_STATE_NORMAL]); &style->text[GTK_STATE_NORMAL]);
} }
} }

13
shell/gnome-control-center.c
View file

@ -867,8 +867,9 @@ static void
gnome_control_center_init (GnomeControlCenter *self) gnome_control_center_init (GnomeControlCenter *self)
{ {
GError *err = NULL; GError *err = NULL;
GtkWidget *vbox; GtkWidget *vbox, *parent;
GnomeControlCenterPrivate *priv; GnomeControlCenterPrivate *priv;
GtkStyle *style;
priv = self->priv = CONTROL_CENTER_PRIVATE (self); priv = self->priv = CONTROL_CENTER_PRIVATE (self);
@ -901,10 +902,12 @@ gnome_control_center_init (GnomeControlCenter *self)
vbox = W (priv->builder, "main-vbox"); vbox = W (priv->builder, "main-vbox");
gtk_widget_set_size_request (vbox, 0, -1); gtk_widget_set_size_request (vbox, 0, -1);
gtk_widget_modify_bg (vbox->parent, GTK_STATE_NORMAL, parent = gtk_widget_get_parent (vbox);
&vbox->style->base[GTK_STATE_NORMAL]); style = gtk_widget_get_style (vbox);
gtk_widget_modify_fg (vbox->parent, GTK_STATE_NORMAL, gtk_widget_modify_bg (parent, GTK_STATE_NORMAL,
&vbox->style->text[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 */ /* load the available settings panels */
fill_model (self); fill_model (self);