rpms/gaim/FC-6 gaim-2.0.0beta5-cyrus-md5-crash.patch, NONE, 1.1 gaim-2.0.0beta5-debian-08_jabber-info-crash.patch, NONE, 1.1 gaim-2.0.0beta5-debian-10_text-arrow-keys.patch, NONE, 1.1 gaim-2.0.0beta5-debian-11_reread-resolvconf.patch, NONE, 1.1 gaim-2.0.0beta5-gtk-filename-blanked.patch, NONE, 1.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Nov 30 03:25:05 UTC 2006
Author: wtogami
Update of /cvs/dist/rpms/gaim/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv12814
Added Files:
gaim-2.0.0beta5-cyrus-md5-crash.patch
gaim-2.0.0beta5-debian-08_jabber-info-crash.patch
gaim-2.0.0beta5-debian-10_text-arrow-keys.patch
gaim-2.0.0beta5-debian-11_reread-resolvconf.patch
gaim-2.0.0beta5-gtk-filename-blanked.patch
Log Message:
add patches
gaim-2.0.0beta5-cyrus-md5-crash.patch:
auth.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE gaim-2.0.0beta5-cyrus-md5-crash.patch ---
--- trunk/libgaim/protocols/jabber/auth.c 2006/11/28 06:37:12 17833
+++ trunk/libgaim/protocols/jabber/auth.c 2006/11/28 06:59:48 17834
@@ -753,7 +753,9 @@
* should try one more round against it
*/
if (js->sasl_state != SASL_OK) {
- js->sasl_state = sasl_client_step(js->sasl, NULL, 0, NULL, NULL, NULL);
+ const char *c_out;
+ unsigned int clen;
+ js->sasl_state = sasl_client_step(js->sasl, NULL, 0, NULL, &c_out, &clen);
if (js->sasl_state != SASL_OK) {
/* This should never happen! */
gaim_connection_error(js->gc, _("Invalid response from server."));
gaim-2.0.0beta5-debian-08_jabber-info-crash.patch:
buddy.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
--- NEW FILE gaim-2.0.0beta5-debian-08_jabber-info-crash.patch ---
--- trunk/libgaim/protocols/jabber/buddy.c 2006/11/22 18:47:42 17812
+++ trunk/libgaim/protocols/jabber/buddy.c 2006/11/22 20:10:01 17813
@@ -602,7 +602,7 @@
GString *info_text;
char *resource_name;
JabberBuddyResource *jbr;
- JabberBuddyInfoResource *jbir;
+ JabberBuddyInfoResource *jbir = NULL;
GList *resources;
/* not yet */
@@ -650,8 +650,9 @@
jbr = resources->data;
if(jbr->status)
purdy = gaim_strdup_withhtml(jbr->status);
- g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
- _("Resource"), jbr->name);
+ if(jbr->name)
+ g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
+ _("Resource"), jbr->name);
g_string_append_printf(info_text, "<b>%s:</b> %d<br/>",
_("Priority"), jbr->priority);
g_string_append_printf(info_text, "<b>%s:</b> %s%s%s<br/>",
@@ -661,7 +662,9 @@
if(purdy)
g_free(purdy);
- jbir = g_hash_table_lookup(jbi->resources, jbr->name);
+ if(jbr->name)
+ jbir = g_hash_table_lookup(jbi->resources, jbr->name);
+
if(jbir) {
if(jbir->idle_seconds > 0) {
g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
gaim-2.0.0beta5-debian-10_text-arrow-keys.patch:
gntkeys.c | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
--- NEW FILE gaim-2.0.0beta5-debian-10_text-arrow-keys.patch ---
--- trunk/console/libgnt/gntkeys.c 2006/11/01 05:53:09 17646
+++ trunk/console/libgnt/gntkeys.c 2006/11/15 07:18:16 17750
@@ -3,17 +3,27 @@
#include <stdlib.h>
#include <string.h>
-const char *term;
+static const char *term;
void gnt_keys_refine(char *text)
{
+ if (term == NULL) {
+ term = getenv("TERM");
+ if (!term)
+ term = ""; /* Just in case */
+ }
+
if (*text == 27 && *(text + 1) == '[' && *(text + 3) == '\0' &&
(*(text + 2) >= 'A' || *(text + 2) <= 'D')) {
- if (term == NULL)
- term = getenv("TERM");
- /* Apparently this is necessary for urxvt and screen */
- if (strcmp(term, "screen") == 0 || strcmp(term, "rxvt-unicode") == 0)
+ /* Apparently this is necessary for urxvt and screen and xterm */
+ if (strcmp(term, "screen") == 0 || strcmp(term, "rxvt-unicode") == 0 ||
+ strcmp(term, "xterm") == 0)
*(text + 1) = 'O';
+ } else if (*(unsigned char*)text == 195) {
+ if (*(text + 2) == 0 && strcmp(term, "xterm") == 0) {
+ *(text) = 27;
+ *(text + 1) -= 64; /* Say wha? */
+ }
}
}
gaim-2.0.0beta5-debian-11_reread-resolvconf.patch:
connection.c | 7 +++++++
network.c | 2 --
2 files changed, 7 insertions(+), 2 deletions(-)
--- NEW FILE gaim-2.0.0beta5-debian-11_reread-resolvconf.patch ---
diff -ur gaim-2.0.0+beta5.orig/libgaim/connection.c gaim-2.0.0+beta5/libgaim/connection.c
--- gaim-2.0.0+beta5.orig/libgaim/connection.c 2006-11-28 00:12:14.000000000 -0500
+++ gaim-2.0.0+beta5/libgaim/connection.c 2006-11-28 00:24:00.000000000 -0500
@@ -37,6 +37,10 @@
#include "signals.h"
#include "util.h"
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
static GList *connections = NULL;
static GList *connections_connecting = NULL;
static GaimConnectionUiOps *connection_ui_ops = NULL;
@@ -139,6 +139,9 @@
gaim_signal_emit(gaim_connections_get_handle(), "signing-on", gc);
+ /* Re-read resolv.conf and friends in case DNS servers have changed */
+ res_init();
+
if (regist)
{
gaim_debug_info("connection", "Registering. gc = %p\n", gc);
diff -ur gaim-2.0.0+beta5.orig/libgaim/network.c gaim-2.0.0+beta5/libgaim/network.c
--- gaim-2.0.0+beta5.orig/libgaim/network.c 2006-11-28 00:12:14.000000000 -0500
+++ gaim-2.0.0+beta5/libgaim/network.c 2006-11-28 00:24:15.000000000 -0500
@@ -558,8 +558,6 @@
switch(current)
{
case LIBNM_ACTIVE_NETWORK_CONNECTION:
- /* Call res_init in case DNS servers have changed */
- res_init();
if (ui_ops != NULL && ui_ops->network_connected != NULL)
ui_ops->network_connected();
prev = current;
gaim-2.0.0beta5-gtk-filename-blanked.patch:
gtkrequest.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
--- NEW FILE gaim-2.0.0beta5-gtk-filename-blanked.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217768
http://gaim.svn.sourceforge.net/viewvc/gaim/trunk/gtk/gtkrequest.c?r1=17629&r2=17739&view=patch
--- trunk/gtk/gtkrequest.c 2006/10/30 05:27:31 17629
+++ trunk/gtk/gtkrequest.c 2006/11/11 23:35:07 17739
@@ -1527,8 +1527,12 @@
current_folder = gaim_prefs_get_string("/gaim/gtk/filelocations/last_open_folder");
}
- if (filename != NULL)
- gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename);
+ if (filename != NULL) {
+ if (savedialog)
+ gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(filesel), filename);
+ else
+ gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename);
+ }
if ((current_folder != NULL) && (*current_folder != '\0')) {
folder_set = gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(filesel), current_folder);
}
More information about the fedora-cvs-commits
mailing list