[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Ayttm-commits] CVS: ayttm/src account.h,1.1.1.1,1.2 chat_window.c,1.7,1
From: |
Colin Leroy <address@hidden> |
Subject: |
[Ayttm-commits] CVS: ayttm/src account.h,1.1.1.1,1.2 chat_window.c,1.7,1.8 |
Date: |
Thu, 02 Jan 2003 02:11:11 -0500 |
Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv8013/src
Modified Files:
account.h chat_window.c
Log Message:
friendlynames for contacts created via msn
Index: account.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/account.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- account.h 23 Dec 2002 22:05:29 -0000 1.1.1.1
+++ account.h 2 Jan 2003 07:11:09 -0000 1.2
@@ -30,6 +30,10 @@
#include <gtk/gtk.h>
#include "contact.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct _grouplist
{
gchar name[255];
@@ -70,5 +74,9 @@
int load_contacts();
void write_contact_list();
void write_account_list();
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __ACCOUNT_H__*/
Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- chat_window.c 1 Jan 2003 14:22:45 -0000 1.7
+++ chat_window.c 2 Jan 2003 07:11:09 -0000 1.8
@@ -394,7 +394,7 @@
chat_window * data = (chat_window*)d;
gchar buff[BUF_SIZE];
gchar buff2[BUF_SIZE];
- gchar * text;
+ gchar * text, *o_text;
gchar * link_message;
gchar * temp_message;
struct tm * cur_time;
@@ -496,7 +496,7 @@
ifilter=(gchar *(*)(eb_local_account *, eb_account *, struct contact *,
gchar *))filter_walk->data;
text=ifilter(data->local_user, data->perfered, data->contact, text);
-
+
if(text==NULL) { return; } // Urgh, no cleanup, but it does it on
strlen(text)==0 too
filter_walk=g_list_next(filter_walk);
@@ -505,9 +505,11 @@
eb_debug(DBG_CORE, "Finished outgoing filters\n");
// end outbound filters
-
- text = strdup(convert_eol(text));
-
+
+ o_text = text;
+ text = convert_eol(text);
+ g_free(o_text);
+
#ifdef HAVE_ICONV_H
if(!eb_services[data->perfered->service_id].can_iconvert)
{
@@ -735,6 +737,7 @@
g_snprintf(buff, BUF_SIZE, _("Do you really want to ignore %s?\n"),
cw->contact->nick);
do_dialog(buff, _("Ignore Contact"), ignore_dialog_callback, cw->contact);
+ g_free(buff);
}
/*This is the callback for file x-fer*/
@@ -850,6 +853,7 @@
cw=cwa->cw;
ela=(eb_local_account *)cwa->data;
cw->local_user=ela;
+ /* don't free it */
gtk_label_get(label, &account);
eb_debug(DBG_CORE, "change_local_account_on_click: %s\n", account);
}
@@ -2042,10 +2046,6 @@
#ifdef HAVE_ICONV_H
message = recode_if_needed(message, recode_buff, RECODE_TO_LOCAL);
-
- /* 'message' is used below yet, so we have to assign
- and it's not freed, so should not be no harm
- */
#endif
g_snprintf(buff, BUF_SIZE, "<B>%s </B>",buff2);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Ayttm-commits] CVS: ayttm/src account.h,1.1.1.1,1.2 chat_window.c,1.7,1.8,
Colin Leroy <address@hidden> <=