[geany/geany-plugins] 909660: workbench: use simple/old file monitor events only

[LarsDW223]

Branch:      refs/heads/master
Author:      LarsDW223 <lars_paulsen at web.de>
Committer:   LarsDW223 <lars_paulsen at web.de>
Date:        Mon, 05 Mar 2018 20:44:40 UTC
Commit:      9096605eb280528a46b7cc446d550bb75dfb22af
             https://github.com/geany/geany-plugins/commit/9096605eb280528a46b7cc446d550bb75dfb22af

Log Message:
-----------
workbench: use simple/old file monitor events only

This removes the dependency/the requirement for GLib version 2.46.


Modified Paths:
--------------
    workbench/src/plugin_main.c
    workbench/src/wb_monitor.c
    workbench/src/wb_monitor.h

Modified: workbench/src/plugin_main.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -130,7 +130,7 @@ void geany_load_module(GeanyPlugin *plugin)
 	/* Set metadata */
 	plugin->info->name = _("Workbench");
 	plugin->info->description = _("Manage and customize multiple projects.");
-	plugin->info->version = "1.03";
+	plugin->info->version = "1.04";
 	plugin->info->author = "LarsGit223";
 
 	/* Set functions */


Modified: workbench/src/wb_monitor.c
22 lines changed, 1 insertions(+), 21 deletions(-)
===================================================================
@@ -122,26 +122,6 @@ static void wb_monitor_file_changed_cb(G_GNUC_UNUSED GFileMonitor *monitor,
 				entry->prj, entry->dir, file_path);
 			break;
 
-		case G_FILE_MONITOR_EVENT_RENAMED:
-			event_string = "FILE_RENAMED";
-			workbench_process_remove_file_event (wb_globals.opened_wb,
-				entry->prj, entry->dir, file_path);
-			workbench_process_add_file_event (wb_globals.opened_wb,
-				entry->prj, entry->dir, other_file_path);
-			break;
-
-		case G_FILE_MONITOR_EVENT_MOVED_IN:
-			event_string = "FILE_MOVED_IN";
-			workbench_process_add_file_event (wb_globals.opened_wb,
-				entry->prj, entry->dir, file_path);
-			break;
-
-		case G_FILE_MONITOR_EVENT_MOVED_OUT:
-			event_string = "FILE_MOVED_OUT";
-			workbench_process_remove_file_event (wb_globals.opened_wb,
-				entry->prj, entry->dir, file_path);
-			break;
-
 		default:
 			break;
 	}
@@ -204,7 +184,7 @@ void wb_monitor_add_dir(WB_MONITOR *monitor, WB_PROJECT *prj,
 	/* Setup file monitor for directory */
 	file = g_file_new_for_path(dirpath);
 	newmon = g_file_monitor_directory
-		(file, G_FILE_MONITOR_WATCH_MOVES, NULL, &error);
+		(file, G_FILE_MONITOR_NONE, NULL, &error);
 	if (newmon == NULL)
 	{
 		/* Create monitor failed. Report error. */


Modified: workbench/src/wb_monitor.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -22,7 +22,7 @@
 #include <glib.h>
 #include "wb_project.h"
 
-#if defined(HAVE_GIO) && GLIB_CHECK_VERSION (2, 46, 0)
+#if defined(HAVE_GIO)
 #define __WB_LIVE_UPDATE 1
 #endif
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).