[tracker/libtracker-miner] TrackerMinerFS: No need to disconnect signals, we own these objects.



commit a4a15aad423c53a712afaac7bea218f50edbb836
Author: Carlos Garnacho <carlos lanedo com>
Date:   Wed Aug 26 18:06:28 2009 +0200

    TrackerMinerFS: No need to disconnect signals, we own these objects.
    
    TrackerMinerFS owns both the crawler and the monitor, so these won't survive
    finalization, so there's no need to disconnect signals before unref'ing.

 src/libtracker-miner/tracker-miner-fs.c |   45 +-----------------------------
 1 files changed, 2 insertions(+), 43 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index f6aee3a..21c2936 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -289,49 +289,8 @@ fs_finalize (GObject *object)
 
 	crawl_directories_stop (TRACKER_MINER_FS (object));
 
-	if (priv->crawler) {
-		guint lsignals;
-
-		lsignals = g_signal_handlers_disconnect_matched (priv->crawler,
-								 G_SIGNAL_MATCH_FUNC,
-								 0,
-								 0,
-								 NULL,
-								 G_CALLBACK (crawler_check_file_cb),
-								 NULL);
-		lsignals = g_signal_handlers_disconnect_matched (priv->crawler,
-								 G_SIGNAL_MATCH_FUNC,
-								 0,
-								 0,
-								 NULL,
-								 G_CALLBACK (crawler_check_directory_cb),
-								 NULL);
-		lsignals = g_signal_handlers_disconnect_matched (priv->crawler,
-								 G_SIGNAL_MATCH_FUNC,
-								 0,
-								 0,
-								 NULL,
-								 G_CALLBACK (crawler_finished_cb),
-								 NULL);
-
-		g_object_unref (priv->crawler);
-	}
-
-	if (priv->monitor) {
-		g_signal_handlers_disconnect_by_func (priv->monitor,
-						      G_CALLBACK (monitor_item_deleted_cb),
-						      object);
-		g_signal_handlers_disconnect_by_func (priv->monitor,
-						      G_CALLBACK (monitor_item_updated_cb),
-						      object);
-		g_signal_handlers_disconnect_by_func (priv->monitor,
-						      G_CALLBACK (monitor_item_created_cb),
-						      object);
-		g_signal_handlers_disconnect_by_func (priv->monitor,
-						      G_CALLBACK (monitor_item_moved_cb),
-						      object);
-		g_object_unref (priv->monitor);
-	}
+	g_object_unref (priv->crawler);
+	g_object_unref (priv->monitor);
 
 	if (priv->directories) {
 		g_list_foreach (priv->directories, (GFunc) directory_data_free, NULL);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]