[evolution] Cast GtkAdjustment constructor calls to GtkAdjustment
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Cast GtkAdjustment constructor calls to GtkAdjustment
- Date: Fri, 29 Oct 2010 18:33:29 +0000 (UTC)
commit 9b2576119477a2a4bcfed3d1c5f2c038403941be
Author: Benjamin Otte <otte redhat com>
Date: Fri Oct 8 03:58:06 2010 +0200
Cast GtkAdjustment constructor calls to GtkAdjustment
Otherwise gcc will complain about wrong type when comiling against GTK2.
This patch can be reverted when compiling against GTK3.
calendar/gui/e-week-view.c | 2 +-
filter/e-filter-int.c | 4 ++--
filter/e-filter-rule.c | 4 ++--
mail/em-filter-rule.c | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index bb6784d..dd72bfe 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -834,7 +834,7 @@ e_week_view_init (EWeekView *week_view)
/*
* Scrollbar.
*/
- adjustment = gtk_adjustment_new (0, -52, 52, 1, 1, 1);
+ adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0, -52, 52, 1, 1, 1));
week_view->vscrollbar = gtk_vscrollbar_new (adjustment);
gtk_table_attach (GTK_TABLE (week_view), week_view->vscrollbar,
diff --git a/filter/e-filter-int.c b/filter/e-filter-int.c
index 3fcfe87..dc0fbdb 100644
--- a/filter/e-filter-int.c
+++ b/filter/e-filter-int.c
@@ -143,9 +143,9 @@ filter_int_get_widget (EFilterElement *element)
GtkWidget *widget;
GtkAdjustment *adjustment;
- adjustment = gtk_adjustment_new (
+ adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (
0.0, (gfloat) filter_int->min,
- (gfloat) filter_int->max, 1.0, 1.0, 0);
+ (gfloat) filter_int->max, 1.0, 1.0, 0));
widget = gtk_spin_button_new (
adjustment,
filter_int->max > filter_int->min + 1000 ? 5.0 : 1.0, 0);
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c
index 4dc2d83..9d6fb27 100644
--- a/filter/e-filter-rule.c
+++ b/filter/e-filter-rule.c
@@ -813,8 +813,8 @@ filter_rule_get_widget (EFilterRule *rule,
l = g_list_next (l);
}
- hadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0);
- vadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0);
+ hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0));
+ vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0));
scrolledwindow = gtk_scrolled_window_new (hadj, vadj);
gtk_scrolled_window_set_policy (
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 026c722..3a83aaf 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -583,8 +583,8 @@ get_widget (EFilterRule *fr, ERuleContext *rc)
l = l->next;
}
- hadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);
- vadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);
+ hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0));
+ vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0));
scrolledwindow = gtk_scrolled_window_new (hadj, vadj);
gtk_scrolled_window_set_policy (
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]