ff4e429499
Copy from home:dimstar:branches:GNOME:Factory/evolution via accept of submit request 34501 revision 4. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/34501 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=72
134 lines
4.6 KiB
Diff
134 lines
4.6 KiB
Diff
From 56e6bdb414fb251d99ffe43667bbc2a25741091a Mon Sep 17 00:00:00 2001
|
|
From: Matthew Barnes <mbarnes@redhat.com>
|
|
Date: Wed, 10 Mar 2010 12:38:32 +0000
|
|
Subject: Bug 612374 - Build failure due to recent GTK+ deprecations
|
|
|
|
---
|
|
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
|
|
index ab06db9..12dd47d 100644
|
|
--- a/calendar/gui/weekday-picker.c
|
|
+++ b/calendar/gui/weekday-picker.c
|
|
@@ -92,15 +92,18 @@ colorize_items (WeekdayPicker *wp)
|
|
GdkColor *outline, *focus_outline;
|
|
GdkColor *fill, *sel_fill;
|
|
GdkColor *text_fill, *sel_text_fill;
|
|
+ GtkStateType state;
|
|
gint i;
|
|
|
|
priv = wp->priv;
|
|
|
|
- outline = >K_WIDGET (wp)->style->fg[GTK_WIDGET_STATE (wp)];
|
|
- focus_outline = >K_WIDGET (wp)->style->bg[GTK_WIDGET_STATE (wp)];
|
|
+ state = gtk_widget_get_state (GTK_WIDGET (wp));
|
|
|
|
- fill = >K_WIDGET (wp)->style->base[GTK_WIDGET_STATE (wp)];
|
|
- text_fill = >K_WIDGET (wp)->style->fg[GTK_WIDGET_STATE (wp)];
|
|
+ outline = >K_WIDGET (wp)->style->fg[state];
|
|
+ focus_outline = >K_WIDGET (wp)->style->bg[state];
|
|
+
|
|
+ fill = >K_WIDGET (wp)->style->base[state];
|
|
+ text_fill = >K_WIDGET (wp)->style->fg[state];
|
|
|
|
sel_fill = >K_WIDGET (wp)->style->bg[GTK_STATE_SELECTED];
|
|
sel_text_fill = >K_WIDGET (wp)->style->fg[GTK_STATE_SELECTED];
|
|
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
|
|
index df65c25..70789c0 100644
|
|
--- a/mail/e-mail-display.c
|
|
+++ b/mail/e-mail-display.c
|
|
@@ -98,10 +98,10 @@ mail_display_update_formatter_colors (EMailDisplay *display)
|
|
EMFormatHTMLColorType type;
|
|
EMFormatHTML *formatter;
|
|
GdkColor *color;
|
|
+ GtkStateType state;
|
|
GtkStyle *style;
|
|
- gint state;
|
|
|
|
- state = GTK_WIDGET_STATE (display);
|
|
+ state = gtk_widget_get_state (GTK_WIDGET (display));
|
|
formatter = display->priv->formatter;
|
|
|
|
style = gtk_widget_get_style (GTK_WIDGET (display));
|
|
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
|
|
index f38cb39..69f1fe8 100644
|
|
--- a/widgets/table/e-table-field-chooser-item.c
|
|
+++ b/widgets/table/e-table-field-chooser-item.c
|
|
@@ -463,7 +463,7 @@ etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint w
|
|
rows = e_table_header_count (etfci->combined_header);
|
|
|
|
style = GTK_WIDGET (canvas)->style;
|
|
- state = GTK_WIDGET_STATE (canvas);
|
|
+ state = gtk_widget_get_state (GTK_WIDGET (canvas));
|
|
|
|
y1 = y2 = 0;
|
|
for (row = 0; row < rows; row++, y1 = y2) {
|
|
@@ -519,6 +519,7 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
|
|
GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas);
|
|
GtkTargetList *list;
|
|
GdkDragContext *context;
|
|
+ GtkStateType state;
|
|
ETableCol *ecol;
|
|
GdkPixmap *pixmap;
|
|
gint drag_col;
|
|
@@ -552,8 +553,10 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
|
|
button_height = e_table_header_compute_height (ecol, widget);
|
|
pixmap = gdk_pixmap_new (widget->window, etfci->width, button_height, -1);
|
|
|
|
+ state = gtk_widget_get_state (widget);
|
|
+
|
|
e_table_header_draw_button (pixmap, ecol,
|
|
- widget->style, GTK_WIDGET_STATE (widget),
|
|
+ widget->style, state,
|
|
widget,
|
|
0, 0,
|
|
etfci->width, button_height,
|
|
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
|
|
index 7c75b58..b2bcb59 100644
|
|
--- a/widgets/table/e-table-header-item.c
|
|
+++ b/widgets/table/e-table-header-item.c
|
|
@@ -1000,6 +1000,7 @@ ethi_draw (GnomeCanvasItem *item,
|
|
x2 += ethi->group_indent_width;
|
|
for (col = 0; col < cols; col++, x1 = x2) {
|
|
ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
|
|
+ GtkStateType state;
|
|
gint col_width;
|
|
|
|
col_width = ecol->width;
|
|
@@ -1015,9 +1016,11 @@ ethi_draw (GnomeCanvasItem *item,
|
|
if (x2 <= x1)
|
|
continue;
|
|
|
|
+ state = gtk_widget_get_state (GTK_WIDGET (canvas));
|
|
+
|
|
e_table_header_draw_button (drawable, ecol,
|
|
GTK_WIDGET (canvas)->style,
|
|
- GTK_WIDGET_STATE (canvas),
|
|
+ state,
|
|
GTK_WIDGET (canvas),
|
|
x1 - x, -y,
|
|
width, height,
|
|
@@ -1154,6 +1157,7 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
|
|
GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
|
|
GtkTargetList *list;
|
|
GdkDragContext *context;
|
|
+ GtkStateType state;
|
|
ETableCol *ecol;
|
|
gint col_width;
|
|
GdkPixmap *pixmap;
|
|
@@ -1210,10 +1214,12 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
|
|
col_width = ecol->width;
|
|
pixmap = gdk_pixmap_new (widget->window, col_width, ethi->height, -1);
|
|
|
|
+ state = gtk_widget_get_state (widget);
|
|
+
|
|
e_table_header_draw_button (
|
|
pixmap, ecol,
|
|
widget->style,
|
|
- GTK_WIDGET_STATE (widget),
|
|
+ state,
|
|
widget,
|
|
0, 0,
|
|
col_width, ethi->height,
|
|
--
|
|
cgit v0.8.3.1
|
|
|