From bbe13c186e10b5ace45e571322714e41a1d8f7f0 Mon Sep 17 00:00:00 2001 From: eidheim Date: Mon, 11 Jul 2016 11:04:43 +0200 Subject: [PATCH] Reverted the gio check. GLIBMM_ is correct according to https://developer.gnome.org/glibmm/stable/group__giommEnums.html#ga469f795e9a4dddb2421c0e5568be6649 --- src/directories.cc | 2 +- src/git.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/directories.cc b/src/directories.cc index 7fc1bea..d1a64ab 100644 --- a/src/directories.cc +++ b/src/directories.cc @@ -542,7 +542,7 @@ void Directories::add_or_update_path(const boost::filesystem::path &dir_path, co if(path_it==directories.end()) { auto g_file=Glib::wrap(g_file_new_for_path(dir_path.string().c_str())); //TODO: report missing constructor in giomm -#if GIOMM_MAJOR_VERSION>2 || (GIOMM_MAJOR_VERSION==2 && GIOMM_MINOR_VERSION>=44) +#if GLIBMM_MAJOR_VERSION>2 || (GLIBMM_MAJOR_VERSION==2 && GLIBMM_MINOR_VERSION>=44) auto monitor=g_file->monitor_directory(Gio::FileMonitorFlags::FILE_MONITOR_WATCH_MOVES); #else auto monitor=g_file->monitor_directory(Gio::FileMonitorFlags::FILE_MONITOR_SEND_MOVED); diff --git a/src/git.cc b/src/git.cc index 88498fd..7df273f 100644 --- a/src/git.cc +++ b/src/git.cc @@ -104,7 +104,7 @@ Git::Repository::Repository(const boost::filesystem::path &path) { auto git_path_str=boost::filesystem::canonical(get_path()).string(); auto git_directory=Glib::wrap(g_file_new_for_path(git_path_str.c_str())); //TODO: report missing constructor in giomm -#if GIOMM_MAJOR_VERSION>2 || (GIOMM_MAJOR_VERSION==2 && GIOMM_MINOR_VERSION>=44) +#if GLIBMM_MAJOR_VERSION>2 || (GLIBMM_MAJOR_VERSION==2 && GLIBMM_MINOR_VERSION>=44) monitor=git_directory->monitor_directory(Gio::FileMonitorFlags::FILE_MONITOR_WATCH_MOVES); #else monitor=git_directory->monitor_directory(Gio::FileMonitorFlags::FILE_MONITOR_SEND_MOVED);