Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv20818/src
Modified Files:
Tag: gtk1-stable
gaimrc.c prpl.c
Log Message:
Changen.
Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.96.2.2
retrieving revision 1.96.2.3
diff -u -d -r1.96.2.2 -r1.96.2.3
--- gaimrc.c 26 Aug 2002 21:58:16 -0000 1.96.2.2
+++ gaimrc.c 9 Sep 2002 05:46:07 -0000 1.96.2.3
@@ -63,16 +63,15 @@
char value[MAX_VALUES][4096];
};
-static struct parse *parse_line(char *line)
+static struct parse *parse_line(char *line, struct parse *p)
{
char *c = line;
int inopt = 1, inval = 0, curval = -1;
int optlen = 0, vallen = 0;
- static struct parse p;
int x;
for (x = 0; x < MAX_VALUES; x++) {
- p.value[x][0] = 0;
+ p->value[x][0] = 0;
}
@@ -85,36 +84,36 @@
/* if ((*c < 'a' || *c > 'z') && *c != '_') { */
if ((*c < 'a' || *c > 'z') && *c != '_' && (*c < 'A' || *c > 'Z')) {
inopt = 0;
- p.option[optlen] = 0;
+ p->option[optlen] = 0;
c++;
continue;
}
- p.option[optlen] = *c;
+ p->option[optlen] = *c;
optlen++;
c++;
continue;
} else if (inval) {
if ((*c == '}')) {
if (*(c - 1) == '\\') {
- p.value[curval][vallen - 1] = *c;
+ p->value[curval][vallen - 1] = *c;
c++;
continue;
} else {
- p.value[curval][vallen - 1] = 0;
+ p->value[curval][vallen - 1] = 0;
inval = 0;
c++;
continue;
}
} else {
- p.value[curval][vallen] = *c;
+ p->value[curval][vallen] = *c;
vallen++;
c++;
continue;
}
} else if (*c == '{') {
if (*(c - 1) == '\\') {
- p.value[curval][vallen - 1] = *c;
+ p->value[curval][vallen - 1] = *c;
c++;
continue;
} else {
@@ -129,7 +128,7 @@
c++;
}
- return &p;
+ return p;
}
@@ -228,6 +227,7 @@
static void gaimrc_read_away(FILE *f)
{
+ struct parse parse_buffer;
struct parse *p;
char buf[4096];
struct away_message *a;
@@ -241,7 +241,7 @@
if (buf[0] == '}')
return;
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (!strcmp(p->option, "message")) {
a = g_new0(struct away_message, 1);
@@ -301,6 +301,7 @@
static void gaimrc_read_pounce(FILE *f)
{
+ struct parse parse_buffer;
struct parse *p;
char buf[4096];
struct buddy_pounce *b;
@@ -314,7 +315,7 @@
if (buf[0] == '}')
return;
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (!strcmp(p->option, "entry")) {
b = g_new0(struct buddy_pounce, 1);
@@ -413,6 +414,7 @@
static void gaimrc_read_plugins(FILE *f)
{
+ struct parse parse_buffer;
struct parse *p;
char buf[4096];
GSList *load = NULL;
@@ -426,7 +428,7 @@
if (buf[0] == '}')
break;
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (!strcmp(p->option, "plugin")) {
filter_break(p->value[0]);
load = g_slist_append(load, g_strdup(p->value[0]));
@@ -446,6 +448,7 @@
static struct aim_user *gaimrc_read_user(FILE *f)
{
+ struct parse parse_buffer;
struct parse *p;
struct aim_user *u;
int i;
@@ -454,7 +457,7 @@
if (!fgets(buf, sizeof(buf), f))
return NULL;
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (strcmp(p->option, "ident"))
return NULL;
@@ -499,7 +502,7 @@
return u;
}
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (strcmp(p->option, "user_opts"))
return u;
@@ -513,7 +516,7 @@
if (!strcmp(buf, "\t}"))
return u;
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (strcmp(p->option, "proto_opts"))
return u;
@@ -527,7 +530,7 @@
if (!strcmp(buf, "\t}"))
return u;
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (strcmp(p->option, "iconfile"))
return u;
@@ -540,7 +543,7 @@
if (!strcmp(buf, "\t}"))
return u;
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (strcmp(p->option, "alias"))
return u;
@@ -593,6 +596,7 @@
{
char buf[2048];
struct aim_user *u;
+ struct parse parse_buffer;
struct parse *p;
buf[0] = 0;
@@ -606,7 +610,7 @@
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (!strcmp(p->option, "current_user")) {
} else if (strcmp(p->option, "user")) {
@@ -707,6 +711,7 @@
static void gaimrc_read_options(FILE *f)
{
char buf[2048];
+ struct parse parse_buffer;
struct parse *p;
gboolean read_logging = FALSE, read_general = FALSE, read_display = FALSE;
int general_options = 0, display_options = 0;
@@ -721,7 +726,7 @@
if (!fgets(buf, sizeof(buf), f))
return;
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (!strcmp(p->option, "general_options")) {
general_options = atoi(p->value[0]);
@@ -869,6 +874,7 @@
{
int i;
char buf[2048];
+ struct parse parse_buffer;
struct parse *p;
buf[0] = 0;
@@ -884,7 +890,7 @@
if (!fgets(buf, sizeof(buf), f))
return;
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (!strcmp(p->option, "sound_cmd")) {
g_snprintf(sound_cmd, sizeof(sound_cmd), "%s", p->value[0]);
@@ -1003,6 +1009,7 @@
static void gaimrc_read_proxy(FILE *f)
{
char buf[2048];
+ struct parse parse_buffer;
struct parse *p;
buf[0] = 0;
@@ -1015,7 +1022,7 @@
if (!fgets(buf, sizeof(buf), f))
return;
- p = parse_line(buf);
+ p = parse_line(buf, &parse_buffer);
if (!strcmp(p->option, "host")) {
g_snprintf(proxyhost, sizeof(proxyhost), "%s", p->value[0]);
@@ -1131,7 +1138,7 @@
away_options =
OPT_AWAY_BACK_ON_IM;
- for (i = 0; i < 7; i++)
+ for (i = 0; i < NUM_SOUNDS; i++)
sound_file[i] = NULL;
font_options = 0;
/* Enable all of the sound players that might be available. The first
Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -u -d -r1.54 -r1.54.2.1
--- prpl.c 30 May 2002 17:49:03 -0000 1.54
+++ prpl.c 9 Sep 2002 05:46:08 -0000 1.54.2.1
@@ -428,7 +428,8 @@
mn->email_label = gtk_label_new(buf);
gtk_label_set_text(GTK_LABEL(mn->email_label), buf);
- gtk_box_pack_start(GTK_BOX(vbox), mn->email_label, 0, 0, 5);
+ gtk_label_set_line_wrap(GTK_LABEL(mn->email_label), TRUE);
+ gtk_box_pack_start(GTK_BOX(vbox), mn->email_label, FALSE, TRUE, 5);
gtk_widget_show(mn->email_label);
hbox = gtk_hbox_new(FALSE, 5);
|
