[gucharmap] Unbreak gtk2 build after 7b6ddce1 and 1d381b01.
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gucharmap] Unbreak gtk2 build after 7b6ddce1 and 1d381b01.
- Date: Mon, 8 Nov 2010 11:07:59 +0000 (UTC)
commit c685dbcf4ae924b262a72d227cd916df6693461a
Author: Daiki Ueno <ueno unixuser org>
Date: Mon Nov 8 11:11:41 2010 +0900
Unbreak gtk2 build after 7b6ddce1 and 1d381b01.
gucharmap/gucharmap-chartable.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/gucharmap/gucharmap-chartable.c b/gucharmap/gucharmap-chartable.c
index f1d3ffa..47ef16a 100644
--- a/gucharmap/gucharmap-chartable.c
+++ b/gucharmap/gucharmap-chartable.c
@@ -144,8 +144,12 @@ G_DEFINE_TYPE (GucharmapChartableAccessibleFactory, gucharmap_chartable_accessib
/* Type definition */
+#if GTK_CHECK_VERSION (2, 91, 2)
G_DEFINE_TYPE_WITH_CODE (GucharmapChartable, gucharmap_chartable, GTK_TYPE_DRAWING_AREA,
G_IMPLEMENT_INTERFACE(GTK_TYPE_SCROLLABLE, NULL))
+#else
+G_DEFINE_TYPE (GucharmapChartable, gucharmap_chartable, GTK_TYPE_DRAWING_AREA)
+#endif
/* utility functions */
@@ -1898,6 +1902,7 @@ gucharmap_chartable_get_accessible (GtkWidget *widget)
/* GucharmapChartable class methods */
+#if GTK_CHECK_VERSION (2, 91, 2)
static void
gucharmap_chartable_set_hadjustment (GucharmapChartable *chartable,
GtkAdjustment *hadjustment)
@@ -1912,6 +1917,7 @@ gucharmap_chartable_set_hadjustment (GucharmapChartable *chartable,
priv->hadjustment = hadjustment ? g_object_ref_sink (hadjustment) : NULL;
}
+#endif
static void
gucharmap_chartable_set_vadjustment (GucharmapChartable *chartable,
@@ -1951,7 +1957,6 @@ gucharmap_chartable_set_adjustments (GucharmapChartable *chartable,
GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment)
{
- gucharmap_chartable_set_hadjustment (chartable, hadjustment);
gucharmap_chartable_set_vadjustment (chartable, vadjustment);
}
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]