diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c index c7e391c00d638d281af8d9f0214a5b77b6763de8..fd8484498602a50ea0a1d6fa5ce1fa1b2f42df00 100644 --- a/thunar/thunar-file.c +++ b/thunar/thunar-file.c @@ -799,13 +799,9 @@ thunar_file_monitor (GFileMonitor *monitor, if (g_file_equal (event_path, file->gfile)) { /* the event occurred for the monitored ThunarFile */ -#if GLIB_CHECK_VERSION (2, 46, 0) if (event_type == G_FILE_MONITOR_EVENT_RENAMED || event_type == G_FILE_MONITOR_EVENT_MOVED_IN || event_type == G_FILE_MONITOR_EVENT_MOVED_OUT) -#else - if (event_type == G_FILE_MONITOR_EVENT_MOVED) -#endif { G_LOCK (file_rename_mutex); thunar_file_monitor_moved (file, other_path); @@ -821,13 +817,9 @@ thunar_file_monitor (GFileMonitor *monitor, /* The event did not occur for the monitored ThunarFile, but for a file that is contained in ThunarFile which is actually a directory. */ -#if GLIB_CHECK_VERSION (2, 46, 0) if (event_type == G_FILE_MONITOR_EVENT_RENAMED || event_type == G_FILE_MONITOR_EVENT_MOVED_IN || event_type == G_FILE_MONITOR_EVENT_MOVED_OUT) -#else - if (event_type == G_FILE_MONITOR_EVENT_MOVED) -#endif { /* reload the target file if cached */ if (other_path == NULL) @@ -3895,11 +3887,7 @@ thunar_file_watch (ThunarFile *file) /* create a file or directory monitor */ file_watch->monitor = g_file_monitor (file->gfile, G_FILE_MONITOR_WATCH_MOUNTS | -#if GLIB_CHECK_VERSION (2, 46, 0) G_FILE_MONITOR_WATCH_MOVES, NULL, &error); -#else - G_FILE_MONITOR_SEND_MOVED, NULL, &error); -#endif if (G_UNLIKELY (file_watch->monitor == NULL)) { diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c index 1668d8e204844736c1dea0a5224fbaa9d86e3d3e..128572f7a6c4a63f1a879f748c1d69ef7e542e54 100644 --- a/thunar/thunar-folder.c +++ b/thunar/thunar-folder.c @@ -139,11 +139,7 @@ thunar_folder_constructed (GObject *object) GError *error = NULL; folder->monitor = g_file_monitor_directory (thunar_file_get_file (folder->corresponding_file), -#if GLIB_CHECK_VERSION (2, 46, 0) G_FILE_MONITOR_WATCH_MOVES, NULL, &error); -#else - G_FILE_MONITOR_SEND_MOVED, NULL, &error); -#endif if (G_LIKELY (folder->monitor != NULL)) g_signal_connect (folder->monitor, "changed", G_CALLBACK (thunar_folder_monitor), folder); @@ -803,13 +799,9 @@ thunar_folder_monitor (GFileMonitor *monitor, g_object_unref (destroyed); } } -#if GLIB_CHECK_VERSION (2, 46, 0) else if (event_type == G_FILE_MONITOR_EVENT_RENAMED || event_type == G_FILE_MONITOR_EVENT_MOVED_IN || event_type == G_FILE_MONITOR_EVENT_MOVED_OUT) -#else - else if (event_type == G_FILE_MONITOR_EVENT_MOVED) -#endif { /* destroy the old file and update the new one */ thunar_file_destroy (lp->data); diff --git a/thunar/thunar-session-client.c b/thunar/thunar-session-client.c index 40fd04c893acc8f7d48c6c41dd0103a0dfd97b52..2f9e951ef403f679a6d706c5f4f6dadcd1eafc52 100644 --- a/thunar/thunar-session-client.c +++ b/thunar/thunar-session-client.c @@ -174,22 +174,7 @@ thunar_session_client_connect (ThunarSessionClient *session_client, gdk_x11_set_sm_client_id (id); /* remember the returned client id */ -#if GLIB_CHECK_VERSION (2, 46, 0) - /* just use the memory */ - session_client->id = id; -#else - if (g_mem_is_system_malloc ()) - { - /* just use the memory */ - session_client->id = id; - } - else - { - /* use GLib memory management */ - session_client->id = g_strdup (id); - free (id); - } -#endif + session_client->id = id; /* determine the session file path */ spec = g_strconcat ("sessions/Thunar-", session_client->id, NULL);