+2003-04-28 [paul] 0.8.11claws119
+
+ * sync with 0.8.11cvs36
+ see ChangeLog 2003-04-28
+
2003-04-27 [paul] 0.8.11claws118
* more sync with 0.8.11cvs35
{
gchar *prefix;
gchar *str;
+ gchar *cur;
guint size;
guint bytes_written;
return -1;
}
- str = g_strdup_printf("%s %s\n", prefix, msg);
+ cur = str = g_strdup_printf("%s %s\n", prefix, msg);
size = strlen(str);
while (size > 0) {
- if (g_io_channel_write(session->write_ch, str, size,
+ if (g_io_channel_write(session->write_ch, cur, size,
&bytes_written)
!= G_IO_ERROR_NONE || bytes_written == 0) {
g_warning("%s: sending message failed.\n",
session->child_pid == 0 ? "child" : "parent");
+ g_free(str);
return -1;
}
size -= bytes_written;
+ cur += bytes_written;
}
g_free(str);
gint session_send_data(Session *session, const guchar *data, guint size)
{
gchar *msg;
+ const guchar *cur = data;
guint bytes_written;
GIOError err;
g_free(msg);
while (size > 0) {
- if ((err = g_io_channel_write(session->write_ch, (guchar *)data,
+ if ((err = g_io_channel_write(session->write_ch, (guchar *)cur,
size, &bytes_written))
!= G_IO_ERROR_NONE || bytes_written == 0) {
g_warning("%s: sending data failed: %d\n",
return -1;
}
size -= bytes_written;
+ cur += bytes_written;
debug_print("session: %s: sent %d bytes of data\n",
session->child_pid == 0 ? "child" : "parent",
bytes_written);
if (ret == -1) {
manage_window_focus_in(dialog->dialog->window, NULL, NULL);
send_put_error(session);
- manage_window_focus_in(dialog->dialog->window, NULL, NULL);
+ manage_window_focus_out(dialog->dialog->window, NULL, NULL);
}
session_destroy(session);