Push patches (damn, make local/prep should check if all referenced patches

are in cvs)
This commit is contained in:
Tomas Bzatek 2009-03-11 13:21:26 +00:00
parent a6506c00a9
commit b0abe829ef
2 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,14 @@
Index: client/gdaemonfilemonitor.c
===================================================================
--- client/gdaemonfilemonitor.c (revision 2316)
+++ client/gdaemonfilemonitor.c (revision 2317)
@@ -202,6 +202,9 @@
G_VFS_DBUS_MONITOR_INTERFACE,
G_VFS_DBUS_MONITOR_OP_UNSUBSCRIBE);
+ _g_dbus_message_append_args (message, DBUS_TYPE_OBJECT_PATH,
+ &daemon_monitor->object_path, 0);
+
_g_vfs_daemon_call_async (message,
NULL, NULL,
NULL);

View File

@ -0,0 +1,20 @@
Index: daemon/gvfsbackendsftp.c
===================================================================
--- daemon/gvfsbackendsftp.c (revision 2315)
+++ daemon/gvfsbackendsftp.c (revision 2316)
@@ -560,6 +560,15 @@
&bytes_read, NULL, error))
return NULL;
+ /* Make sure we handle ssh exiting early, e.g. if no further
+ authentication methods */
+ if (bytes_read == 0)
+ {
+ g_set_error_literal (error,
+ G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("ssh program unexpectedly exited"));
+ return NULL;
+ }
len = GUINT32_FROM_BE (len);