From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Fri, 30 Dec 2011 12:59:53 +0000 (+0100)
Subject: Revert "call notify functions in in an idle call"
X-Git-Tag: v1.2~11^2~3
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=988b89175eb9703d8116b719e0baf036793a33c3

Revert "call notify functions in in an idle call"

Breaks type in of keywords.

This reverts commit 78cde6934008f79fe498e4adc64d187b0ed47417.
---

diff --git a/src/filedata.c b/src/filedata.c
index b7f260de..62e77497 100644
--- a/src/filedata.c
+++ b/src/filedata.c
@@ -2551,12 +2551,6 @@ GList *file_data_process_groups_in_selection(GList *list, gboolean ungroup, GLis
    implementation in view_file_list.c */
 
 
-typedef struct _NotifyIdleData NotifyIdleData;
-
-struct _NotifyIdleData {
-	FileData *fd;
-	NotifyType type;
-};
 
 
 typedef struct _NotifyData NotifyData;
@@ -2630,29 +2624,17 @@ gboolean file_data_unregister_notify_func(FileDataNotifyFunc func, gpointer data
 }
 
 
-gboolean file_data_send_notification_idle_cb(gpointer data)
+void file_data_send_notification(FileData *fd, NotifyType type)
 {
-	NotifyIdleData *nid = (NotifyIdleData *)data;
 	GList *work = notify_func_list;
 
 	while (work)
 		{
 		NotifyData *nd = (NotifyData *)work->data;
 		
-		nd->func(nid->fd, nid->type, nd->data);
+		nd->func(fd, type, nd->data);
 		work = work->next;
 		}
-	file_data_unref(nid->fd);
-	g_free(nid);
-	return FALSE;
-}
-
-void file_data_send_notification(FileData *fd, NotifyType type)
-{
-	NotifyIdleData *nid = g_new0(NotifyIdleData, 1);
-	nid->fd = file_data_ref(fd);
-	nid->type = type;
-	g_idle_add_full(G_PRIORITY_HIGH, file_data_send_notification_idle_cb, nid, NULL);
 }
 
 static GHashTable *file_data_monitor_pool = NULL;