[Rawstudio-commit] r2065 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-10-13 21:44:34 +0200 (Mon, 13 Oct 2008)
New Revision: 2065

Modified:
   trunk/src/rawstudio.h
   trunk/src/rs-photo.c
Log:
Now properly disconnects from signals in rs_photo_finalize().

Modified: trunk/src/rawstudio.h
===================================================================
--- trunk/src/rawstudio.h	2008-10-12 20:20:54 UTC (rev 2064)
+++ trunk/src/rawstudio.h	2008-10-13 19:44:34 UTC (rev 2065)
@@ -92,6 +92,7 @@
 	gchar *filename;
 	RS_IMAGE16 *input;
 	RSSettings *settings[3];
+	gulong settings_signal[3];
 	gint priority;
 	guint orientation;
 	RSMetadata *metadata;

Modified: trunk/src/rs-photo.c
===================================================================
--- trunk/src/rs-photo.c	2008-10-12 20:20:54 UTC (rev 2064)
+++ trunk/src/rs-photo.c	2008-10-13 19:44:34 UTC (rev 2065)
@@ -70,7 +70,10 @@
 		g_object_unref(photo->input);
 
 	for(c=0;c<3;c++)
+	{
+		g_signal_handler_disconnect(photo->settings[c], photo->settings_signal[c]);
 		g_object_unref(photo->settings[c]);
+	}
 	if (photo->crop)
 		g_free(photo->crop);
 
@@ -119,7 +122,7 @@
 	for(c=0;c<3;c++)
 	{
 		photo->settings[c] = rs_settings_new();
-		g_signal_connect(photo->settings[c], "settings-changed", G_CALLBACK(photo_settings_changed_cb), photo);
+		photo->settings_signal[c] = g_signal_connect(photo->settings[c], "settings-changed", G_CALLBACK(photo_settings_changed_cb), photo);
 	}
 	photo->crop = NULL;
 	photo->angle = 0.0;