[arch-commits] Commit in pidgin-encryption/repos (12 files)
Allan McRae
allan at archlinux.org
Fri Feb 17 13:03:41 UTC 2012
Date: Friday, February 17, 2012 @ 08:03:41
Author: allan
Revision: 150421
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
pidgin-encryption/repos/extra-i686/PKGBUILD
(from rev 150420, pidgin-encryption/trunk/PKGBUILD)
pidgin-encryption/repos/extra-i686/fix_header_escaping.patch
(from rev 150420, pidgin-encryption/trunk/fix_header_escaping.patch)
pidgin-encryption/repos/extra-i686/log_crash.patch
(from rev 150420, pidgin-encryption/trunk/log_crash.patch)
pidgin-encryption/repos/extra-x86_64/PKGBUILD
(from rev 150420, pidgin-encryption/trunk/PKGBUILD)
pidgin-encryption/repos/extra-x86_64/fix_header_escaping.patch
(from rev 150420, pidgin-encryption/trunk/fix_header_escaping.patch)
pidgin-encryption/repos/extra-x86_64/log_crash.patch
(from rev 150420, pidgin-encryption/trunk/log_crash.patch)
Deleted:
pidgin-encryption/repos/extra-i686/PKGBUILD
pidgin-encryption/repos/extra-i686/fix_header_escaping.patch
pidgin-encryption/repos/extra-i686/log_crash.patch
pidgin-encryption/repos/extra-x86_64/PKGBUILD
pidgin-encryption/repos/extra-x86_64/fix_header_escaping.patch
pidgin-encryption/repos/extra-x86_64/log_crash.patch
----------------------------------------+
extra-i686/PKGBUILD | 51 ++++++------
extra-i686/fix_header_escaping.patch | 128 +++++++++++++++----------------
extra-i686/log_crash.patch | 22 ++---
extra-x86_64/PKGBUILD | 51 ++++++------
extra-x86_64/fix_header_escaping.patch | 128 +++++++++++++++----------------
extra-x86_64/log_crash.patch | 22 ++---
6 files changed, 204 insertions(+), 198 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-17 13:02:31 UTC (rev 150420)
+++ extra-i686/PKGBUILD 2012-02-17 13:03:41 UTC (rev 150421)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Dan McGee <dan at archlinux.org>
-# Contributor: Dale Blount <dale at archlinux.org>
-
-pkgname=pidgin-encryption
-pkgver=3.1
-pkgrel=1
-pkgdesc="A Pidgin plugin providing transparent RSA encryption using NSS"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://pidgin-encrypt.sourceforge.net/"
-depends=('pidgin' 'nss')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz)
-md5sums=('d839eec602c21f913b32b742dc512f4b')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr --disable-static
- make || return 1
- make DESTDIR="$pkgdir" install
-}
Copied: pidgin-encryption/repos/extra-i686/PKGBUILD (from rev 150420, pidgin-encryption/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-17 13:03:41 UTC (rev 150421)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Dan McGee <dan at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
+
+pkgname=pidgin-encryption
+pkgver=3.1
+pkgrel=2
+pkgdesc="A Pidgin plugin providing transparent RSA encryption using NSS"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://pidgin-encrypt.sourceforge.net/"
+depends=('pidgin' 'nss')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz)
+md5sums=('d839eec602c21f913b32b742dc512f4b')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-i686/fix_header_escaping.patch
===================================================================
--- extra-i686/fix_header_escaping.patch 2012-02-17 13:02:31 UTC (rev 150420)
+++ extra-i686/fix_header_escaping.patch 2012-02-17 13:03:41 UTC (rev 150421)
@@ -1,64 +0,0 @@
---- pidgin-encryption-3.0.orig/encrypt.c 2007-05-06 23:37:55.000000000 -0400
-+++ pidgin-encryption-3.0.new/encrypt.c 2009-11-22 22:28:34.052010351 -0500
-@@ -1114,21 +1114,21 @@ static void PE_headers_init() {
- notify_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-
- g_hash_table_insert(header_table, g_strdup("prpl-toc"),
-- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-+ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
- g_hash_table_insert(footer_table, g_strdup("prpl-toc"),
- g_strdup("\"></A>"));
- g_hash_table_insert(notify_table, g_strdup("prpl-toc"),
- g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
-
- g_hash_table_insert(header_table, g_strdup("prpl-oscar"),
-- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-+ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
- g_hash_table_insert(footer_table, g_strdup("prpl-oscar"),
- g_strdup("\"></A>"));
- g_hash_table_insert(notify_table, g_strdup("prpl-oscar"),
- g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
-
- g_hash_table_insert(header_table, g_strdup("prpl-aim"),
-- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-+ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
- g_hash_table_insert(footer_table, g_strdup("prpl-aim"),
- g_strdup("\"></A>"));
- g_hash_table_insert(notify_table, g_strdup("prpl-aim"),
-@@ -1136,7 +1136,7 @@ static void PE_headers_init() {
-
- /* If jabber stops stripping HTML, we can go back to these headers */
- /* g_hash_table_insert(header_table, g_strdup("prpl-jabber"), */
--/* g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF='")); */
-+/* g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF='")); */
- /* g_hash_table_insert(footer_table, g_strdup("prpl-jabber"), */
- /* g_strdup("'></A>")); */
- /* g_hash_table_insert(notify_table, g_strdup("prpl-jabber"), */
-@@ -1144,22 +1144,22 @@ static void PE_headers_init() {
-
-
- g_hash_table_insert(header_table, g_strdup("prpl-jabber"),
-- g_strdup("*** Encrypted with the Gaim-Encryption plugin "));
-+ g_strdup("--- Encrypted with the Gaim-Encryption plugin "));
- g_hash_table_insert(footer_table, g_strdup("prpl-jabber"),
- g_strdup(" "));
- g_hash_table_insert(notify_table, g_strdup("prpl-jabber"),
- g_strdup("<A HREF='Gaim-Encryption Capable'> </A>"));
-
-- header_default = g_strdup("*** Encrypted :");
-+ header_default = g_strdup("--- Encrypted :");
- }
-
--/* #define CRYPT_HEADER "*** Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
-+/* #define CRYPT_HEADER "--- Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
- /* #define CRYPT_FOOTER "\"></A>" */
- /* #define CRYPT_NOTIFY_HEADER "<A HREF=\"Gaim-Encryption Capable\"></A>" */
-
- // Jabber seems to turn our double quotes into single quotes at times, so define
- // the same headers, only with single quotes. Lengths MUST be the same as above
--/* #define CRYPT_HEADER_MANGLED "*** Encrypted with the Gaim-Encryption plugin <A HREF='" */
-+/* #define CRYPT_HEADER_MANGLED "--- Encrypted with the Gaim-Encryption plugin <A HREF='" */
- /* #define CRYPT_NOTIFY_HEADER_MANGLED "<A HREF='Gaim-Encryption Capable'></A>" */
-
-
-
Copied: pidgin-encryption/repos/extra-i686/fix_header_escaping.patch (from rev 150420, pidgin-encryption/trunk/fix_header_escaping.patch)
===================================================================
--- extra-i686/fix_header_escaping.patch (rev 0)
+++ extra-i686/fix_header_escaping.patch 2012-02-17 13:03:41 UTC (rev 150421)
@@ -0,0 +1,64 @@
+--- pidgin-encryption-3.0.orig/encrypt.c 2007-05-06 23:37:55.000000000 -0400
++++ pidgin-encryption-3.0.new/encrypt.c 2009-11-22 22:28:34.052010351 -0500
+@@ -1114,21 +1114,21 @@ static void PE_headers_init() {
+ notify_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+
+ g_hash_table_insert(header_table, g_strdup("prpl-toc"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
+ g_hash_table_insert(footer_table, g_strdup("prpl-toc"),
+ g_strdup("\"></A>"));
+ g_hash_table_insert(notify_table, g_strdup("prpl-toc"),
+ g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
+
+ g_hash_table_insert(header_table, g_strdup("prpl-oscar"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
+ g_hash_table_insert(footer_table, g_strdup("prpl-oscar"),
+ g_strdup("\"></A>"));
+ g_hash_table_insert(notify_table, g_strdup("prpl-oscar"),
+ g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
+
+ g_hash_table_insert(header_table, g_strdup("prpl-aim"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
+ g_hash_table_insert(footer_table, g_strdup("prpl-aim"),
+ g_strdup("\"></A>"));
+ g_hash_table_insert(notify_table, g_strdup("prpl-aim"),
+@@ -1136,7 +1136,7 @@ static void PE_headers_init() {
+
+ /* If jabber stops stripping HTML, we can go back to these headers */
+ /* g_hash_table_insert(header_table, g_strdup("prpl-jabber"), */
+-/* g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF='")); */
++/* g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF='")); */
+ /* g_hash_table_insert(footer_table, g_strdup("prpl-jabber"), */
+ /* g_strdup("'></A>")); */
+ /* g_hash_table_insert(notify_table, g_strdup("prpl-jabber"), */
+@@ -1144,22 +1144,22 @@ static void PE_headers_init() {
+
+
+ g_hash_table_insert(header_table, g_strdup("prpl-jabber"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin "));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin "));
+ g_hash_table_insert(footer_table, g_strdup("prpl-jabber"),
+ g_strdup(" "));
+ g_hash_table_insert(notify_table, g_strdup("prpl-jabber"),
+ g_strdup("<A HREF='Gaim-Encryption Capable'> </A>"));
+
+- header_default = g_strdup("*** Encrypted :");
++ header_default = g_strdup("--- Encrypted :");
+ }
+
+-/* #define CRYPT_HEADER "*** Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
++/* #define CRYPT_HEADER "--- Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
+ /* #define CRYPT_FOOTER "\"></A>" */
+ /* #define CRYPT_NOTIFY_HEADER "<A HREF=\"Gaim-Encryption Capable\"></A>" */
+
+ // Jabber seems to turn our double quotes into single quotes at times, so define
+ // the same headers, only with single quotes. Lengths MUST be the same as above
+-/* #define CRYPT_HEADER_MANGLED "*** Encrypted with the Gaim-Encryption plugin <A HREF='" */
++/* #define CRYPT_HEADER_MANGLED "--- Encrypted with the Gaim-Encryption plugin <A HREF='" */
+ /* #define CRYPT_NOTIFY_HEADER_MANGLED "<A HREF='Gaim-Encryption Capable'></A>" */
+
+
+
Deleted: extra-i686/log_crash.patch
===================================================================
--- extra-i686/log_crash.patch 2012-02-17 13:02:31 UTC (rev 150420)
+++ extra-i686/log_crash.patch 2012-02-17 13:03:41 UTC (rev 150421)
@@ -1,11 +0,0 @@
---- pidgin-encryption-3.0.orig/state_ui.c 2007-05-07 02:15:27.000000000 +0200
-+++ pidgin-encryption-3.0.new/state_ui.c 2009-04-26 17:08:02.000000000 +0200
-@@ -268,6 +268,8 @@
- static GtkIMHtmlSmiley * create_smiley_if_absent(GtkIMHtml *imhtml) {
- GtkIMHtmlSmiley * smiley;
- const char* category = gtk_imhtml_get_protocol_name(imhtml);
-+
-+ if (!category) return NULL;
-
- /* make sure that the category we're about to use to add (based on the protocol name) */
- /* already exists. If it doesn't, just use the default category so it isn't created. */
Copied: pidgin-encryption/repos/extra-i686/log_crash.patch (from rev 150420, pidgin-encryption/trunk/log_crash.patch)
===================================================================
--- extra-i686/log_crash.patch (rev 0)
+++ extra-i686/log_crash.patch 2012-02-17 13:03:41 UTC (rev 150421)
@@ -0,0 +1,11 @@
+--- pidgin-encryption-3.0.orig/state_ui.c 2007-05-07 02:15:27.000000000 +0200
++++ pidgin-encryption-3.0.new/state_ui.c 2009-04-26 17:08:02.000000000 +0200
+@@ -268,6 +268,8 @@
+ static GtkIMHtmlSmiley * create_smiley_if_absent(GtkIMHtml *imhtml) {
+ GtkIMHtmlSmiley * smiley;
+ const char* category = gtk_imhtml_get_protocol_name(imhtml);
++
++ if (!category) return NULL;
+
+ /* make sure that the category we're about to use to add (based on the protocol name) */
+ /* already exists. If it doesn't, just use the default category so it isn't created. */
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-17 13:02:31 UTC (rev 150420)
+++ extra-x86_64/PKGBUILD 2012-02-17 13:03:41 UTC (rev 150421)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Dan McGee <dan at archlinux.org>
-# Contributor: Dale Blount <dale at archlinux.org>
-
-pkgname=pidgin-encryption
-pkgver=3.1
-pkgrel=1
-pkgdesc="A Pidgin plugin providing transparent RSA encryption using NSS"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://pidgin-encrypt.sourceforge.net/"
-depends=('pidgin' 'nss')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz)
-md5sums=('d839eec602c21f913b32b742dc512f4b')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr --disable-static
- make || return 1
- make DESTDIR="$pkgdir" install
-}
Copied: pidgin-encryption/repos/extra-x86_64/PKGBUILD (from rev 150420, pidgin-encryption/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-17 13:03:41 UTC (rev 150421)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Dan McGee <dan at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
+
+pkgname=pidgin-encryption
+pkgver=3.1
+pkgrel=2
+pkgdesc="A Pidgin plugin providing transparent RSA encryption using NSS"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://pidgin-encrypt.sourceforge.net/"
+depends=('pidgin' 'nss')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz)
+md5sums=('d839eec602c21f913b32b742dc512f4b')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-x86_64/fix_header_escaping.patch
===================================================================
--- extra-x86_64/fix_header_escaping.patch 2012-02-17 13:02:31 UTC (rev 150420)
+++ extra-x86_64/fix_header_escaping.patch 2012-02-17 13:03:41 UTC (rev 150421)
@@ -1,64 +0,0 @@
---- pidgin-encryption-3.0.orig/encrypt.c 2007-05-06 23:37:55.000000000 -0400
-+++ pidgin-encryption-3.0.new/encrypt.c 2009-11-22 22:28:34.052010351 -0500
-@@ -1114,21 +1114,21 @@ static void PE_headers_init() {
- notify_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-
- g_hash_table_insert(header_table, g_strdup("prpl-toc"),
-- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-+ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
- g_hash_table_insert(footer_table, g_strdup("prpl-toc"),
- g_strdup("\"></A>"));
- g_hash_table_insert(notify_table, g_strdup("prpl-toc"),
- g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
-
- g_hash_table_insert(header_table, g_strdup("prpl-oscar"),
-- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-+ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
- g_hash_table_insert(footer_table, g_strdup("prpl-oscar"),
- g_strdup("\"></A>"));
- g_hash_table_insert(notify_table, g_strdup("prpl-oscar"),
- g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
-
- g_hash_table_insert(header_table, g_strdup("prpl-aim"),
-- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-+ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
- g_hash_table_insert(footer_table, g_strdup("prpl-aim"),
- g_strdup("\"></A>"));
- g_hash_table_insert(notify_table, g_strdup("prpl-aim"),
-@@ -1136,7 +1136,7 @@ static void PE_headers_init() {
-
- /* If jabber stops stripping HTML, we can go back to these headers */
- /* g_hash_table_insert(header_table, g_strdup("prpl-jabber"), */
--/* g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF='")); */
-+/* g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF='")); */
- /* g_hash_table_insert(footer_table, g_strdup("prpl-jabber"), */
- /* g_strdup("'></A>")); */
- /* g_hash_table_insert(notify_table, g_strdup("prpl-jabber"), */
-@@ -1144,22 +1144,22 @@ static void PE_headers_init() {
-
-
- g_hash_table_insert(header_table, g_strdup("prpl-jabber"),
-- g_strdup("*** Encrypted with the Gaim-Encryption plugin "));
-+ g_strdup("--- Encrypted with the Gaim-Encryption plugin "));
- g_hash_table_insert(footer_table, g_strdup("prpl-jabber"),
- g_strdup(" "));
- g_hash_table_insert(notify_table, g_strdup("prpl-jabber"),
- g_strdup("<A HREF='Gaim-Encryption Capable'> </A>"));
-
-- header_default = g_strdup("*** Encrypted :");
-+ header_default = g_strdup("--- Encrypted :");
- }
-
--/* #define CRYPT_HEADER "*** Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
-+/* #define CRYPT_HEADER "--- Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
- /* #define CRYPT_FOOTER "\"></A>" */
- /* #define CRYPT_NOTIFY_HEADER "<A HREF=\"Gaim-Encryption Capable\"></A>" */
-
- // Jabber seems to turn our double quotes into single quotes at times, so define
- // the same headers, only with single quotes. Lengths MUST be the same as above
--/* #define CRYPT_HEADER_MANGLED "*** Encrypted with the Gaim-Encryption plugin <A HREF='" */
-+/* #define CRYPT_HEADER_MANGLED "--- Encrypted with the Gaim-Encryption plugin <A HREF='" */
- /* #define CRYPT_NOTIFY_HEADER_MANGLED "<A HREF='Gaim-Encryption Capable'></A>" */
-
-
-
Copied: pidgin-encryption/repos/extra-x86_64/fix_header_escaping.patch (from rev 150420, pidgin-encryption/trunk/fix_header_escaping.patch)
===================================================================
--- extra-x86_64/fix_header_escaping.patch (rev 0)
+++ extra-x86_64/fix_header_escaping.patch 2012-02-17 13:03:41 UTC (rev 150421)
@@ -0,0 +1,64 @@
+--- pidgin-encryption-3.0.orig/encrypt.c 2007-05-06 23:37:55.000000000 -0400
++++ pidgin-encryption-3.0.new/encrypt.c 2009-11-22 22:28:34.052010351 -0500
+@@ -1114,21 +1114,21 @@ static void PE_headers_init() {
+ notify_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+
+ g_hash_table_insert(header_table, g_strdup("prpl-toc"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
+ g_hash_table_insert(footer_table, g_strdup("prpl-toc"),
+ g_strdup("\"></A>"));
+ g_hash_table_insert(notify_table, g_strdup("prpl-toc"),
+ g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
+
+ g_hash_table_insert(header_table, g_strdup("prpl-oscar"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
+ g_hash_table_insert(footer_table, g_strdup("prpl-oscar"),
+ g_strdup("\"></A>"));
+ g_hash_table_insert(notify_table, g_strdup("prpl-oscar"),
+ g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
+
+ g_hash_table_insert(header_table, g_strdup("prpl-aim"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
+ g_hash_table_insert(footer_table, g_strdup("prpl-aim"),
+ g_strdup("\"></A>"));
+ g_hash_table_insert(notify_table, g_strdup("prpl-aim"),
+@@ -1136,7 +1136,7 @@ static void PE_headers_init() {
+
+ /* If jabber stops stripping HTML, we can go back to these headers */
+ /* g_hash_table_insert(header_table, g_strdup("prpl-jabber"), */
+-/* g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF='")); */
++/* g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF='")); */
+ /* g_hash_table_insert(footer_table, g_strdup("prpl-jabber"), */
+ /* g_strdup("'></A>")); */
+ /* g_hash_table_insert(notify_table, g_strdup("prpl-jabber"), */
+@@ -1144,22 +1144,22 @@ static void PE_headers_init() {
+
+
+ g_hash_table_insert(header_table, g_strdup("prpl-jabber"),
+- g_strdup("*** Encrypted with the Gaim-Encryption plugin "));
++ g_strdup("--- Encrypted with the Gaim-Encryption plugin "));
+ g_hash_table_insert(footer_table, g_strdup("prpl-jabber"),
+ g_strdup(" "));
+ g_hash_table_insert(notify_table, g_strdup("prpl-jabber"),
+ g_strdup("<A HREF='Gaim-Encryption Capable'> </A>"));
+
+- header_default = g_strdup("*** Encrypted :");
++ header_default = g_strdup("--- Encrypted :");
+ }
+
+-/* #define CRYPT_HEADER "*** Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
++/* #define CRYPT_HEADER "--- Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
+ /* #define CRYPT_FOOTER "\"></A>" */
+ /* #define CRYPT_NOTIFY_HEADER "<A HREF=\"Gaim-Encryption Capable\"></A>" */
+
+ // Jabber seems to turn our double quotes into single quotes at times, so define
+ // the same headers, only with single quotes. Lengths MUST be the same as above
+-/* #define CRYPT_HEADER_MANGLED "*** Encrypted with the Gaim-Encryption plugin <A HREF='" */
++/* #define CRYPT_HEADER_MANGLED "--- Encrypted with the Gaim-Encryption plugin <A HREF='" */
+ /* #define CRYPT_NOTIFY_HEADER_MANGLED "<A HREF='Gaim-Encryption Capable'></A>" */
+
+
+
Deleted: extra-x86_64/log_crash.patch
===================================================================
--- extra-x86_64/log_crash.patch 2012-02-17 13:02:31 UTC (rev 150420)
+++ extra-x86_64/log_crash.patch 2012-02-17 13:03:41 UTC (rev 150421)
@@ -1,11 +0,0 @@
---- pidgin-encryption-3.0.orig/state_ui.c 2007-05-07 02:15:27.000000000 +0200
-+++ pidgin-encryption-3.0.new/state_ui.c 2009-04-26 17:08:02.000000000 +0200
-@@ -268,6 +268,8 @@
- static GtkIMHtmlSmiley * create_smiley_if_absent(GtkIMHtml *imhtml) {
- GtkIMHtmlSmiley * smiley;
- const char* category = gtk_imhtml_get_protocol_name(imhtml);
-+
-+ if (!category) return NULL;
-
- /* make sure that the category we're about to use to add (based on the protocol name) */
- /* already exists. If it doesn't, just use the default category so it isn't created. */
Copied: pidgin-encryption/repos/extra-x86_64/log_crash.patch (from rev 150420, pidgin-encryption/trunk/log_crash.patch)
===================================================================
--- extra-x86_64/log_crash.patch (rev 0)
+++ extra-x86_64/log_crash.patch 2012-02-17 13:03:41 UTC (rev 150421)
@@ -0,0 +1,11 @@
+--- pidgin-encryption-3.0.orig/state_ui.c 2007-05-07 02:15:27.000000000 +0200
++++ pidgin-encryption-3.0.new/state_ui.c 2009-04-26 17:08:02.000000000 +0200
+@@ -268,6 +268,8 @@
+ static GtkIMHtmlSmiley * create_smiley_if_absent(GtkIMHtml *imhtml) {
+ GtkIMHtmlSmiley * smiley;
+ const char* category = gtk_imhtml_get_protocol_name(imhtml);
++
++ if (!category) return NULL;
+
+ /* make sure that the category we're about to use to add (based on the protocol name) */
+ /* already exists. If it doesn't, just use the default category so it isn't created. */
More information about the arch-commits
mailing list