diff options
Diffstat (limited to 'net-im/gaim/files')
| -rw-r--r-- | net-im/gaim/files/extra-patch-src_gtkconv.c | 13 | ||||
| -rw-r--r-- | net-im/gaim/files/patch-configure | 15 | ||||
| -rw-r--r-- | net-im/gaim/files/patch-plugins_perl_Makefile.in | 10 | ||||
| -rw-r--r-- | net-im/gaim/files/patch-src_gtkimhtml.c | 22 | ||||
| -rw-r--r-- | net-im/gaim/files/patch-src_privacy.c | 37 | ||||
| -rw-r--r-- | net-im/gaim/files/patch-src_protocols_oscar_ft.c | 10 | ||||
| -rw-r--r-- | net-im/gaim/files/patch-src_protocols_oscar_oscar.c | 11 |
7 files changed, 0 insertions, 118 deletions
diff --git a/net-im/gaim/files/extra-patch-src_gtkconv.c b/net-im/gaim/files/extra-patch-src_gtkconv.c deleted file mode 100644 index 68f770a02..000000000 --- a/net-im/gaim/files/extra-patch-src_gtkconv.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src.orig/gtkconv.c Mon May 9 08:36:54 2005 -+++ src/gtkconv.c Mon May 9 08:37:32 2005 -@@ -6369,8 +6369,8 @@ - /* Conversations */ - gaim_prefs_add_none("/gaim/gtk/conversations"); - gaim_prefs_add_bool("/gaim/gtk/conversations/close_on_tabs", TRUE); -- gaim_prefs_add_bool("/gaim/gtk/conversations/ctrl_enter_sends", FALSE); -- gaim_prefs_add_bool("/gaim/gtk/conversations/enter_sends", TRUE); -+ gaim_prefs_add_bool("/gaim/gtk/conversations/ctrl_enter_sends", TRUE); -+ gaim_prefs_add_bool("/gaim/gtk/conversations/enter_sends", FALSE); - gaim_prefs_add_bool("/gaim/gtk/conversations/escape_closes", FALSE); - gaim_prefs_add_bool("/gaim/gtk/conversations/send_formatting", FALSE); - gaim_prefs_add_bool("/gaim/gtk/conversations/send_bold", FALSE); diff --git a/net-im/gaim/files/patch-configure b/net-im/gaim/files/patch-configure deleted file mode 100644 index 8ce3e483b..000000000 --- a/net-im/gaim/files/patch-configure +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.orig Thu May 12 01:20:01 2005 -+++ configure Thu May 12 01:20:31 2005 -@@ -33445,10 +33445,10 @@ - - enable_nss="no" - else -- nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" -+ nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" - fi - else -- nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" -+ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" - fi - - echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5 diff --git a/net-im/gaim/files/patch-plugins_perl_Makefile.in b/net-im/gaim/files/patch-plugins_perl_Makefile.in deleted file mode 100644 index bb6daa393..000000000 --- a/net-im/gaim/files/patch-plugins_perl_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/perl/Makefile.in.orig Sun Feb 20 15:39:08 2005 -+++ plugins/perl/Makefile.in Sun Feb 20 15:40:16 2005 -@@ -680,6 +680,7 @@ - done; \ - fi - @cd common && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) -+ @cd common && $(perlpath) -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile - - common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/net-im/gaim/files/patch-src_gtkimhtml.c b/net-im/gaim/files/patch-src_gtkimhtml.c deleted file mode 100644 index 9430baae1..000000000 --- a/net-im/gaim/files/patch-src_gtkimhtml.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/gtkimhtml.c.orig Sun May 30 18:17:14 2004 -+++ src/gtkimhtml.c Sun May 30 18:19:47 2004 -@@ -782,7 +782,7 @@ - if (selection_data->length >= 2 && - (*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe)) { - /* This is UCS-2 */ -- char *tmp; -+ /*char *tmp;*/ - char *utf8 = g_convert(text, selection_data->length, "UTF-8", "UCS-2", NULL, NULL, NULL); - g_free(text); - text = utf8; -@@ -790,8 +790,8 @@ - gaim_debug_warning("gtkimhtml", "g_convert from UCS-2 failed in paste_received_cb\n"); - return; - } -- tmp = g_utf8_next_char(text); -- memmove(text, tmp, strlen(tmp) + 1); -+ /*tmp = g_utf8_next_char(text);*/ -+ /*memmove(text, tmp, strlen(tmp) + 1);*/ - } - - if (!(*text) || !g_utf8_validate(text, -1, NULL)) { diff --git a/net-im/gaim/files/patch-src_privacy.c b/net-im/gaim/files/patch-src_privacy.c deleted file mode 100644 index facd89478..000000000 --- a/net-im/gaim/files/patch-src_privacy.c +++ /dev/null @@ -1,37 +0,0 @@ -RCS file: /cvsroot/gaim/gaim/src/privacy.c,v -retrieving revision 1.16 -retrieving revision 1.18 -diff -u -r1.16 -r1.18 ---- src/privacy.c 2005/07/17 23:36:33 1.16 -+++ src/privacy.c 2006/02/07 02:49:56 1.18 -@@ -85,8 +85,8 @@ - if (l == NULL) - return FALSE; - -- account->permit = g_slist_remove(account->permit, l->data); - g_free(l->data); -+ account->permit = g_slist_delete_link(account->permit, l); - - if (!local_only && gaim_account_is_connected(account)) - serv_rem_permit(gaim_account_get_connection(account), who); -@@ -156,15 +156,16 @@ - if (l == NULL) - return FALSE; - -- account->deny = g_slist_remove(account->deny, l->data); -- g_free(l->data); -+ name = l->data; -+ account->deny = g_slist_delete_link(account->deny, l); - - if (!local_only && gaim_account_is_connected(account)) -- serv_rem_deny(gaim_account_get_connection(account), who); -+ serv_rem_deny(gaim_account_get_connection(account), name); - - if (privacy_ops != NULL && privacy_ops->deny_removed != NULL) -- privacy_ops->deny_removed(account, who); -+ privacy_ops->deny_removed(account, name); - -+ g_free(name); - gaim_blist_schedule_save(); - - return TRUE; diff --git a/net-im/gaim/files/patch-src_protocols_oscar_ft.c b/net-im/gaim/files/patch-src_protocols_oscar_ft.c deleted file mode 100644 index 926db5f44..000000000 --- a/net-im/gaim/files/patch-src_protocols_oscar_ft.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/protocols/oscar/ft.c.orig Sat Jan 10 14:05:46 2004 -+++ src/protocols/oscar/ft.c Sat Jan 10 14:07:58 2004 -@@ -49,6 +49,7 @@ - #ifndef _WIN32 - #include <stdio.h> - #include <netdb.h> -+#include <limits.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <sys/utsname.h> /* for aim_odc_initiate */ diff --git a/net-im/gaim/files/patch-src_protocols_oscar_oscar.c b/net-im/gaim/files/patch-src_protocols_oscar_oscar.c deleted file mode 100644 index 43a291b29..000000000 --- a/net-im/gaim/files/patch-src_protocols_oscar_oscar.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/protocols/oscar/oscar.c.orig Wed Aug 25 21:29:00 2004 -+++ src/protocols/oscar/oscar.c Thu Aug 26 21:55:32 2004 -@@ -3247,7 +3247,7 @@ - * Note: There *may* be some clients which send messages as HTML formatted - - * they need to be special-cased somehow. - */ -- if (isdigit(gaim_account_get_username(account)[0]) && isdigit(userinfo->sn[0])) { -+ if (isdigit(gaim_account_get_username(account)[0]) && isdigit(userinfo->sn[0]) && g_strncasecmp(tmp, "<HTML>", 6)) { - /* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */ - gchar *tmp2 = gaim_escape_html(tmp); - g_free(tmp); |