aboutsummaryrefslogtreecommitdiffstats
path: root/security/seahorse-plugins/files
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2009-01-10 13:22:13 +0800
committermarcus <marcus@FreeBSD.org>2009-01-10 13:22:13 +0800
commit6d8ed8f7c7511223163de715a97ffc04bf6fada9 (patch)
tree40dc015efe383243b0880df377f73ee250da7de7 /security/seahorse-plugins/files
parentc7f342a8d7b82e85b9625c4403600fc20ce41da6 (diff)
downloadfreebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.gz
freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.zst
freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.zip
Presenting GNOME 2.24 for FreeBSD.
See http://library.gnome.org/misc/release-notes/2.24/ for the general release notes. On the FreeBSD front, this release introduces Fuse support in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some long-standing seahorse and gnome-keyring bugs. The documentation updates to the website are forthcoming. This release features commits by adamw, ahze, kwm, mezz, and myself. It would not have been possible without are contributors and testers: Alexander Loginov Craig Butler [1] Dmitry Marakasov [6] Eric L. Chen Joseph S. Atkinson Kris Moore Lapo Luchini [7] Nikos Ntarmos Pawel Worach Romain Tartiere TAOKA Fumiyoshi [3] Yasuda Keisuke Zyl aZ [4] bf [2] [5] Florent Thoumie Peter Wemm pluknet PR: 125857 [1] 126993 [2] 130031 [3] 127399 [4] 127661 [5] 124302 [6] 129570 [7] 129936 123790
Diffstat (limited to 'security/seahorse-plugins/files')
-rw-r--r--security/seahorse-plugins/files/patch-agent_seahorse-agent-io.c32
-rw-r--r--security/seahorse-plugins/files/patch-agent_seahorse-agent.h11
2 files changed, 43 insertions, 0 deletions
diff --git a/security/seahorse-plugins/files/patch-agent_seahorse-agent-io.c b/security/seahorse-plugins/files/patch-agent_seahorse-agent-io.c
new file mode 100644
index 000000000000..4ecd849405c7
--- /dev/null
+++ b/security/seahorse-plugins/files/patch-agent_seahorse-agent-io.c
@@ -0,0 +1,32 @@
+--- agent/seahorse-agent-io.c.orig Sun Aug 28 15:52:02 2005
++++ agent/seahorse-agent-io.c Fri Oct 7 21:51:25 2005
+@@ -412,12 +412,18 @@ io_handler (GIOChannel *source, GIOCondi
+ gsize length;
+ GError *err = NULL;
+ gboolean ret = TRUE;
++ GIOStatus status;
+
+ if (condition & G_IO_IN) {
+ /* Read 1 line from the io channel, including newline character */
+- g_io_channel_read_line (source, &string, &length, NULL, &err);
++ status = g_io_channel_read_line (source, &string, &length, NULL, &err);
+
+- if (err != NULL) {
++ if (status == G_IO_STATUS_EOF) {
++ free_conn (cn);
++ ret = FALSE;
++ }
++
++ else if (err != NULL) {
+ g_critical ("couldn't read from socket: %s", err->message);
+ g_clear_error (&err);
+ free_conn (cn);
+@@ -434,7 +440,7 @@ io_handler (GIOChannel *source, GIOCondi
+ g_free (string);
+ }
+
+- if (cn && condition & G_IO_HUP) {
++ else if (cn && condition & G_IO_HUP) {
+ free_conn (cn);
+ ret = FALSE; /* removes watch */
+ }
diff --git a/security/seahorse-plugins/files/patch-agent_seahorse-agent.h b/security/seahorse-plugins/files/patch-agent_seahorse-agent.h
new file mode 100644
index 000000000000..7ba32051e701
--- /dev/null
+++ b/security/seahorse-plugins/files/patch-agent_seahorse-agent.h
@@ -0,0 +1,11 @@
+--- agent/seahorse-agent.h.orig 2008-08-06 01:22:16.000000000 -0400
++++ agent/seahorse-agent.h 2008-08-06 01:22:27.000000000 -0400
+@@ -22,6 +22,8 @@
+ #ifndef __SEAHORSE_AGENT_H__
+ #define __SEAHORSE_AGENT_H__
+
++#include <sys/types.h>
++
+ #include <glib.h>
+ #include <gconf/gconf-client.h>
+ #include <gconf/gconf.h>