[tracker/drop-inotify] bump glib requirement to 2.24
- From: Aleksander Morgado <aleksm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/drop-inotify] bump glib requirement to 2.24
- Date: Tue, 29 Jun 2010 18:00:33 +0000 (UTC)
commit 4193e13b68f6f425784ff8fba3ad9aca0b334eef
Author: Aleksander Morgado <aleksander lanedo com>
Date: Tue Jun 29 20:00:23 2010 +0200
bump glib requirement to 2.24
configure.ac | 2 +-
src/libtracker-miner/tracker-monitor.c | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 583633e..5115270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,7 +133,7 @@ fi
# Library required versions
DBUS_REQUIRED=1.0
DBUS_GLIB_REQUIRED=0.78
-GLIB_REQUIRED=2.20.0
+GLIB_REQUIRED=2.24.0
PANGO_REQUIRED=1.0.0
GTK_REQUIRED=2.18.0
LIBXML2_REQUIRED=2.6
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index fb032c7..33445b6 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -595,10 +595,8 @@ monitor_event_to_string (GFileMonitorEvent event_type)
return "G_FILE_MONITOR_EVENT_PRE_UNMOUNT";
case G_FILE_MONITOR_EVENT_UNMOUNTED:
return "G_FILE_MONITOR_EVENT_UNMOUNTED";
-#if GLIB_CHECK_VERSION (2, 23, 6)
case G_FILE_MONITOR_EVENT_MOVED:
return "G_FILE_MONITOR_EVENT_MOVED";
-#endif /* GLIB_CHECK_VERSION */
}
return "unknown";
@@ -780,7 +778,6 @@ monitor_event_cb (GFileMonitor *file_monitor,
is_directory);
break;
-#if GLIB_CHECK_VERSION (2, 23, 6)
case G_FILE_MONITOR_EVENT_MOVED:
g_signal_emit (monitor,
signals[ITEM_MOVED], 0,
@@ -794,7 +791,6 @@ monitor_event_cb (GFileMonitor *file_monitor,
}
break;
-#endif /* GLIB_CHECK_VERSION */
case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
case G_FILE_MONITOR_EVENT_UNMOUNTED:
@@ -830,10 +826,7 @@ directory_monitor_new (TrackerMonitor *monitor,
GError *error = NULL;
file_monitor = g_file_monitor_directory (file,
-#if GLIB_CHECK_VERSION (2, 23, 6)
- G_FILE_MONITOR_SEND_MOVED |
-#endif /* GLIB_CHECK_VERSION */
- G_FILE_MONITOR_WATCH_MOUNTS,
+ G_FILE_MONITOR_SEND_MOVED | G_FILE_MONITOR_WATCH_MOUNTS,
NULL,
&error);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]