commit b003e3de43151beea3626c750570dbb46fde8f51
Author: Snark <jpuydt gnome org>
Date: Sun Oct 10 19:46:26 2010 +0200
Pushed up the gtk+ and glib deps
We now depend on gtk+ >= 2.20.0 and glib >= 2.24.0.
There are still a few GTK_CHECK_VERSION.
configure.ac | 4 ++--
lib/gui/gmlevelmeter.c | 28 ----------------------------
lib/platform/platform-win32.c | 4 ----
3 files changed, 2 insertions(+), 34 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 937fb06..b276a6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,8 +178,8 @@ IT_PROG_INTLTOOL([0.35.0])
dnl ###############################
dnl Mandatory GTK+ support
dnl ###############################
-PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.18.0])
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0 gmodule-2.0 gobject-2.0 gthread-2.0])
+PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.20.0])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.24.0 gmodule-2.0 gobject-2.0 gthread-2.0])
AC_ARG_ENABLE([gtk-debug],
[AC_HELP_STRING([--enable-gtk-debug],[enable GTK+ debug flags (default is disabled)])],
[if test "x$enableval" = "xyes"; then
diff --git a/lib/gui/gmlevelmeter.c b/lib/gui/gmlevelmeter.c
index 4e25fad..dd57870 100644
--- a/lib/gui/gmlevelmeter.c
+++ b/lib/gui/gmlevelmeter.c
@@ -152,11 +152,7 @@ gm_level_meter_set_level (GmLevelMeter *lm,
if (level > lm->peak)
lm->peak = level;
-#if GTK_CHECK_VERSION(2,20,0)
if (gtk_widget_get_realized (GTK_WIDGET (lm)))
-#else
- if (GTK_WIDGET_REALIZED (lm))
-#endif
gm_level_meter_paint (lm);
}
@@ -168,11 +164,7 @@ gm_level_meter_clear (GmLevelMeter *lm)
lm->level = 0;
lm->peak = 0;
-#if GTK_CHECK_VERSION(2,20,0)
if (gtk_widget_get_realized (GTK_WIDGET (lm)))
-#else
- if (GTK_WIDGET_REALIZED (lm))
-#endif
gm_level_meter_paint (lm);
}
@@ -186,11 +178,7 @@ gm_level_meter_set_colors (GmLevelMeter* lm,
if (lm->colorEntries) {
/* free old colors, if they have been allocated; delete old array */
-#if GTK_CHECK_VERSION(2,20,0)
if (gtk_widget_get_realized (GTK_WIDGET (lm)))
-#else
- if (GTK_WIDGET_REALIZED (lm))
-#endif
gm_level_meter_free_colors (lm->colorEntries);
g_array_free (lm->colorEntries, TRUE);
}
@@ -205,11 +193,7 @@ gm_level_meter_set_colors (GmLevelMeter* lm,
g_array_append_val (lm->colorEntries, *entry);
}
-#if GTK_CHECK_VERSION(2,20,0)
if (gtk_widget_get_realized (GTK_WIDGET (lm))) {
-#else
- if (GTK_WIDGET_REALIZED (lm)) {
-#endif
gm_level_meter_allocate_colors (lm->colorEntries);
@@ -362,11 +346,7 @@ gm_level_meter_realize (GtkWidget *widget)
g_return_if_fail (GM_IS_LEVEL_METER (widget));
-#if GTK_CHECK_VERSION(2,20,0)
gtk_widget_set_realized (widget, TRUE);
-#else
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-#endif
lm = GM_LEVEL_METER (widget);
gtk_widget_get_allocation (widget, &allocation);
@@ -402,11 +382,7 @@ gm_level_meter_create_pixmap (GmLevelMeter *lm)
g_return_if_fail (GM_IS_LEVEL_METER (lm));
-#if GTK_CHECK_VERSION(2,20,0)
if (gtk_widget_get_realized (GTK_WIDGET (lm))) {
-#else
- if (GTK_WIDGET_REALIZED (lm)) {
-#endif
GtkAllocation allocation;
@@ -604,11 +580,7 @@ gm_level_meter_size_allocate (GtkWidget *widget,
g_return_if_fail (allocation != NULL);
gtk_widget_set_allocation (widget, allocation);
-#if GTK_CHECK_VERSION(2,20,0)
if (gtk_widget_get_realized (widget)) {
-#else
- if (GTK_WIDGET_REALIZED (widget)) {
-#endif
gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x, allocation->y,
diff --git a/lib/platform/platform-win32.c b/lib/platform/platform-win32.c
index 48a96d0..48004b4 100644
--- a/lib/platform/platform-win32.c
+++ b/lib/platform/platform-win32.c
@@ -49,11 +49,7 @@ static gchar *plugindir = NULL;
void
gm_platform_init ()
{
-#if GLIB_CHECK_VERSION (2, 18, 0)
basedir = g_strdup (g_win32_get_package_installation_directory_of_module (NULL));
-#else
- basedir = g_strdup (g_win32_get_package_installation_directory (NULL, NULL));
-#endif
sysconfdir = g_strdup (basedir);
datadir = g_strdup (basedir);
plugindir = g_strdup_printf ("%s/lib/contacts", basedir);