summaryrefslogtreecommitdiffstats
path: root/security/seahorse-plugins/files
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-08-24 18:43:50 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-08-24 18:43:50 +0800
commit71dfde0760b13ea318c656ddead128dbe634597d (patch)
tree604a8dbb563a5add31be347304c3eef5aa78e2a5 /security/seahorse-plugins/files
parentaf8341069438e68bbabd2ab98ad25e0876c4d400 (diff)
downloadmarcuscom-ports-71dfde0760b13ea318c656ddead128dbe634597d.tar.gz
marcuscom-ports-71dfde0760b13ea318c656ddead128dbe634597d.tar.zst
marcuscom-ports-71dfde0760b13ea318c656ddead128dbe634597d.zip
Clean up after libproxy,libnotify,poppler*,webkit-gtk2 and glib+gtk updates.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16129 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'security/seahorse-plugins/files')
-rw-r--r--security/seahorse-plugins/files/patch-agent_seahorse-agent-cache.c10
-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
-rw-r--r--security/seahorse-plugins/files/patch-libseahorse_seahorse-notification.c11
-rw-r--r--security/seahorse-plugins/files/patch-libseahorse_seahorse-pgp-operation.c10
-rw-r--r--security/seahorse-plugins/files/patch-plugins_nautilus_seahorse-tool.c23
6 files changed, 0 insertions, 97 deletions
diff --git a/security/seahorse-plugins/files/patch-agent_seahorse-agent-cache.c b/security/seahorse-plugins/files/patch-agent_seahorse-agent-cache.c
deleted file mode 100644
index 70d1c9261..000000000
--- a/security/seahorse-plugins/files/patch-agent_seahorse-agent-cache.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- agent/seahorse-agent-cache.c.orig 2009-08-01 15:25:55.000000000 -0400
-+++ agent/seahorse-agent-cache.c 2009-08-01 15:23:38.000000000 -0400
-@@ -237,6 +237,7 @@ seahorse_agent_cache_init ()
- g_cache =
- g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroy_cache_item);
-
-+ gpgme_check_version (NULL);
- err = gpgme_engine_check_version (proto);
- g_return_if_fail (GPG_IS_OK (err));
-
diff --git a/security/seahorse-plugins/files/patch-agent_seahorse-agent-io.c b/security/seahorse-plugins/files/patch-agent_seahorse-agent-io.c
deleted file mode 100644
index 4ecd84940..000000000
--- a/security/seahorse-plugins/files/patch-agent_seahorse-agent-io.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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
deleted file mode 100644
index 7ba32051e..000000000
--- a/security/seahorse-plugins/files/patch-agent_seahorse-agent.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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>
diff --git a/security/seahorse-plugins/files/patch-libseahorse_seahorse-notification.c b/security/seahorse-plugins/files/patch-libseahorse_seahorse-notification.c
deleted file mode 100644
index 7ddf0bb3f..000000000
--- a/security/seahorse-plugins/files/patch-libseahorse_seahorse-notification.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libseahorse/seahorse-notification.c.orig 2011-03-07 09:25:10.000000000 +0100
-+++ libseahorse/seahorse-notification.c 2011-03-07 09:25:57.000000000 +0100
-@@ -213,7 +213,7 @@
- heading = format_key_text (snotif->heading);
- message = format_key_text (snotif->message);
-
-- notif = notify_notification_new (heading, message, snotif->icon, attachto);
-+ notif = notify_notification_new (heading, message, snotif->icon);
-
- g_free (heading);
- g_free (message);
diff --git a/security/seahorse-plugins/files/patch-libseahorse_seahorse-pgp-operation.c b/security/seahorse-plugins/files/patch-libseahorse_seahorse-pgp-operation.c
deleted file mode 100644
index 16c64303b..000000000
--- a/security/seahorse-plugins/files/patch-libseahorse_seahorse-pgp-operation.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libseahorse/seahorse-pgp-operation.c.orig 2009-08-01 15:26:28.000000000 -0400
-+++ libseahorse/seahorse-pgp-operation.c 2009-08-01 15:23:41.000000000 -0400
-@@ -323,6 +323,7 @@ seahorse_pgp_operation_init (SeahorsePGP
- gpgme_error_t err;
- gpgme_ctx_t ctx;
-
-+ gpgme_check_version (NULL);
- err = gpgme_engine_check_version (proto);
- g_return_if_fail (GPG_IS_OK (err));
-
diff --git a/security/seahorse-plugins/files/patch-plugins_nautilus_seahorse-tool.c b/security/seahorse-plugins/files/patch-plugins_nautilus_seahorse-tool.c
deleted file mode 100644
index d423b6b59..000000000
--- a/security/seahorse-plugins/files/patch-plugins_nautilus_seahorse-tool.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- plugins/nautilus/seahorse-tool.c.orig 2009-08-01 15:27:07.000000000 -0400
-+++ plugins/nautilus/seahorse-tool.c 2009-08-01 15:23:46.000000000 -0400
-@@ -171,6 +171,9 @@ prompt_recipients (gpgme_key_t *signkey)
-
- if (recips) {
-
-+ gpgme_check_version (NULL);
-+ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
-+ g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
- gerr = gpgme_new (&ctx);
- g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
-
-@@ -327,6 +330,10 @@ prompt_signer ()
-
- id = cryptui_keyset_key_raw_keyid (keyset, signer);
- g_free (signer);
-+
-+ gpgme_check_version (NULL);
-+ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
-+ g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
-
- gerr = gpgme_new (&ctx);
- g_return_val_if_fail (GPG_IS_OK (gerr), NULL);