Menu
▾
▴
pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(106) |
Oct
(334) |
Nov
(246) |
Dec
(145) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(42) |
Feb
(53) |
Mar
(232) |
Apr
(109) |
May
(137) |
Jun
(63) |
Jul
(26) |
Aug
(263) |
Sep
(193) |
Oct
(507) |
Nov
(440) |
Dec
(241) |
| 2003 |
Jan
(567) |
Feb
(195) |
Mar
(504) |
Apr
(481) |
May
(524) |
Jun
(522) |
Jul
(594) |
Aug
(502) |
Sep
(643) |
Oct
(508) |
Nov
(430) |
Dec
(377) |
| 2004 |
Jan
(361) |
Feb
(251) |
Mar
(219) |
Apr
(499) |
May
(461) |
Jun
(419) |
Jul
(314) |
Aug
(519) |
Sep
(416) |
Oct
(247) |
Nov
(305) |
Dec
(382) |
| 2005 |
Jan
(267) |
Feb
(282) |
Mar
(327) |
Apr
(338) |
May
(189) |
Jun
(400) |
Jul
(462) |
Aug
(530) |
Sep
(316) |
Oct
(523) |
Nov
(481) |
Dec
(650) |
| 2006 |
Jan
(536) |
Feb
(361) |
Mar
(287) |
Apr
(146) |
May
(101) |
Jun
(169) |
Jul
(221) |
Aug
(498) |
Sep
(300) |
Oct
(236) |
Nov
(209) |
Dec
(205) |
| 2007 |
Jan
(30) |
Feb
(23) |
Mar
(26) |
Apr
(15) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Eric W. <war...@us...> - 2001-11-19 13:50:37
|
Update of /cvsroot/gaim/gaim/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv22730
Modified Files:
filectl.c
Log Message:
eh
Index: filectl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/filectl.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- filectl.c 2001/11/19 12:35:51 1.6
+++ filectl.c 2001/11/19 13:50:34 1.7
@@ -58,7 +58,7 @@
struct gaim_connection *gc = NULL;
GSList *c = connections;
arg1 = getarg(buffer, 1, 1);
- while (c) {
+ while (arg1 && c) {
gc = c->data;
if (!strcmp(gc->username, arg1)) {
break;
|
|
From: Eric W. <war...@us...> - 2001-11-19 12:35:54
|
Update of /cvsroot/gaim/gaim/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv2857
Modified Files:
filectl.c
Log Message:
Ari Pollak's update (sans applet)
Index: filectl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/filectl.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- filectl.c 2001/09/20 09:15:31 1.5
+++ filectl.c 2001/11/19 12:35:51 1.6
@@ -39,12 +39,12 @@
command = getarg(buffer, 0, 0);
if (!strncasecmp(command, "signon", 6)) {
struct aim_user *u = NULL;
- GList *userlist = aim_users;
+ GSList *userlist = aim_users;
arg1 = getarg(buffer, 1, 1);
- if(arg1) {
- while(userlist) {
+ if (arg1) {
+ while (userlist) {
struct aim_user *current = userlist->data;
- if(!strcmp(current->username, arg1)) {
+ if (!strcmp(current->username, arg1)) {
u = current;
break;
}
@@ -52,17 +52,25 @@
}
free(arg1);
}
- if(u) /* username found */
+ if (u) /* username found */
serv_login(u);
} else if (!strncasecmp(command, "signoff", 7)) {
struct gaim_connection *gc = NULL;
+ GSList *c = connections;
arg1 = getarg(buffer, 1, 1);
- if (arg1) {
- gc = find_gaim_conn_by_name(arg1);
- free(arg1);
+ while (c) {
+ gc = c->data;
+ if (!strcmp(gc->username, arg1)) {
+ break;
+ }
+ gc = NULL;
+ c = c->next;
}
- if (gc) signoff(gc);
- else signoff_all(NULL, NULL);
+ if (gc)
+ signoff(gc);
+ else if (!arg1)
+ signoff_all(NULL, NULL);
+ free(arg1);
} else if (!strncasecmp(command, "send", 4)) {
struct conversation *c;
arg1 = getarg(buffer, 1, 0);
|
|
From: Eric W. <war...@us...> - 2001-11-19 12:23:43
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv32229/protocols/oscar
Modified Files:
aim.h ft.c
Log Message:
eh.
Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- aim.h 2001/11/19 02:53:46 1.22
+++ aim.h 2001/11/19 12:23:40 1.23
@@ -778,6 +778,7 @@
fu8_t *icon;
} icon;
struct {
+ fu8_t junk;
} voice;
struct {
fu8_t ip[22]; /* xxx.xxx.xxx.xxx:xxxxx\0 */
@@ -793,6 +794,7 @@
unsigned char *cookie;
} getfile;
struct {
+ fu8_t junk;
} sendfile;
} info;
};
Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ft.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ft.c 2001/11/14 19:21:20 1.8
+++ ft.c 2001/11/19 12:23:40 1.9
@@ -99,7 +99,7 @@
ret = userfunc(sess, NULL, newconn, cur);
#endif
} else {
- faimdprintf(sess, 1,"Got a Connection on a listener that's not Rendezvous(??!) Closing conn.\n");
+ faimdprintf(sess, 1, "Got a Connection on a listener that's not Rendezvous.\n");
aim_conn_close(newconn);
ret = -1;
}
|
|
From: Eric W. <war...@us...> - 2001-11-19 12:03:41
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv26747/src
Modified Files:
conversation.c dialogs.c gaimrc.c ui.h
Log Message:
more font stuff! yay!
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- conversation.c 2001/11/19 11:14:54 1.300
+++ conversation.c 2001/11/19 12:03:37 1.301
@@ -70,7 +70,8 @@
GtkWidget *all_convos = NULL;
static GtkWidget *convo_notebook = NULL;
-char fontface[64];
+char fontface[128] = { 0 };
+char fontxfld[256] = { 0 };
int fontsize = 3;
extern GdkColor bgcolor;
extern GdkColor fgcolor;
@@ -502,24 +503,24 @@
void set_font_face(char *newfont, struct conversation *c)
{
char *pre_fontface;
- int alloc = 1;
+ int i, j = 0, k = 0;
- pre_fontface = g_strconcat("<FONT FACE=\"", newfont, "\">", '\0');
- if (!strcmp(pre_fontface, "<FONT FACE=\"\">")) {
- g_free(pre_fontface);
- alloc--;
- pre_fontface = "<FONT FACE=\"" DEFAULT_FONT_FACE "\">";
+ sprintf(c->fontxfld, "%s", newfont && *newfont ? newfont : DEFAULT_FONT_XFLD);
+ for (i = 0; i < strlen(c->fontxfld); i++) {
+ if (c->fontxfld[i] == '-') {
+ if (++j > 2)
+ break;
+ } else if (j == 2)
+ c->fontface[k++] = c->fontxfld[i];
}
-
- sprintf(c->fontface, "%s", newfont ?
- (newfont[0] ? newfont : DEFAULT_FONT_FACE) : DEFAULT_FONT_FACE);
+ c->fontface[k] = '\0';
c->hasfont = 1;
+
+ pre_fontface = g_strconcat("<FONT FACE=\"", c->fontface, "\">", NULL);
surround(c->entry, pre_fontface, "</FONT>");
gtk_widget_grab_focus(c->entry);
-
- if (alloc)
- g_free(pre_fontface);
+ g_free(pre_fontface);
}
static gint delete_all_convo(GtkWidget *w, GdkEventAny *e, gpointer d)
@@ -2150,6 +2151,7 @@
c->smiley_dialog = NULL;
c->link_dialog = NULL;
c->log_dialog = NULL;
+ sprintf(c->fontxfld, "%s", fontxfld);
sprintf(c->fontface, "%s", fontface);
c->hasfont = 0;
c->bgcol = bgcolor;
@@ -2586,6 +2588,7 @@
if (b->hasfont)
continue;
sprintf(b->fontface, "%s", fontface);
+ sprintf(b->fontxfld, "%s", fontxfld);
}
}
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- dialogs.c 2001/11/19 11:14:54 1.288
+++ dialogs.c 2001/11/19 12:03:37 1.289
@@ -2653,24 +2653,12 @@
but for now only works with font face */
int i, j = 0, k = 0;
char *fontname;
- char font[64];
struct conversation *c = gtk_object_get_user_data(GTK_OBJECT(fontsel));
if (c) {
fontname = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(fontsel));
-
- for (i = 0; i < strlen(fontname); i++) {
- if (fontname[i] == '-') {
- if (++j > 2)
- break;
- } else if (j == 2)
- font[k++] = fontname[i];
- }
- font[k] = '\0';
- debug_printf("Setting font face %s\n", font);
-
- set_font_face(font, c);
+ set_font_face(fontname, c);
} else {
fontname = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(fontsel));
@@ -2682,6 +2670,8 @@
fontface[k++] = fontname[i];
}
fontface[k] = '\0';
+
+ g_snprintf(fontxfld, sizeof(fontxfld), "%s", fontname);
}
cancel_font(NULL, c);
@@ -2710,6 +2700,7 @@
fontface[k++] = fontname[i];
}
fontface[k] = '\0';
+ g_snprintf(fontxfld, sizeof(fontxfld), "%s", fontname);
update_convo_font();
}
@@ -2720,8 +2711,13 @@
if (fontseld)
return;
fontseld = gtk_font_selection_dialog_new(_("Select Font"));
- gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontseld),
- DEFAULT_FONT_XFLD);
+ if (fontxfld[0]) {
+ gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontseld),
+ fontxfld);
+ } else {
+ gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontseld),
+ DEFAULT_FONT_XFLD);
+ }
gtk_object_set_user_data(GTK_OBJECT(fontseld), NULL);
gtk_signal_connect(GTK_OBJECT(fontseld), "delete_event",
@@ -2745,8 +2741,13 @@
else
gtk_object_set_user_data(GTK_OBJECT(c->font_dialog), NULL);
- gtk_font_selection_dialog_set_font_name((GtkFontSelectionDialog *) c->font_dialog,
- DEFAULT_FONT_XFLD);
+ if (c->fontxfld[0]) {
+ gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontseld),
+ c->fontxfld);
+ } else {
+ gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontseld),
+ DEFAULT_FONT_XFLD);
+ }
gtk_signal_connect(GTK_OBJECT(c->font_dialog), "delete_event",
GTK_SIGNAL_FUNC(delete_event_dialog), c);
@@ -2754,9 +2755,6 @@
"clicked", GTK_SIGNAL_FUNC(apply_font), c->font_dialog);
gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(c->font_dialog)->cancel_button),
"clicked", GTK_SIGNAL_FUNC(cancel_font), c);
-
- gtk_font_selection_dialog_set_font_name((GtkFontSelectionDialog *) c->font_dialog,
- DEFAULT_FONT_XFLD);
gtk_widget_realize(c->font_dialog);
Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- gaimrc.c 2001/10/24 01:42:48 1.88
+++ gaimrc.c 2001/11/19 12:03:38 1.89
@@ -731,9 +731,10 @@
sound_options = atoi(p->value[0]);
} else if (!strcmp(p->option, "away_options")) {
away_options = atoi(p->value[0]);
+ } else if (!strcmp(p->option, "font_xfld")) {
+ g_snprintf(fontxfld, sizeof(fontxfld), "%s", p->value[0]);
} else if (!strcmp(p->option, "font_face")) {
- if (p->value[0] != NULL)
- g_snprintf(fontface, sizeof(fontface), "%s", p->value[0]);
+ g_snprintf(fontface, sizeof(fontface), "%s", p->value[0]);
} else if (!strcmp(p->option, "font_size")) {
fontsize = atoi(p->value[0]);
} else if (!strcmp(p->option, "foreground")) {
@@ -823,8 +824,8 @@
fprintf(f, "\tsound_options { %u }\n", sound_options);
fprintf(f, "\taway_options { %u }\n", away_options);
- if (fontface)
- fprintf(f, "\tfont_face { %s }\n", fontface);
+ fprintf(f, "\tfont_xfld { %s }\n", fontxfld);
+ fprintf(f, "\tfont_face { %s }\n", fontface);
fprintf(f, "\tfont_size { %d }\n", fontsize);
fprintf(f, "\tforeground { %d } { %d } { %d }\n", fgcolor.red, fgcolor.green, fgcolor.blue);
fprintf(f, "\tbackground { %d } { %d } { %d }\n", bgcolor.red, bgcolor.green, bgcolor.blue);
Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ui.h 2001/11/19 11:14:55 1.19
+++ ui.h 2001/11/19 12:03:38 1.20
@@ -127,6 +127,7 @@
GtkWidget *log_dialog;
int makesound;
char fontface[128];
+ char fontxfld[256];
int hasfont;
GdkColor bgcol;
int hasbg;
@@ -261,7 +262,8 @@
extern GtkWidget *joinchat;
/* Globals in dialog.c */
-extern char fontface[64];
+extern char fontface[128];
+extern char fontxfld[256];
extern int fontsize;
extern GdkColor bgcolor;
extern GdkColor fgcolor;
|
|
From: Eric W. <war...@us...> - 2001-11-19 11:19:56
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv15517
Modified Files:
server.c
Log Message:
this always bothered me
Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- server.c 2001/11/10 08:02:39 1.208
+++ server.c 2001/11/19 11:19:52 1.209
@@ -54,7 +54,7 @@
return;
}
- debug_printf("Logging in using %s\n", p->name());
+ debug_printf(PACKAGE " " VERSION " logging in %s using %s\n", user->username, p->name());
p->login(user);
} else {
do_error_dialog(_("You cannot log this account in; you do not have "
|
|
From: Eric W. <war...@us...> - 2001-11-19 11:19:55
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv15517/protocols/oscar
Modified Files:
oscar.c
Log Message:
this always bothered me
Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- oscar.c 2001/11/19 04:35:39 1.68
+++ oscar.c 2001/11/19 11:19:52 1.69
@@ -443,7 +443,6 @@
struct oscar_data *odata = gc->proto_data = g_new0(struct oscar_data, 1);
odata->create_exchange = 0;
- debug_printf(_("Logging in %s\n"), user->username);
if (isdigit(*user->username)) {
odata->icq = TRUE;
/* this is odd but it's necessary for a proper do_import and do_export */
@@ -1615,7 +1614,6 @@
aim_getbuildstring(buildbuf, sizeof(buildbuf));
debug_printf("MOTD: %s (%d)\n", msg ? msg : "Unknown", id);
- debug_printf("Gaim %s / libfaim %s\n", VERSION, buildbuf);
if (id < 4)
do_error_dialog(_("Your connection may be lost."),
_("AOL error"));
|
|
From: Eric W. <war...@us...> - 2001-11-19 11:15:00
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv13645/src
Modified Files:
conversation.c dialogs.c gtkimhtml.c ui.h
Log Message:
decklin's patch
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- conversation.c 2001/11/18 21:23:36 1.299
+++ conversation.c 2001/11/19 11:14:54 1.300
@@ -509,10 +509,11 @@
if (!strcmp(pre_fontface, "<FONT FACE=\"\">")) {
g_free(pre_fontface);
alloc--;
- pre_fontface = "<FONT FACE=\"Helvetica\">";
+ pre_fontface = "<FONT FACE=\"" DEFAULT_FONT_FACE "\">";
}
- sprintf(c->fontface, "%s", newfont ? (newfont[0] ? newfont : "Helvetica") : "Helvetica");
+ sprintf(c->fontface, "%s", newfont ?
+ (newfont[0] ? newfont : DEFAULT_FONT_FACE) : DEFAULT_FONT_FACE);
c->hasfont = 1;
surround(c->entry, pre_fontface, "</FONT>");
gtk_widget_grab_focus(c->entry);
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- dialogs.c 2001/11/19 01:01:08 1.287
+++ dialogs.c 2001/11/19 11:14:54 1.288
@@ -76,8 +76,6 @@
#include "pixmaps/admin_icon.xpm"
#include "pixmaps/ab.xpm"
-#define DEFAULT_FONT_NAME "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1"
-
#define PATHSIZE 1024
int smiley_array[FACE_TOTAL];
@@ -2723,7 +2721,7 @@
return;
fontseld = gtk_font_selection_dialog_new(_("Select Font"));
gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontseld),
- DEFAULT_FONT_NAME);
+ DEFAULT_FONT_XFLD);
gtk_object_set_user_data(GTK_OBJECT(fontseld), NULL);
gtk_signal_connect(GTK_OBJECT(fontseld), "delete_event",
@@ -2748,7 +2746,7 @@
gtk_object_set_user_data(GTK_OBJECT(c->font_dialog), NULL);
gtk_font_selection_dialog_set_font_name((GtkFontSelectionDialog *) c->font_dialog,
- DEFAULT_FONT_NAME);
+ DEFAULT_FONT_XFLD);
gtk_signal_connect(GTK_OBJECT(c->font_dialog), "delete_event",
GTK_SIGNAL_FUNC(delete_event_dialog), c);
@@ -2758,7 +2756,7 @@
"clicked", GTK_SIGNAL_FUNC(cancel_font), c);
gtk_font_selection_dialog_set_font_name((GtkFontSelectionDialog *) c->font_dialog,
- DEFAULT_FONT_NAME);
+ DEFAULT_FONT_XFLD);
gtk_widget_realize(c->font_dialog);
Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- gtkimhtml.c 2001/11/17 13:57:30 1.75
+++ gtkimhtml.c 2001/11/19 11:14:54 1.76
@@ -59,10 +59,13 @@
#include "pixmaps/wink.xpm"
#include "pixmaps/yell.xpm"
-#define MAX_SIZE 7
+#define MAX_FONT_SIZE 7
+#define DEFAULT_FONT_SIZE 3
-gint font_sizes [] = { 80, 100, 120, 140, 200, 300, 400 };
+gint _point_sizes [] = { 80, 100, 120, 140, 200, 300, 400 };
+#define DEFAULT_PRE_FACE "courier"
+
#define BORDER_SIZE 2
#define TOP_BORDER 10
#define MIN_HEIGHT 20
@@ -1927,7 +1930,7 @@
if (italics)
newvals [SLANT] = "i";
if (fontsize) {
- g_snprintf (fs, sizeof (fs), "%d", font_sizes [MIN (fontsize, MAX_SIZE) - 1]);
+ g_snprintf (fs, sizeof (fs), "%d", _point_sizes [MIN (fontsize, MAX_FONT_SIZE) - 1]);
newvals [PXLSZ] = "*";
newvals [PTSZ] = fs;
}
@@ -1958,7 +1961,7 @@
newvals [FMLY] = names [i];
g_snprintf (fs, sizeof (fs), "%d",
- font_sizes [MIN (fontsize, MAX_SIZE) - 1] / 10);
+ _point_sizes [MIN (fontsize, MAX_FONT_SIZE) - 1] / 10);
newvals [PXLSZ] = fs;
newvals [PTSZ] = "*";
@@ -2501,13 +2504,13 @@
if ((font != NULL) || bold || italics || pre) {
if (font && (bold || italics || font->size || font->face || pre)) {
if (pre) {
- bit->font = gtk_imhtml_font_load (imhtml, "courier", bold, italics, font->size);
+ bit->font = gtk_imhtml_font_load (imhtml, DEFAULT_PRE_FACE, bold, italics, font->size);
} else {
bit->font = gtk_imhtml_font_load (imhtml, font->face, bold, italics, font->size);
}
} else if (bold || italics || pre) {
if (pre) {
- bit->font = gtk_imhtml_font_load (imhtml, "courier", bold, italics, 0);
+ bit->font = gtk_imhtml_font_load (imhtml, DEFAULT_PRE_FACE, bold, italics, 0);
} else {
bit->font = gtk_imhtml_font_load (imhtml, NULL, bold, italics, 0);
}
@@ -2992,7 +2995,7 @@
break;
sscanf (value + 1, "%hd", &font->size);
- font->size += 3;
+ font->size += DEFAULT_FONT_SIZE;
break;
}
@@ -3005,7 +3008,7 @@
sscanf (value + 1, "%hd", &font->size);
font->size = MIN (font->size, 2);
- font->size = 3 - font->size;
+ font->size = DEFAULT_FONT_SIZE - font->size;
break;
}
@@ -3036,7 +3039,7 @@
font->back = gdk_color_copy (oldfont->back);
} else {
if (!font->size)
- font->size = 3;
+ font->size = DEFAULT_FONT_SIZE;
}
fonts = g_slist_prepend (fonts, font);
Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ui.h 2001/11/15 22:47:04 1.18
+++ ui.h 2001/11/19 11:14:55 1.19
@@ -49,6 +49,9 @@
#define gtk_style_set_font(s, f) (s)->font = f
#endif
+#define DEFAULT_FONT_XFLD "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1"
+#define DEFAULT_FONT_FACE "helvetica"
+
#define BROWSER_NETSCAPE 0
#define BROWSER_KFM 1
#define BROWSER_MANUAL 2
|
|
From: Rob F. <rob...@us...> - 2001-11-19 10:07:01
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv24329
Modified Files:
prefs.c
Log Message:
Oh ho ho I'm a little bitty bitch,
Oh ho ho I just can't scratch that itch.
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- prefs.c 2001/11/19 09:54:00 1.201
+++ prefs.c 2001/11/19 10:06:59 1.202
@@ -1464,17 +1464,17 @@
gaim_button(label, &sound_options, opt, hbox);
button = gtk_button_new_with_label(_("Play"));
- gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
+ gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 3);
gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(test_sound), (void *)snd);
gtk_widget_show(button);
button = gtk_button_new_with_label(_("Reset"));
- gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
+ gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 3);
gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(reset_sound), (void *)snd);
gtk_widget_show(button);
button = gtk_button_new_with_label(_("Choose..."));
- gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 3);
gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(sel_sound), (void *)snd);
gtk_widget_show(button);
|
|
From: Eric W. <war...@us...> - 2001-11-19 09:54:03
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv20619/src
Modified Files:
prefs.c
Log Message:
Arturo Cisneros, Jr (r-2-ro)'s patch
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- prefs.c 2001/11/18 05:42:08 1.200
+++ prefs.c 2001/11/19 09:54:00 1.201
@@ -1405,6 +1405,15 @@
last_sound_dir = g_dirname(sound_file[snd]);
}
+static void test_sound(GtkWidget *button, int snd)
+{
+ guint32 tmp_sound = sound_options;
+ if (!(sound_options & OPT_SOUND_WHEN_AWAY))
+ sound_options ^= OPT_SOUND_WHEN_AWAY;
+ play_sound(snd);
+ sound_options = tmp_sound;
+}
+
static void reset_sound(GtkWidget *button, int snd)
{
@@ -1453,6 +1462,11 @@
gtk_widget_show(hbox);
gaim_button(label, &sound_options, opt, hbox);
+
+ button = gtk_button_new_with_label(_("Play"));
+ gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
+ gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(test_sound), (void *)snd);
+ gtk_widget_show(button);
button = gtk_button_new_with_label(_("Reset"));
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
|
|
From: Eric W. <war...@us...> - 2001-11-19 09:45:25
|
Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv18361/src/protocols/msn
Modified Files:
msn.c
Log Message:
Travis Farley (siege_2004)'s patch
Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- msn.c 2001/11/18 07:41:01 1.39
+++ msn.c 2001/11/19 09:45:22 1.40
@@ -1753,6 +1753,18 @@
{
if (!strcmp(act, "Set Friendly Name")) {
do_prompt_dialog("Set Friendly Name:", gc->displayname, gc, msn_act_id, NULL);
+ } else if (!strcmp(act, "Reset All Friendly Names")) {
+ GSList *g = gc->groups;
+ while (g) {
+ GSList *m = ((struct group *)g->data)->members;
+ while (m) {
+ struct buddy *b = m->data;
+ if (b->present)
+ msn_reset_friend(gc, b->name);
+ m = m->next;
+ }
+ g = g->next;
+ }
}
}
@@ -1761,6 +1773,7 @@
GList *m = NULL;
m = g_list_append(m, "Set Friendly Name");
+ m = g_list_append(m, "Reset All Friendly Names");
return m;
}
|
|
From: Eric W. <war...@us...> - 2001-11-19 09:43:44
|
Update of /cvsroot/gaim/gaim/po In directory usw-pr-cvs1:/tmp/cvs-serv17898 Modified Files: ru.po Log Message: Grigory Bakunov's updated translation Index: ru.po =================================================================== RCS file: /cvsroot/gaim/gaim/po/ru.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ru.po 2001/10/18 12:12:37 1.4 +++ ru.po 2001/11/19 09:43:40 1.5 @@ -4,71 +4,779 @@ # msgid "" msgstr "" -"Project-Id-Version: gaim 0.11pre14\n" -"POT-Creation-Date: 2001-07-26 20:42+0500\n" -"PO-Revision-Date: 2001-07-27 21:05+0400\n" -"Last-Translator: Grigory Bakunov <bl...@as...>\n" +"Project-Id-Version: gaim 0.48\n" +"POT-Creation-Date: 2001-11-15 11:03+0400\n" +"PO-Revision-Date: 2001-11-16 13:51+0400\n" +"Last-Translator: Sergey Volozhanin <sv...@as...>\n" [...4042 lines suppressed...] -msgid "Could not connect for transfer!" -msgstr "îÅÍÏÇÕ ÐÒÉÓÏÅÄÉÎÉÔØÓÑ ÄÌÑ ÐÅÒÅÄÁÞÉ ÆÁÊÌÁ!" - -#: src/toc.c:1705 -msgid "Could not write file header!" -msgstr "îÅ ÍÏÇÕ ÚÁÐÉÓÁÔØ ÚÁÇÏÌÏ×ÏË ÆÁÊÌÁ!" - -#: src/toc.c:1794 -msgid "Gaim - Save As..." -msgstr "Gaim - óÏÈÒÁÎÉÔØ ËÁË..." - -#: src/toc.c:1833 -#, c-format -msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s" -msgstr "%s ÚÁÐÒÏÓÉÌ Õ %s ÐÏÄÄÔ×ÅÒÄÅÎÉÅ %d Ï ÐÅÒÅÄÁÞÅ ÆÁÊÌÁ %s: %s (%.2f %s)%s%s" - -#: src/toc.c:1838 -#, c-format -msgid "%s requests you to send them a file" -msgstr "%s ÚÁÐÒÏÓÉÌ ÐÅÒÅÄÁÞÕ ÆÁÊÌÁ" |
|
From: Eric W. <war...@us...> - 2001-11-19 08:53:44
|
Update of /cvsroot/gaim/gaim/pixmaps
In directory usw-pr-cvs1:/tmp/cvs-serv1817/pixmaps
Modified Files:
smile8.xpm tongue.xpm
Log Message:
(00:52:01) warmenhoven: thanks.
(00:52:25) raybass: not a problem. :-P 8-)
Index: smile8.xpm
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/smile8.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- smile8.xpm 2000/07/18 05:05:41 1.1
+++ smile8.xpm 2001/11/19 08:53:41 1.2
@@ -1,28 +1,27 @@
/* XPM */
static char * smile8_xpm[] = {
-"19 19 6 1",
+"19 19 5 1",
" c None",
". c #000000",
"+ c #CCCC00",
"@ c #FFFF00",
-"# c #FFFFFF",
-"$ c #999933",
+"# c #999933",
" ....... ",
" ..+@@@@@+.. ",
" .+@@@@@@@@@+. ",
" .@@@@@@@@@@@@@. ",
-" .+@...@@@@@...@+. ",
-" .@.###.@@@.###.@. ",
-".+.##.##.@.##.##.+.",
-".@.##.##.@.##.##.@.",
-".@@.###.@@@.###.@@.",
+" .+@@@@@@@@@@@@@+. ",
+" .......@@@....... ",
+".+@.............@+.",
+".@@.............@@.",
+".@@.....@@@.....@@.",
".@@@...@@@@@...@@@.",
".@@@@@@@@@@@@@@@@@.",
".@@@.@@@@@@@@@.@@@.",
".+@..@@@@@@@@@..@+.",
-" .@@@.$@@@@@$.@@@. ",
+" .@@@.#@@@@@#.@@@. ",
" .+@@@.......@@@+. ",
-" .@@@@.$$$.@@@@. ",
+" .@@@@.###.@@@@. ",
" .+@@@...@@@+. ",
" ..+@@@@@+.. ",
" ....... "};
Index: tongue.xpm
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/tongue.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tongue.xpm 2000/07/18 05:05:41 1.1
+++ tongue.xpm 2001/11/19 08:53:41 1.2
@@ -1,11 +1,13 @@
/* XPM */
static char * tongue_xpm[] = {
-"19 19 5 1",
+"19 19 7 1",
" c None",
". c #000000",
"+ c #CCCC00",
"@ c #FFFF00",
-"# c #FF0000",
+"# c #333300",
+"$ c #FF0000",
+"% c #CC9900",
" ....... ",
" ..+@@@@@+.. ",
" .+@@@@@@@@@+. ",
@@ -16,12 +18,12 @@
".@@@@...@@@...@@@@.",
".@@@@...@@@...@@@@.",
".@@@@@.@@@@@.@@@@@.",
-".@@@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@@@.",
-".+@@...........@@+.",
-" .@@@@@#####@@@@@. ",
-" .+@@@@@@####@@@+. ",
-" .@@@@@@@##@@@@. ",
+".@@#@@@@@@@@@@@#@@.",
+".@#+#@@@@@@@@@#+#@.",
+".+@@@#@@@@@@@#@@@+.",
+" .@@@@#######$%@@. ",
+" .+@@@@@@@$$$$$@+. ",
+" .@@@@@@@@$$$@@. ",
" .+@@@@@@@@@+. ",
" ..+@@@@@+.. ",
" ....... "};
|
|
From: Eric W. <war...@us...> - 2001-11-19 08:23:35
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv24850
Modified Files:
aim.c core.c
Log Message:
don't ask
Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- aim.c 2001/10/23 21:39:44 1.171
+++ aim.c 2001/11/19 08:23:32 1.172
@@ -385,6 +385,7 @@
break;
case SIGSEGV:
core_quit();
+#ifndef DEBUG
fprintf(stderr, "Gaim has segfaulted and attempted to dump a core file.\n"
"This is a bug in the software and has happened through\n"
"no fault of your own.\n\n"
@@ -401,6 +402,7 @@
WEBSITE "gdb.php. If you need further\n"
"assistance, please IM either EWarmenhoven or RobFlynn and\n"
"they can help you.\n");
+#endif
abort();
break;
default:
@@ -561,9 +563,7 @@
#if HAVE_SIGNAL_H
/* Let's not violate any PLA's!!!! */
-#ifndef DEBUG
signal(SIGSEGV, sighandler);
-#endif
signal(SIGHUP, sighandler);
signal(SIGINT, sighandler);
signal(SIGTERM, sighandler);
Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- core.c 2001/10/24 08:48:05 1.17
+++ core.c 2001/11/19 08:23:32 1.18
@@ -450,4 +450,5 @@
close(UI_fd);
sprintf(buf, "%s/gaim_%s.%d", g_get_tmp_dir(), g_get_user_name(), getpid());
unlink(buf);
+ debug_printf("Removed core\n");
}
|
|
From: Eric W. <war...@us...> - 2001-11-19 04:35:42
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar In directory usw-pr-cvs1:/tmp/cvs-serv11167/src/protocols/oscar Modified Files: oscar.c Log Message: lisa started putting up the christmas decorations today. Index: oscar.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- oscar.c 2001/11/18 00:21:49 1.67 +++ oscar.c 2001/11/19 04:35:39 1.68 @@ -518,6 +518,12 @@ odata->hasicons = g_slist_remove(odata->hasicons, n); g_free(n); } + if (odata->create_name) + g_free(odata->create_name); + if (odata->newp) + g_free(odata->newp); + if (odata->oldp) + g_free(odata->oldp); if (gc->inpa > 0) gaim_input_remove(gc->inpa); if (odata->cnpa > 0) |
|
From: Eric W. <war...@us...> - 2001-11-19 04:35:42
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv11167 Modified Files: autogen.sh Log Message: lisa started putting up the christmas decorations today. Index: autogen.sh =================================================================== RCS file: /cvsroot/gaim/gaim/autogen.sh,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- autogen.sh 2001/10/03 06:04:44 1.11 +++ autogen.sh 2001/11/19 04:35:39 1.12 @@ -39,14 +39,14 @@ echo; echo "Running gettextize, please ignore non-fatal messages...." -echo n | gettextize --copy --force; +echo n | gettextize --copy --force || exit; echo "Running libtoolize, please ignore non-fatal messages...." -echo n | libtoolize --copy --force; +echo n | libtoolize --copy --force || exit; -aclocal -I m4 $ACLOCAL_FLAGS; -autoheader; -automake --add-missing --copy; -autoconf; -automake; +aclocal -I m4 $ACLOCAL_FLAGS || exit; +autoheader || exit; +automake --add-missing --copy || exit; +autoconf || exit; +automake || exit; ./configure $@ |
|
From: Eric W. <war...@us...> - 2001-11-19 04:35:42
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv11167/src
Modified Files:
proxy.c
Log Message:
lisa started putting up the christmas decorations today.
Index: proxy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/proxy.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- proxy.c 2001/10/10 20:23:25 1.31
+++ proxy.c 2001/11/19 04:35:39 1.32
@@ -74,7 +74,7 @@
if (condition & GAIM_READ_COND)
gaim_cond |= GAIM_INPUT_READ;
- if (condition & GAIM_READ_COND)
+ if (condition & GAIM_WRITE_COND)
gaim_cond |= GAIM_INPUT_WRITE;
debug_printf("CLOSURE: callback for %d, fd is %d\n",
|
|
From: Eric W. <war...@us...> - 2001-11-19 04:10:01
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv5290
Modified Files:
core.h
Log Message:
you didn't see that
Index: core.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- core.h 2001/11/19 03:44:53 1.12
+++ core.h 2001/11/19 04:09:58 1.13
@@ -112,7 +112,7 @@
struct buddy {
int edittype; /* XXX CUI: this is really a GUI function and we need to put this in ui.h */
char name[80];
- char show[388]; /* 121 because MSN names can be 387 characters */
+ char show[388]; /* because MSN names can be 387 characters */
int present;
int evil;
time_t signon;
|
|
From: Eric W. <war...@us...> - 2001-11-19 03:44:56
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv29730
Modified Files:
core.h
Log Message:
why did they choose 387?
Index: core.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- core.h 2001/10/24 10:23:48 1.11
+++ core.h 2001/11/19 03:44:53 1.12
@@ -112,7 +112,7 @@
struct buddy {
int edittype; /* XXX CUI: this is really a GUI function and we need to put this in ui.h */
char name[80];
- char show[80];
+ char show[388]; /* 121 because MSN names can be 387 characters */
int present;
int evil;
time_t signon;
|
|
From: Eric W. <war...@us...> - 2001-11-19 02:53:49
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar In directory usw-pr-cvs1:/tmp/cvs-serv17680/protocols/oscar Modified Files: aim.h im.c Log Message: hi. Index: aim.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- aim.h 2001/11/18 00:21:49 1.21 +++ aim.h 2001/11/19 02:53:46 1.22 @@ -368,9 +368,10 @@ } aim_session_t; /* Values for sess->flags */ -#define AIM_SESS_FLAGS_SNACLOGIN 0x00000001 -#define AIM_SESS_FLAGS_XORLOGIN 0x00000002 -#define AIM_SESS_FLAGS_NONBLOCKCONNECT 0x00000004 +#define AIM_SESS_FLAGS_SNACLOGIN 0x00000001 +#define AIM_SESS_FLAGS_XORLOGIN 0x00000002 +#define AIM_SESS_FLAGS_NONBLOCKCONNECT 0x00000004 +#define AIM_SESS_FLAGS_DONTTIMEOUTONICBM 0x00000008 /* Valid for calling aim_icq_setstatus() and for aim_userinfo_t->icqinfo.status */ #define AIM_ICQ_STATE_ONLINE 0x0000 Index: im.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/im.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- im.c 2001/11/14 19:21:20 1.16 +++ im.c 2001/11/19 02:53:46 1.17 @@ -226,7 +226,7 @@ aimbs_putraw(&fr->data, args->destsn, strlen(args->destsn)); /* - * metaTLV start. + * Message TLV (type 2). */ aimbs_put16(&fr->data, 0x0002); aimbs_put16(&fr->data, msgtlvlen); @@ -334,9 +334,8 @@ aim_tx_enqueue(sess, fr); -#if 1 /* XXX do this with autoconf or something... */ - aim_cleansnacs(sess, 60); /* clean out all SNACs over 60sec old */ -#endif + if (!(sess->flags & AIM_SESS_FLAGS_DONTTIMEOUTONICBM)) + aim_cleansnacs(sess, 60); /* clean out SNACs over 60sec old */ return 0; } |
|
From: Rob F. <rob...@us...> - 2001-11-19 01:01:11
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv25621 Modified Files: dialogs.c Log Message: Eww :) Index: dialogs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v retrieving revision 1.286 retrieving revision 1.287 diff -u -d -r1.286 -r1.287 --- dialogs.c 2001/11/18 05:42:08 1.286 +++ dialogs.c 2001/11/19 01:01:08 1.287 @@ -476,7 +476,7 @@ gtk_widget_realize(b->window); - vbox = gtk_vbox_new(FALSE, 5); + vbox = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(b->window), vbox); gtk_widget_show(vbox); |
|
From: Eric W. <war...@us...> - 2001-11-18 21:23:39
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv12836 Modified Files: conversation.c Log Message: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=gaim&archive=no&pend-exc=done Index: conversation.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/conversation.c,v retrieving revision 1.298 retrieving revision 1.299 diff -u -d -r1.298 -r1.299 --- conversation.c 2001/11/18 08:00:08 1.298 +++ conversation.c 2001/11/18 21:23:36 1.299 @@ -590,8 +590,10 @@ close_callback(c->close, c); } } else if (event->keyval == GDK_Page_Up) { + gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); gtk_imhtml_page_up(GTK_IMHTML(c->text)); } else if (event->keyval == GDK_Page_Down) { + gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); gtk_imhtml_page_down(GTK_IMHTML(c->text)); } else if ((event->keyval == GDK_F2) && (convo_options & OPT_CONVO_F2_TOGGLES)) { gtk_imhtml_show_comments(GTK_IMHTML(c->text), !GTK_IMHTML(c->text)->comments); |
|
From: Eric W. <war...@us...> - 2001-11-18 08:00:12
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv20666
Modified Files:
conversation.c
Log Message:
more convo hotkey fixes
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -d -r1.297 -r1.298
--- conversation.c 2001/11/18 05:37:35 1.297
+++ conversation.c 2001/11/18 08:00:08 1.298
@@ -599,9 +599,11 @@
if ((event->state & GDK_CONTROL_MASK) && (convo_options & OPT_CONVO_CTL_ENTER)) {
gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+ return TRUE;
} else if (!(event->state & GDK_SHIFT_MASK) && (convo_options & OPT_CONVO_ENTER_SENDS)) {
gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+ return TRUE;
} else {
int oldpos;
gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
@@ -609,6 +611,7 @@
gtk_editable_insert_text(GTK_EDITABLE(entry), "\n", 1, &pos);
if (oldpos == pos)
gtk_editable_set_position(GTK_EDITABLE(entry), pos + 1);
+ return TRUE;
}
} else if ((event->state & GDK_CONTROL_MASK) && (event->keyval == 'm')) {
int oldpos;
|
|
From: Eric W. <war...@us...> - 2001-11-18 07:41:04
|
Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv18411/protocols/msn
Modified Files:
msn.c
Log Message:
alan
Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- msn.c 2001/11/17 21:59:59 1.38
+++ msn.c 2001/11/18 07:41:01 1.39
@@ -669,9 +669,12 @@
static void msn_accept_add(gpointer w, struct msn_add_permit *map)
{
struct msn_data *md = map->gc->proto_data;
+ char *user;
char buf[MSN_BUF_LEN];
- g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, map->user, map->friend);
+ user = g_strdup(url_encode(map->user));
+ g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, user, url_encode(map->friend));
+ g_free(user);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
hide_login_progress(map->gc, "Write error");
signoff(map->gc);
@@ -1709,6 +1712,7 @@
if (l)
return;
+ who = url_encode(who);
g_snprintf(buf, sizeof(buf), "ADD %d FL %s %s\r\n", ++md->trId, who, who);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
hide_login_progress(gc, "Write error");
@@ -1722,6 +1726,7 @@
struct msn_data *md = gc->proto_data;
char buf[MSN_BUF_LEN];
+ who = url_encode(who);
g_snprintf(buf, sizeof(buf), "REM %d FL %s\r\n", ++md->trId, who);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
hide_login_progress(gc, "Write error");
@@ -1820,6 +1825,7 @@
t = g_slist_append(t, who);
continue;
}
+ who = url_encode(who);
g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, who, who);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
hide_login_progress(gc, "Write error");
@@ -1847,6 +1853,7 @@
t = g_slist_append(t, who);
continue;
}
+ who = url_encode(who);
g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, who, who);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
hide_login_progress(gc, "Write error");
@@ -1878,6 +1885,7 @@
return;
}
+ who = url_encode(who);
g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, who, who);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
hide_login_progress(gc, "Write error");
@@ -1891,6 +1899,7 @@
struct msn_data *md = gc->proto_data;
char buf[MSN_BUF_LEN];
+ who = url_encode(who);
g_snprintf(buf, sizeof(buf), "REM %d AL %s\r\n", ++md->trId, who);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
hide_login_progress(gc, "Write error");
@@ -1911,6 +1920,7 @@
return;
}
+ who = url_encode(who);
g_snprintf(buf, sizeof(buf), "ADD %d BL %s %s\r\n", ++md->trId, who, who);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
hide_login_progress(gc, "Write error");
@@ -1924,6 +1934,7 @@
struct msn_data *md = gc->proto_data;
char buf[MSN_BUF_LEN];
+ who = url_encode(who);
g_snprintf(buf, sizeof(buf), "REM %d BL %s\r\n", ++md->trId, who);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
hide_login_progress(gc, "Write error");
|
|
From: Rob F. <rob...@us...> - 2001-11-18 06:17:20
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv23401
Modified Files:
conversation.c dialogs.c gaim.h prefs.c
Log Message:
I didnt test this but it should work
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -d -r1.295 -r1.296
--- conversation.c 2001/11/17 14:14:51 1.295
+++ conversation.c 2001/11/18 04:19:49 1.296
@@ -540,13 +540,10 @@
{
struct buddy *b = find_buddy(c->gc, c->name);
if (b) {
- struct group *g = find_group_by_buddy(c->gc, c->name);
- debug_printf(_("Removing '%s' from buddylist.\n"), c->name);
- serv_remove_buddy(c->gc, c->name, g->name);
- remove_buddy(c->gc, g, b);
- do_export(c->gc);
- build_edit_tree();
- update_convo_add_button(c);
+ if (im_options & OPT_IM_DONT_CONFIRM_DEL)
+ show_confirm_del(c->gc, c->name);
+ else
+ do_remove_buddy(NULL, b);
} else if (c->gc)
show_add_buddy(c->gc, c->name, NULL, NULL);
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- dialogs.c 2001/11/15 22:47:03 1.283
+++ dialogs.c 2001/11/18 04:19:49 1.284
@@ -96,6 +96,16 @@
static GtkWidget *rename_dialog = NULL;
static GtkWidget *rename_bud_dialog = NULL;
+struct confirm_del {
+ GtkWidget *window;
+ GtkWidget *label;
+ GtkWidget *ok;
+ GtkWidget *cancel;
+ GtkWidget *checkbox;
+ char name[1024];
+ struct gaim_connection *gc;
+};
+
struct create_away {
GtkWidget *window;
GtkWidget *entry;
@@ -103,7 +113,6 @@
struct away_message *mess;
};
-
struct warning {
GtkWidget *window;
GtkWidget *anon;
@@ -413,18 +422,117 @@
gtk_box_pack_start(GTK_BOX(fbox), bbox, FALSE, FALSE, 5);
gtk_widget_show(bbox);
- warn = picture_button(w->window, _("Warn"), warn_xpm);
- gtk_box_pack_start(GTK_BOX(bbox), warn, FALSE, FALSE, 5);
- gtk_signal_connect(GTK_OBJECT(warn), "clicked", GTK_SIGNAL_FUNC(do_warn), w);
-
cancel = picture_button(w->window, _("Cancel"), cancel_xpm);
gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5);
gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), w->window);
+ warn = picture_button(w->window, _("Warn"), warn_xpm);
+ gtk_box_pack_end(GTK_BOX(bbox), warn, FALSE, FALSE, 5);
+ gtk_signal_connect(GTK_OBJECT(warn), "clicked", GTK_SIGNAL_FUNC(do_warn), w);
+
gtk_widget_show(w->window);
}
+void do_remove_buddy(GtkWidget *w, struct buddy *b)
+{
+ struct group *g = find_group_by_buddy(b->gc, b->name);
+ struct gaim_connection *gc = b->gc;
+ struct conversation *cv;
+
+ if (!b)
+ return;
+
+ debug_printf(_("Removing '%s' from buddylist.\n"), b->name);
+ serv_remove_buddy(b->gc, b->name, g->name);
+ remove_buddy(gc, g, b);
+ do_export(gc);
+ build_edit_tree();
+
+ cv = find_conversation(b->name);
+
+ if (cv)
+ update_convo_add_button(cv);
+
+}
+
+void toggle_confirm_del_cb(GtkWidget *w, int opt)
+{
+ im_options = im_options ^ opt;
+}
+
+void show_confirm_del(struct gaim_connection *gc, gchar *name)
+{
+ struct confirm_del *b = g_new0(struct confirm_del, 1);
+ struct buddy *bd;
+ GtkWidget *hbox;
+ GtkWidget *vbox;
+ GtkWidget *fbox;
+ GtkWidget *frame;
+ gchar tmp[2048];
+ GAIM_DIALOG(b->window);
+ dialogwindows = g_list_prepend(dialogwindows, b->window);
+
+ g_snprintf(tmp, sizeof(tmp), _("Gaim - Remove %s?"), name);
+ gtk_window_set_title(GTK_WINDOW(b->window), tmp);
+ gtk_window_set_wmclass(GTK_WINDOW(b->window), "confirm_del", "Gaim");
+ gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, FALSE, TRUE);
+ gtk_signal_connect(GTK_OBJECT(b->window), "delete_event",
+ GTK_SIGNAL_FUNC(destroy_dialog), b->window);
+
+ gtk_widget_realize(b->window);
+
+ vbox = gtk_vbox_new(FALSE, 5);
+ gtk_container_add(GTK_CONTAINER(b->window), vbox);
+ gtk_widget_show(vbox);
+
+ frame = gtk_frame_new(_("Remove Buddy"));
+ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
+ gtk_widget_show(frame);
+
+ fbox = gtk_vbox_new(FALSE, 5);
+ gtk_container_add(GTK_CONTAINER(frame), fbox);
+ gtk_container_set_border_width(GTK_CONTAINER(fbox), 5);
+ gtk_widget_show(fbox);
+
+ g_snprintf(tmp, sizeof(tmp), _("You are about to remove '%s' from\nyour buddylist. Do you want to continue?"), name);
+ b->label = gtk_label_new(tmp);
+ gtk_misc_set_alignment(GTK_MISC(b->label), 0, 0.5);
+ gtk_label_set_justify(GTK_LABEL(b->label), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(fbox), b->label, FALSE, FALSE, 0);
+ gtk_widget_show(b->label);
+
+ b->checkbox = gtk_check_button_new_with_label(_("Do not ask me this question again"));
+ gtk_signal_connect(GTK_OBJECT(b->checkbox), "clicked",
+ GTK_SIGNAL_FUNC(toggle_confirm_del_cb), (int *)OPT_IM_DONT_CONFIRM_DEL);
+ gtk_box_pack_start(GTK_BOX(fbox), b->checkbox, FALSE, FALSE, 0);
+ gtk_widget_show(b->checkbox);
+
+ hbox = gtk_hbox_new(FALSE, 5);
+ gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, FALSE, 0);
+ gtk_widget_show(hbox);
+
+ b->ok = picture_button(b->window, _("Accept"), ok_xpm);
+ gtk_box_pack_start(GTK_BOX(hbox), b->ok, FALSE, FALSE, 5);
+
+ bd = find_buddy(gc, name);
+
+ if (bd)
+ gtk_signal_connect(GTK_OBJECT(b->ok), "clicked", GTK_SIGNAL_FUNC(do_remove_buddy), bd);
+
+ gtk_signal_connect(GTK_OBJECT(b->ok), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
+
+ b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm);
+ gtk_box_pack_start(GTK_BOX(hbox), b->cancel, FALSE, FALSE, 5);
+ gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
+
+ gtk_widget_show(b->window);
+}
+
+
+
/*------------------------------------------------------------------------*/
/* The dialog for getting an error */
/*------------------------------------------------------------------------*/
@@ -3758,6 +3866,7 @@
gtk_widget_show_all(rename_dialog);
}
+
/*------------------------------------------------------------------------*/
/* The dialog for renaming buddies */
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- gaim.h 2001/11/15 22:47:03 1.292
+++ gaim.h 2001/11/18 04:19:49 1.293
@@ -242,6 +242,7 @@
#define OPT_IM_SIDE_TAB 0x00000020
#define OPT_IM_BR_TAB 0x00000040
#define OPT_IM_HIDE_ICONS 0x00000080
+#define OPT_IM_DONT_CONFIRM_DEL 0x00000100
extern guint chat_options;
#define OPT_CHAT_ONE_WINDOW 0x00000001
@@ -338,6 +339,7 @@
extern void show_find_email(struct gaim_connection *);
extern void show_find_info(struct gaim_connection *);
extern void show_set_info(struct gaim_connection *);
+extern void show_confirm_del(struct gaim_connection *, gchar *);
/* Functions in gaimrc.c */
extern gint sort_awaymsg_list(gconstpointer, gconstpointer);
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- prefs.c 2001/11/15 22:47:04 1.197
+++ prefs.c 2001/11/18 04:19:49 1.198
@@ -906,6 +906,7 @@
vbox2);
gaim_button(_("Raise windows on events"), &im_options, OPT_IM_POPUP, vbox2);
gaim_button(_("Show logins in window"), &im_options, OPT_IM_LOGON, vbox2);
+ gaim_button(_("Do not confirm removing of buddies"), &im_options, OPT_IM_DONT_CONFIRM_DEL, vbox2);
frame = gtk_frame_new(_("Window Sizes"));
gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
|
|
From: Rob F. <rob...@us...> - 2001-11-18 06:10:58
|
Update of /cvsroot/gaim/gaim In directory usw-pr-cvs1:/tmp/cvs-serv23546 Modified Files: ChangeLog Log Message: oops Index: ChangeLog =================================================================== RCS file: /cvsroot/gaim/gaim/ChangeLog,v retrieving revision 1.355 retrieving revision 1.356 diff -u -d -r1.355 -r1.356 --- ChangeLog 2001/11/15 22:47:02 1.355 +++ ChangeLog 2001/11/18 04:20:05 1.356 @@ -2,6 +2,7 @@ version 0.49: * Can compile against GTK+ 2.0 (version 1.3.10) + * Confirm before removing buddies version 0.48 (11/18/2001): * Right-click on links to open/copy URL |
6 messages has been excluded from this view by a project administrator.
