remove glib version checks that are no longer required

vladkinoman · Jul 21, 2012 · 6686ded · 6686ded
1 parent a1172d1
commit 6686ded
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 15 deletions.
diff --git a/plugins/mtpdevice/rb-mtp-source.c b/plugins/mtpdevice/rb-mtp-source.c
@@ -59,11 +59,6 @@
 #include "rb-mtp-source.h"
 #include "rb-mtp-thread.h"
 
-#if !GLIB_CHECK_VERSION(2,22,0)
-#define g_mount_unmount_with_operation_finish g_mount_unmount_finish
-#define g_mount_unmount_with_operation(m,f,mo,ca,cb,ud) g_mount_unmount(m,f,ca,cb,ud)
-#endif
-
 static void rb_mtp_source_constructed (GObject *object);
 static void rb_mtp_source_dispose (GObject *object);
 static void rb_mtp_source_finalize (GObject *object);

diff --git a/rhythmdb/rhythmdb-monitor.c b/rhythmdb/rhythmdb-monitor.c
@@ -42,10 +42,6 @@
 #include "rhythmdb-query-result-list.h"
 #include "rb-file-helpers.h"
 
-#if !GLIB_CHECK_VERSION(2,24,0)
-#define G_FILE_MONITOR_SEND_MOVED	0
-#endif
-
 #define RHYTHMDB_FILE_MODIFY_PROCESS_TIME 2
 
 static void rhythmdb_directory_change_cb (GFileMonitor *monitor,
@@ -351,7 +347,6 @@ rhythmdb_directory_change_cb (GFileMonitor *monitor,
 			rhythmdb_commit (db);
 		}
 		break;
-#if GLIB_CHECK_VERSION(2,24,0)
 	case G_FILE_MONITOR_EVENT_MOVED:
 		if (other_canon_uri == NULL) {
 			break;
@@ -377,7 +372,6 @@ rhythmdb_directory_change_cb (GFileMonitor *monitor,
 			}
 		}
 		break;
-#endif
 	case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
 	case G_FILE_MONITOR_EVENT_UNMOUNTED:
 	default:

diff --git a/shell/rb-removable-media-manager.c b/shell/rb-removable-media-manager.c
@@ -655,13 +655,11 @@ rb_removable_media_manager_add_volume (RBRemovableMediaManager *mgr, GVolume *vo
 
 	mount = g_volume_get_mount (volume);
 	if (mount != NULL) {
-#if GLIB_CHECK_VERSION(2, 20, 0)
 		if (g_mount_is_shadowed (mount) != FALSE) {
 			rb_debug ("mount is shadowed, so ignoring the volume");
 			g_object_unref (mount);
 			return;
 		}
-#endif
 		if (g_hash_table_lookup (priv->mount_mapping, mount) != NULL) {
 			/* this can probably never happen, but it's OK */
 			rb_debug ("already created a source for the mount, so ignoring the volume");
@@ -713,11 +711,9 @@ rb_removable_media_manager_add_mount (RBRemovableMediaManager *mgr, GMount *moun
 	if (g_hash_table_lookup (priv->mount_mapping, mount) != NULL) {
 		return;
 	}
-#if GLIB_CHECK_VERSION(2, 20, 0)
 	if (g_mount_is_shadowed (mount) != FALSE) {
 		return;
 	}
-#endif
 	volume = g_mount_get_volume (mount);
 	if (volume == NULL) {
 		rb_debug ("Unhandled media, no volume for mount");