gnome-session r4650 - branches/gnome-2-22/gnome-session

[vuntz svn gnome org]

Author: vuntz
Date: Fri Apr 11 15:52:07 2008
New Revision: 4650
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4650&view=rev

Log:
2008-04-11  Vincent Untz  <vuntz gnome org>

	* gsm-keyring.c: (gsm_keyring_daemon_start): remove unused variable
	* migrate-trash.c: (migrate_trash): fix warnings.
	Patch by Michael Wolf <maw novell com>


Modified:
   branches/gnome-2-22/gnome-session/ChangeLog
   branches/gnome-2-22/gnome-session/gsm-keyring.c
   branches/gnome-2-22/gnome-session/migrate-trash.c

Modified: branches/gnome-2-22/gnome-session/gsm-keyring.c
==============================================================================
--- branches/gnome-2-22/gnome-session/gsm-keyring.c	(original)
+++ branches/gnome-2-22/gnome-session/gsm-keyring.c	Fri Apr 11 15:52:07 2008
@@ -58,7 +58,6 @@
   long pid;
   char *t, *end;
   const char *old_keyring;
-  const char *display;
   char *argv[2];
 
   /* If there is already a working keyring, don't start a new daemon */

Modified: branches/gnome-2-22/gnome-session/migrate-trash.c
==============================================================================
--- branches/gnome-2-22/gnome-session/migrate-trash.c	(original)
+++ branches/gnome-2-22/gnome-session/migrate-trash.c	Fri Apr 11 15:52:07 2008
@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -289,7 +290,7 @@
       return 1;
     }
 
-  while (file = g_dir_read_name (dir))
+  while ((file = g_dir_read_name (dir)) != NULL)
     {
       had_problem = !move_file (old_trash_dir, file, info_dir, files_dir)
                     || had_problem;