[maemo-commits] [maemo-commits] r9317 - in projects/haf/trunk/maemo-af-desktop: . hildon-home

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-01-24 18:36:15 +0200 (Wed, 24 Jan 2007)
New Revision: 9317

Modified:
   projects/haf/trunk/maemo-af-desktop/ChangeLog
   projects/haf/trunk/maemo-af-desktop/hildon-home/background-manager.c
Log:

2007-01-24  Johan Bilien <johan.bilien at nokia.com>

	* hildon-home/background-manager.c:
	- removed unused pipe
	- properly close the other pipe.
	Fixes: NB#50838



Modified: projects/haf/trunk/maemo-af-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-af-desktop/ChangeLog	2007-01-24 16:20:22 UTC (rev 9316)
+++ projects/haf/trunk/maemo-af-desktop/ChangeLog	2007-01-24 16:36:15 UTC (rev 9317)
@@ -1,7 +1,15 @@
 2007-01-24  Johan Bilien <johan.bilien at nokia.com>
 
+	* hildon-home/background-manager.c:
+	- removed unused pipe
+	- properly close the other pipe.
+	Fixes: NB#50838
+
+2007-01-24  Johan Bilien <johan.bilien at nokia.com>
+
 	* hildon-status-bar/hildon-status-bar-main.c: Fixed previous
 	changes
+	Fixes: NB#50246
 
 2007-01-22  Johan Bilien <johan.bilien at nokia.com>
 

Modified: projects/haf/trunk/maemo-af-desktop/hildon-home/background-manager.c
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-home/background-manager.c	2007-01-24 16:20:22 UTC (rev 9316)
+++ projects/haf/trunk/maemo-af-desktop/hildon-home/background-manager.c	2007-01-24 16:36:15 UTC (rev 9317)
@@ -1364,6 +1364,8 @@
       gtk_widget_destroy (priv->loading_note);
       priv->loading_note = NULL;
     }
+
+  g_io_channel_shutdown (source, FALSE, NULL);
   
   return FALSE;
 }
@@ -1536,7 +1538,6 @@
   BackgroundManagerPrivate *priv;
   BackgroundData *current;
   GPid pid;
-  int parent_exit_notify[2];
   int pipe_from_child[2];
   static gboolean first_run = TRUE;
   GdkPixbuf *image, *pixbuf;
@@ -1671,7 +1672,6 @@
   if (image)
     g_object_unref (image);
 
-  pipe (parent_exit_notify);
   pipe (pipe_from_child);
 
   if (priv->child_pid)
@@ -1688,7 +1688,6 @@
 
       g_debug ("Saving background (pid %d)...", getpid ());
 
-      close (parent_exit_notify[1]);
       close (pipe_from_child[0]);
 
       g_unlink (current->cache);
@@ -1721,7 +1720,6 @@
       g_debug ("Child spawned (pid %d)...", pid);
       priv->child_pid = pid;
 
-      close (parent_exit_notify[0]);
       close (pipe_from_child[1]);
 
       channel = g_io_channel_unix_new (pipe_from_child[0]);