Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv20536/src
Modified Files:
conversation.c gaim.h multi.h prpl.h server.c
Log Message:
oh
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- conversation.c 2001/11/09 03:11:56 1.291
+++ conversation.c 2001/11/10 08:02:39 1.292
@@ -812,7 +812,7 @@
buf2 = g_malloc(limit);
- if (c->gc->prpl->options & OPT_PROTO_HTML) {
+ if (c->gc->flags & OPT_CONN_HTML) {
if (convo_options & OPT_CONVO_SEND_LINKS)
linkify_text(buf);
@@ -2926,10 +2926,10 @@
if (!c->gc)
return;
- if (!c->gc->prpl->checkbox)
+ if (!c->gc->checkbox)
return;
- c->check = gtk_check_button_new_with_label(c->gc->prpl->checkbox);
+ c->check = gtk_check_button_new_with_label(c->gc->checkbox);
gtk_box_pack_start(GTK_BOX(c->lbox), c->check, FALSE, FALSE, 5);
gtk_widget_show(c->check);
}
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- gaim.h 2001/11/06 23:58:21 1.290
+++ gaim.h 2001/11/10 08:02:39 1.291
@@ -403,5 +403,6 @@
extern char *str_to_utf8(unsigned char *);
extern char *add_cr(char *);
extern void strip_linefeed(char *);
+extern time_t get_time(int, int, int, int, int, int);
#endif /* _GAIM_H_ */
Index: multi.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- multi.h 2001/10/06 00:10:29 1.36
+++ multi.h 2001/11/10 08:02:39 1.37
@@ -32,6 +32,10 @@
/* we make this as an int in case if we want to add more protocols later */
int protocol;
struct prpl *prpl;
+ guint32 flags;
+
+ /* erg. */
+ char *checkbox;
/* all connections need an input watcher */
int inpa;
@@ -68,6 +72,8 @@
int evil;
gboolean wants_to_die; /* defaults to FALSE */
};
+
+#define OPT_CONN_HTML 0x00000001
struct proto_user_opt {
char *label;
Index: prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- prpl.h 2001/11/06 23:58:21 1.55
+++ prpl.h 2001/11/10 08:02:39 1.56
@@ -55,7 +55,7 @@
/* These should all be stuff that some plugins can do and others can't */
/* TOC/Oscar send HTML-encoded messages; most other protocols don't */
-#define OPT_PROTO_HTML 0x00000001
+/* #define OPT_PROTO_HTML 0x00000001 this should be per-connection */
/* TOC/Oscar have signon time, and the server's time needs to be adjusted to match
* your computer's time. We wouldn't need this if everyone used NTP. */
#define OPT_PROTO_CORRECT_TIME 0x00000002
@@ -81,7 +81,7 @@
char *(* name)();
/* for ICQ and Yahoo, who have off/on per-conversation options */
- char *checkbox;
+ /* char *checkbox; this should be per-connection */
/* returns the XPM associated with the given user class */
char **(* list_icon)(int);
Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- server.c 2001/11/06 23:58:21 1.207
+++ server.c 2001/11/10 08:02:39 1.208
@@ -187,7 +187,7 @@
char *buf = NULL;
if (message) {
buf = g_malloc(strlen(message) + 1);
- if (gc->prpl->options & OPT_PROTO_HTML)
+ if (gc->flags & OPT_CONN_HTML)
strncpy(buf, message, strlen(message) + 1);
else
strncpy_nohtml(buf, message, strlen(message) + 1);
|
