aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2010-10-08 09:58:06 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-10-30 01:49:57 +0800
commit9b2576119477a2a4bcfed3d1c5f2c038403941be (patch)
treea0df64f3e7601ae639c64f720a639305cea1aa21
parent76ca1d5b2e99424644ad66037bceb52d9b8ac534 (diff)
downloadgsoc2013-evolution-9b2576119477a2a4bcfed3d1c5f2c038403941be.tar
gsoc2013-evolution-9b2576119477a2a4bcfed3d1c5f2c038403941be.tar.gz
gsoc2013-evolution-9b2576119477a2a4bcfed3d1c5f2c038403941be.tar.bz2
gsoc2013-evolution-9b2576119477a2a4bcfed3d1c5f2c038403941be.tar.lz
gsoc2013-evolution-9b2576119477a2a4bcfed3d1c5f2c038403941be.tar.xz
gsoc2013-evolution-9b2576119477a2a4bcfed3d1c5f2c038403941be.tar.zst
gsoc2013-evolution-9b2576119477a2a4bcfed3d1c5f2c038403941be.zip
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.
-rw-r--r--calendar/gui/e-week-view.c2
-rw-r--r--filter/e-filter-int.c4
-rw-r--r--filter/e-filter-rule.c4
-rw-r--r--mail/em-filter-rule.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index bb6784d053..dd72bfe530 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 3fcfe872e3..dc0fbdb5a8 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 4dc2d8356f..9d6fb275e8 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 026c722612..3a83aafc01 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 (