rhythmbox r5708 - in trunk: . metadata

[jmatthew svn gnome org]

Author: jmatthew
Date: Sun May 25 22:39:38 2008
New Revision: 5708
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5708&view=rev

Log:
2008-05-26  Jonathan Matthew  <jonathan d14n org>

	* metadata/rb-metadata-dbus-client.c (kill_metadata_service),
	(start_metadata_service):
	Close the metadata helper process stdout pipe when cleaning up.
	Fixes #534582.


Modified:
   trunk/ChangeLog
   trunk/metadata/rb-metadata-dbus-client.c

Modified: trunk/metadata/rb-metadata-dbus-client.c
==============================================================================
--- trunk/metadata/rb-metadata-dbus-client.c	(original)
+++ trunk/metadata/rb-metadata-dbus-client.c	Sun May 25 22:39:38 2008
@@ -80,6 +80,7 @@
 static gboolean tried_env_address = FALSE;
 static DBusConnection *dbus_connection = NULL;
 static GPid metadata_child = 0;
+static int metadata_stdout = -1;
 static GMainContext *main_context = NULL;
 static GStaticMutex conn_mutex = G_STATIC_MUTEX_INIT;
 
@@ -158,6 +159,12 @@
 		g_spawn_close_pid (metadata_child);
 		metadata_child = 0;
 	}
+
+	if (metadata_stdout != -1) {
+		rb_debug ("closing metadata child process stdout pipe");
+		close (metadata_stdout);
+		metadata_stdout = -1;
+	}
 }
 
 static gboolean
@@ -225,7 +232,6 @@
 	}
 
 	if (dbus_address == NULL) {
-		gint metadata_stdout;
 		GPtrArray *argv;
 		gboolean res;
 		char **debug_args;