pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.97,1.98

[Adam F. <mi...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv9093

Modified Files:
	oscar.c 
Log Message:
I am not a pronoun.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- oscar.c	23 Feb 2002 23:10:39 -0000	1.97
+++ oscar.c	24 Feb 2002 00:54:23 -0000	1.98
@@ -1678,7 +1678,7 @@
 			"<IMG SRC=\"aol_icon.gif\"> : AOL User <br>"
 			"<IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br>"
 			"<IMG SRC=\"admin_icon.gif\"> : Administrator <br>"
-			"<IMG SRC=\"ab_icon.gif\"> : ActiveBuddy <br>"));
+			"<IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive Agent<br>"));
 
 	if (info->membersince)
 		asc = g_strdup_printf("Member Since : <B>%s</B><BR>\n",
@@ -2451,7 +2451,7 @@
 
 static void oscar_set_away(struct gaim_connection *gc, char *state, char *message) {
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
-	char away[1025];
+	char away[4096];
 	if (!od->icq) {
 		if (message)
 			g_snprintf(away, sizeof(away), "%s", message);
@@ -2460,8 +2460,8 @@
 			g_free (gc->away);
 		gc->away = NULL;
 		if (message) {
-			if (strlen(message) > 1024)
-				do_error_dialog("Maximum away length (1024) exceeded, truncating",
+			if (strlen(message) > sizeof(away))
+				do_error_dialog("Maximum away length exceeded, truncating",
 						"Info Too Long");
 			gc->away = g_strdup (message);
 		}

[Gaim-commits] CVS: gaim ChangeLog,1.398,1.399

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv24794

Modified Files:
	ChangeLog 
Log Message:
Commition



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -d -r1.398 -r1.399
--- ChangeLog	23 Feb 2002 23:24:31 -0000	1.398
+++ ChangeLog	23 Feb 2002 23:42:20 -0000	1.399
@@ -8,6 +8,7 @@
 	* Ability to change formatting of Oscar screen name
 	* Better selection in HTML widget (Thanks BMiller)
 	* New icons for ICQ (Thanks Kevin Miller)
+	* Editable buddy pounces (Thanks Jason Willis)
 
 version 0.52 (02/17/2002):
 	* Better buddy icon transparency (thanks SeanEgan)

[Gaim-commits] CVS: gaim/src buddy.c,1.285,1.286 dialogs.c,1.300,1.301 gaim.h,1.306,1.307 ui.h,1.29,1.30

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv24631

Modified Files:
	buddy.c dialogs.c gaim.h ui.h 
Log Message:
Funky :) Editable buddy pouncen



Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -d -r1.285 -r1.286
--- buddy.c	23 Feb 2002 22:50:43 -0000	1.285
+++ buddy.c	23 Feb 2002 23:41:50 -0000	1.286
@@ -1538,11 +1538,17 @@
 static void new_bp_callback(GtkWidget *w, struct buddy *b)
 {
 	if (b)
-		show_new_bp(b->name, b->gc, b->idle, b->uc & UC_UNAVAILABLE);
+		show_new_bp(b->name, b->gc, b->idle, b->uc & UC_UNAVAILABLE, NULL);
 	else
-		show_new_bp(NULL, NULL, 0, 0);
+		show_new_bp(NULL, NULL, 0, 0, NULL);
+}
+
+static void edit_bp_callback(GtkWidget *w, struct buddy_pounce *b)
+{
+  show_new_bp(NULL, NULL, 0, 0, b);
 }
 
+static GtkTooltips *bp_tooltip = NULL;
 void do_bp_menu()
 {
 	GtkWidget *menuitem, *mess, *messmenu;
@@ -1553,6 +1559,10 @@
 	struct buddy_pounce *b;
 	GList *bp = buddy_pounces;
 
+	/* Tooltip for editing bp's */
+	if(!bp_tooltip)
+		bp_tooltip = gtk_tooltips_new();
+
 	l = gtk_container_children(GTK_CONTAINER(bpmenu));
 
 	while (l) {
@@ -1608,8 +1618,9 @@
 
 		mess = gtk_menu_item_new_with_label(b->message);
 		gtk_menu_append(GTK_MENU(messmenu), mess);
+		gtk_tooltips_set_tip(bp_tooltip, GTK_WIDGET(mess), _("[Click to edit]"), NULL);
 		gtk_widget_show(mess);
-
+		gtk_signal_connect(GTK_OBJECT(mess), "activate", GTK_SIGNAL_FUNC(edit_bp_callback), b);
 		bp = bp->next;
 
 	}

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- dialogs.c	22 Feb 2002 23:47:55 -0000	1.300
+++ dialogs.c	23 Feb 2002 23:41:50 -0000	1.301
@@ -154,6 +154,7 @@
 	GtkWidget *soundentry;
 
 	struct aim_user *user;
+	struct buddy_pounce *buddy_pounce;
 };
 
 struct findbyemail {
@@ -1077,14 +1078,19 @@
 
 void do_new_bp(GtkWidget *w, struct addbp *b)
 {
-	struct buddy_pounce *bp = g_new0(struct buddy_pounce, 1);
-
+	struct buddy_pounce *bp;
+	
 	if (strlen(gtk_entry_get_text(GTK_ENTRY(b->nameentry))) == 0) {
 		do_error_dialog(_("Please enter a buddy to pounce."), _("Buddy Pounce Error"));
-		g_free(bp);
 		return;
 	}
 
+        if(!b->buddy_pounce)
+		bp = g_new0(struct buddy_pounce, 1);
+	else
+		bp = b->buddy_pounce;
+
+	
 	g_snprintf(bp->name, 80, "%s", gtk_entry_get_text(GTK_ENTRY(b->nameentry)));
 	g_snprintf(bp->message, 2048, "%s", gtk_entry_get_text(GTK_ENTRY(b->messentry)));
 	g_snprintf(bp->command, 2048, "%s", gtk_entry_get_text(GTK_ENTRY(b->commentry)));
@@ -1122,7 +1128,8 @@
 	if (GTK_TOGGLE_BUTTON(b->save)->active)
 		bp->options |= OPT_POUNCE_SAVE;
 
-	buddy_pounces = g_list_append(buddy_pounces, bp);
+	if(!b->buddy_pounce)
+		buddy_pounces = g_list_append(buddy_pounces, bp);
 
 	do_bp_menu();
 
@@ -1179,7 +1186,7 @@
 }
 
 
-void show_new_bp(char *name, struct gaim_connection *gc, int idle, int away)
+void show_new_bp(char *name, struct gaim_connection *gc, int idle, int away, struct buddy_pounce *edit_bp)
 {
 	GtkWidget *label;
 	GtkWidget *bbox;
@@ -1190,7 +1197,14 @@
 	GtkWidget *optmenu;
 
 	struct addbp *b = g_new0(struct addbp, 1);
-	b->user = gc ? gc->user : aim_users->data;
+	
+	if(edit_bp) {
+		b->buddy_pounce = edit_bp;
+		b->user = find_user(edit_bp->pouncer, edit_bp->protocol);
+	} else {
+		b->user = gc ? gc->user : aim_users->data;
+		b->buddy_pounce = NULL;
+	}
 
 	GAIM_DIALOG(b->window);
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
@@ -1236,6 +1250,8 @@
 	gtk_table_attach(GTK_TABLE(table), b->nameentry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	if (name !=NULL)
 		gtk_entry_set_text(GTK_ENTRY(b->nameentry), name);
+	else if(edit_bp)
+		gtk_entry_set_text(GTK_ENTRY(b->nameentry), edit_bp->name);
 	gtk_window_set_focus(GTK_WINDOW(b->window), b->nameentry);
 	gtk_widget_show(b->nameentry);
 	/* </pounce type="who"> */
@@ -1253,19 +1269,29 @@
 	gtk_widget_show(table);
 	
 	b->p_signon = gtk_check_button_new_with_label(_("Pounce on sign on"));
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->p_signon), TRUE);
+	if(edit_bp)
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->p_signon), 
+		                           (edit_bp->options & OPT_POUNCE_SIGNON) ? TRUE : FALSE);
+	else
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->p_signon), TRUE);
 	gtk_table_attach(GTK_TABLE(table), b->p_signon, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->p_signon);
 
 	b->p_unaway = gtk_check_button_new_with_label(_("Pounce on return from away"));
 	if (away)
 		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->p_unaway), TRUE);
+	else if(edit_bp)
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->p_unaway), 
+					   (edit_bp->options & OPT_POUNCE_UNAWAY) ? TRUE : FALSE);
 	gtk_table_attach(GTK_TABLE(table), b->p_unaway, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	gtk_widget_show(b->p_unaway);
 
 	b->p_unidle = gtk_check_button_new_with_label(_("Pounce on return from idle"));
 	if (idle)
 		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->p_unidle), TRUE);
+	else if(edit_bp)
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->p_unidle), 
+				           (edit_bp->options & OPT_POUNCE_UNIDLE) ? TRUE : FALSE);
 	gtk_table_attach(GTK_TABLE(table), b->p_unidle, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->p_unidle);
 
@@ -1287,59 +1313,95 @@
 	gtk_widget_show(table);
 	
 	b->openwindow = gtk_check_button_new_with_label(_("Open IM Window"));
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->openwindow), FALSE);
+	if(edit_bp)
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->openwindow), 
+			                   (edit_bp->options & OPT_POUNCE_POPUP) ? TRUE : FALSE);
+	else
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->openwindow), FALSE);
 	gtk_table_attach(GTK_TABLE(table), b->openwindow, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->openwindow);
-
+	
 	b->popupnotify = gtk_check_button_new_with_label(_("Popup Notification"));
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->popupnotify), FALSE);
+	if(edit_bp)
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->popupnotify), 
+					   (edit_bp->options & OPT_POUNCE_NOTIFY) ? TRUE : FALSE);
+	else
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->popupnotify), FALSE);
 	gtk_table_attach(GTK_TABLE(table), b->popupnotify, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->popupnotify);
 
 	b->sendim = gtk_check_button_new_with_label(_("Send Message"));
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sendim), TRUE);
+	if(edit_bp)
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sendim), 
+					   (edit_bp->options & OPT_POUNCE_SEND_IM) ? TRUE : FALSE);
+	else
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sendim), TRUE);
 	gtk_table_attach(GTK_TABLE(table), b->sendim, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->sendim);
 
 	b->messentry = gtk_entry_new();
 	gtk_table_attach(GTK_TABLE(table), b->messentry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	gtk_signal_connect(GTK_OBJECT(b->messentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b);
+	if(edit_bp) {
+		gtk_widget_set_sensitive(GTK_WIDGET(b->messentry), 
+					(edit_bp->options & OPT_POUNCE_SEND_IM) ? TRUE : FALSE);
+		gtk_entry_set_text(GTK_ENTRY(b->messentry), edit_bp->message);
+	}
 	gtk_widget_show(b->messentry);
 
-	gtk_signal_connect(GTK_OBJECT(b->sendim), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), 
-			b->messentry);
+	gtk_signal_connect(GTK_OBJECT(b->sendim), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive),	b->messentry);
 
 	b->command = gtk_check_button_new_with_label(_("Execute command on pounce"));
 	gtk_table_attach(GTK_TABLE(table), b->command, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+	if(edit_bp)
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->command),
+					   (edit_bp->options & OPT_POUNCE_COMMAND) ? TRUE : FALSE);
+	else
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->command), FALSE);
 	gtk_widget_show(b->command);
 
 	b->commentry = gtk_entry_new();
 	gtk_table_attach(GTK_TABLE(table), b->commentry, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	gtk_signal_connect(GTK_OBJECT(b->commentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b);
+	if(edit_bp) {
+		gtk_widget_set_sensitive(GTK_WIDGET(b->commentry), 
+					(edit_bp->options & OPT_POUNCE_COMMAND) ? TRUE : FALSE);
+		gtk_entry_set_text(GTK_ENTRY(b->commentry), edit_bp->command);
+	}
+	else
+		gtk_widget_set_sensitive(GTK_WIDGET(b->commentry), FALSE);
 	gtk_widget_show(b->commentry);
-
-	gtk_widget_set_sensitive(b->commentry, FALSE);
-	gtk_signal_connect(GTK_OBJECT(b->command), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive),
-			   b->commentry);
-
+	gtk_signal_connect(GTK_OBJECT(b->command), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), b->commentry);
+	
 	b->sound = gtk_check_button_new_with_label(_("Play sound on pounce"));
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sound), FALSE);
+	if(edit_bp)
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sound), 
+					   (edit_bp->options & OPT_POUNCE_SOUND) ? TRUE : FALSE);
+	else
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sound), FALSE);
 	gtk_table_attach(GTK_TABLE(table), b->sound, 0, 1, 3, 4, GTK_FILL, 0, 0, 0);
 	gtk_widget_show(b->sound);
 
 	b->soundentry = gtk_entry_new();
 	gtk_table_attach(GTK_TABLE(table), b->soundentry, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 	gtk_signal_connect(GTK_OBJECT(b->soundentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b);
+	if(edit_bp) {
+		gtk_widget_set_sensitive(GTK_WIDGET(b->soundentry), 
+					(edit_bp->options & OPT_POUNCE_SOUND) ? TRUE : FALSE);
+		gtk_entry_set_text(GTK_ENTRY(b->soundentry), edit_bp->sound);
+	} else 
+		gtk_widget_set_sensitive(GTK_WIDGET(b->soundentry), FALSE);
 	gtk_widget_show(b->soundentry);
-
-	gtk_widget_set_sensitive(b->soundentry, FALSE);
-	gtk_signal_connect(GTK_OBJECT(b->sound), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive),
-			   b->soundentry);
+	gtk_signal_connect(GTK_OBJECT(b->sound), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), b->soundentry);
 	/* </pounce type="action"> */
 
 	b->save = gtk_check_button_new_with_label(_("Save this pounce after activation"));
 	gtk_container_set_border_width(GTK_CONTAINER(b->save), 7);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->save), FALSE);
+	if(edit_bp)
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->save),
+					   (edit_bp->options & OPT_POUNCE_SAVE) ? TRUE : FALSE);
+	else
+		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->save), FALSE);
 	gtk_box_pack_start(GTK_BOX(vbox), b->save, FALSE, FALSE, 0);
 	gtk_widget_show(b->save);
 

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- gaim.h	22 Feb 2002 23:47:55 -0000	1.306
+++ gaim.h	23 Feb 2002 23:41:50 -0000	1.307
@@ -159,18 +159,6 @@
 
 #define OPT_POUNCE_NOTIFY	0x200
 
-struct buddy_pounce {
-        char name[80];
-        char message[2048];
-	char command[2048];
-	char sound[2048];
-	
-	char pouncer[80];
-	int protocol;
-
-	int options;
-};
-
 #define CONVERSATION_TITLE "%s - Gaim"
 #define LOG_CONVERSATION_TITLE "%s - Gaim (logged)"
 

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ui.h	17 Feb 2002 18:08:12 -0000	1.29
+++ ui.h	23 Feb 2002 23:41:50 -0000	1.30
@@ -194,6 +194,25 @@
 	char message[2048];
 };
 
+/****************************
+ * I thought I'd place these here by the same reasoning used above (for away_message)
+ * This helps aleviate warnings from dialogs.c where the show_new_bp function references
+ * buddy_pounce in the parameter list when ui.h doesn't know about buddy_pounce
+ * **************************
+ */
+struct buddy_pounce {
+        char name[80];
+        char message[2048];
+        char command[2048];
+        char sound[2048];
+        
+        char pouncer[80];
+        int protocol;
+
+        int options;
+};
+
+
 /* this is used for queuing messages received while away. This is really a UI function
  * which is why the struct is here. */
 struct queued_message {
@@ -392,7 +411,7 @@
 extern void destroy_all_dialogs();
 extern void show_import_dialog();
 extern void show_export_dialog();
-extern void show_new_bp(char *, struct gaim_connection *, int, int);
+extern void show_new_bp(char *, struct gaim_connection *, int, int, struct buddy_pounce *);
 extern void show_log(char *);
 extern void show_log_dialog(struct conversation *);
 extern void show_fgcolor_dialog(struct conversation *c, GtkWidget *color);

[Gaim-commits] CVS: gaim/src applet.c,1.27,1.28

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv21945

Modified Files:
	applet.c 
Log Message:
More bleep blops



Index: applet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- applet.c	4 Dec 2001 07:53:54 -0000	1.27
+++ applet.c	23 Feb 2002 23:28:49 -0000	1.28
@@ -482,7 +482,7 @@
 {
 	if (state == signing_on)
 		connecting++;
-	else if ((state == away || state == online) && connecting > 0)
+	else if ((state == offline || state == away || state == online) && connecting > 0)
 		connecting--;
 	update_applet();
 }

[Gaim-commits] CVS: gaim/pixmaps gnomeicu-away.xpm,1.3,1.4 gnomeicu-dnd.xpm,1.2,1.3 gnomeicu-ffc.xpm,1.2,1.3 gnomeicu-na.xpm,1.2,1.3 gnomeicu-occ.xpm,1.2,1.3 gnomeicu-offline.xpm,1.3,1.4 gnomeicu-online.xpm,1.2,1.3

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/pixmaps
In directory usw-pr-cvs1:/tmp/cvs-serv21098/pixmaps

Modified Files:
	gnomeicu-away.xpm gnomeicu-dnd.xpm gnomeicu-ffc.xpm 
	gnomeicu-na.xpm gnomeicu-occ.xpm gnomeicu-offline.xpm 
	gnomeicu-online.xpm 
Log Message:
Better icons for ICQ.



Index: gnomeicu-away.xpm
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/gnomeicu-away.xpm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gnomeicu-away.xpm	20 Nov 2001 21:09:54 -0000	1.3
+++ gnomeicu-away.xpm	23 Feb 2002 23:24:32 -0000	1.4
@@ -1,44 +1,28 @@
 /* XPM */
 static char * icon_away_xpm[] = {
-"12 12 28 1",
-" 	c None",
-".	c #8B8B8B",
-"+	c #FFFF00",
-"@	c #999900",
-"#	c #7F7F7F",
-"$	c #0B483A",
-"%	c #006DFF",
-"&	c #093C30",
-"*	c #4C4C4C",
-"=	c #0D5645",
-"-	c #175B40",
-";	c #0D5041",
-">	c #0E5948",
-",	c #0E5747",
-"'	c #84B9FF",
-")	c #0C4D3E",
-"!	c #0D5444",
-"~	c #0B4639",
-"{	c #0B4437",
-"]	c #0C4F40",
-"^	c #0A3F33",
-"/	c #0B4A3C",
-"(	c #0C4B3D",
-"_	c #0B3C31",
-":	c #0E4337",
-"<	c #0C3F33",
-"[	c #09382D",
-"}	c #09382E",
-".++@+..+..# ",
-".+@@+$+@+&#*",
-".++++-+@@+#*",
-".;>,',,++&#*",
-".),>!')~'&#*",
-".')!])~~^&#*",
-".~~++)'~%_#*",
-".^++@<[}}&#*",
-"##++@######*",
-" ****##*****",
-"    ###*    ",
-"  .######*  "};
-
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+"  c black",
+". c #00fc00",
+"X c #808080",
+"o c #c0c0c0",
+"O c #f8fcf8",
+"+ c None",
+/* pixels */
+"+++++ O  +++++++",
+"++++ O O      ++",
+"++      .  o . +",
+"+ O   O.. oO . +",
+"+ O.  O. oOO  ++",
+"++  .   oOOOo ++",
+"      XOOOOOO ++",
+" O  oOOOOOOOOo +",
+"+ oOOOOOOOOOOO +",
+"+  OOOOOOOOOOOo ",
+"   oOOOOOOOOo  +",
+" O. OOOOOOo  +++",
+" OO oOOOo  .. ++",
+"+  + OOo  O.. ++",
+"++++ o  +  O  ++",
+"++++   ++++  +++"
+};

Index: gnomeicu-dnd.xpm
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/gnomeicu-dnd.xpm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnomeicu-dnd.xpm	20 Nov 2001 20:19:43 -0000	1.2
+++ gnomeicu-dnd.xpm	23 Feb 2002 23:24:32 -0000	1.3
@@ -1,33 +1,28 @@
 /* XPM */
 static char * icon_dnd_xpm[] = {
-"12 14 16 1",
-" 	c None",
-".	c #C1BB7C",
-"+	c #CFC395",
-"@	c #D2BE94",
-"#	c #A69C45",
-"$	c #A49A43",
-"%	c #AD9C53",
-"&	c #908125",
-"*	c #726751",
-"=	c #867B23",
-"-	c #84760E",
-";	c #72660E",
-">	c #7B4900",
-",	c #FFFFFF",
-"'	c #000000",
-")	c #666666",
-"      .     ",
-"     +#     ",
-"     $&     ",
-"   * =-;*   ",
-"  *   >  *  ",
-" *        * ",
-"*          *",
-",,,,,,,,,,,,",
-",'',,',','',",
-",',',')',','",
-",',',')',','",
-",'',,',','',",
-",,,,,,,,,,,,",
-"************"};
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+"  c black",
+". c #00fc00",
+"X c #800000",
+"o c #f80000",
+"O c #f8fcf8",
+"+ c None",
+/* pixels */
+"+++++++  +++++++",
+"++++++ O. +   ++",
+"++  + O..   O. +",
+"+ O   O..  O.. +",
+"+ O. XX.XXO.. ++",
+"++ OXooXooX. +++",
+"   XoOoooOoX +++",
+" O.XooOoOooX  ++",
+"+ O.XooOooX... +",
+"+  XooOoOooX..  ",
+"  OXoOoooOoX   +",
+" O..XooXooX  +++",
+" OO  XX.XX... ++",
+"+  + O.   O.. ++",
+"++++ O  +  O  ++",
+"++++   ++++  +++"
+};

Index: gnomeicu-ffc.xpm
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/gnomeicu-ffc.xpm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnomeicu-ffc.xpm	20 Nov 2001 20:19:43 -0000	1.2
+++ gnomeicu-ffc.xpm	23 Feb 2002 23:24:32 -0000	1.3
@@ -1,108 +1,28 @@
 /* XPM */
 static char * icon_ffc_xpm[] = {
-"12 14 91 1",
-" 	c None",
-".	c #000000",
-"+	c #A9A943",
-"@	c #BFBF4B",
-"#	c #1A1A0A",
-"$	c #B6B648",
-"%	c #FCFC64",
-"&	c #EDED5E",
-"*	c #E5E55A",
-"=	c #75752E",
-"-	c #FAFA63",
-";	c #DBDB57",
-">	c #CBCB50",
-",	c #DADA56",
-"'	c #353515",
-")	c #7F7F32",
-"!	c #E9E95C",
-"~	c #B2B247",
-"{	c #D5D555",
-"]	c #E6E65B",
-"^	c #7A7A30",
-"/	c #E5E55B",
-"(	c #566A56",
-"_	c #738D73",
-":	c #738C73",
-"<	c #7B827B",
-"[	c #363615",
-"}	c #CACA4F",
-"|	c #28520F",
-"1	c #008F00",
-"2	c #009B00",
-"3	c #009100",
-"4	c #578357",
-"5	c #535353",
-"6	c #282810",
-"7	c #FEFE64",
-"8	c #FFFF65",
-"9	c #20450D",
-"0	c #00B000",
-"a	c #00B500",
-"b	c #009E00",
-"c	c #009200",
-"d	c #1D231D",
-"e	c #A8A942",
-"f	c #BEBF4A",
-"g	c #8F8F38",
-"h	c #004A00",
-"i	c #00A800",
-"j	c #009F00",
-"k	c #758F75",
-"l	c #005500",
-"m	c #005F00",
-"n	c #006000",
-"o	c #005E00",
-"p	c #005A00",
-"q	c #009000",
-"r	c #758E75",
-"s	c #00A600",
-"t	c #01AA01",
-"u	c #01A901",
-"v	c #00AB00",
-"w	c #00AA00",
-"x	c #009A00",
-"y	c #029002",
-"z	c #598359",
-"A	c #788778",
-"B	c #2B8E2B",
-"C	c #309230",
-"D	c #2F8F2F",
-"E	c #2C862C",
-"F	c #2D8B2D",
-"G	c #2B832B",
-"H	c #2A832A",
-"I	c #2A862A",
-"J	c #648164",
-"K	c #454545",
-"L	c #656565",
-"M	c #787878",
-"N	c #808080",
-"O	c #7E7E7E",
-"P	c #797979",
-"Q	c #4F4F4F",
-"R	c #5F5F5F",
-"S	c #818181",
-"T	c #737373",
-"U	c #383838",
-"V	c #6F6F6F",
-"W	c #7F7F7F",
-"X	c #7D7D7D",
-"Y	c #717171",
-"Z	c #525252",
-" .+@@@+.    ",
-"#$%&*&%+.   ",
-"=--;>;-,'   ",
-")!~~~~~]^   ",
-"^%%&*&%%^:< ",
-"[>-;>;->|345",
-" 6!77789bc45",
-"  def@ghj345",
-"  klmnopbq45",
-"  rstuvwxyz5",
-"  ABCDEFHIJ5",
-"  KLLMNOLLLQ",
-"     RSOU   ",
-"    VMWOYZ  "};
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+"  c black",
+". c navy",
+"X c green",
+"o c yellow",
+"O c white",
+"+ c None",
+/* pixels */
+"+++++++  +++++++",
+"++++++ OX +   ++",
+"++  + OXX   OX +",
+"+ OX   XX  OXX +",
+"+ O         X ++",
+"++  Ooooooo  +++",
+"   Oo..o..oo +++",
+" O Ooooooooo  ++",
+"+  Oo.ooo.oo X +",
+"+   Oo...oo XX  ",
+"  OX Oooo      +",
+" OXX   o XX  +++",
+" OO  O   OXXX ++",
+"+  + OX   OXX ++",
+"++++ O  +  O  ++",
+"++++   ++++  +++"
+};

Index: gnomeicu-na.xpm
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/gnomeicu-na.xpm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnomeicu-na.xpm	20 Nov 2001 20:19:43 -0000	1.2
+++ gnomeicu-na.xpm	23 Feb 2002 23:24:32 -0000	1.3
@@ -1,95 +1,27 @@
 /* XPM */
 static char * icon_na_xpm[] = {
-"12 14 78 1",
-" 	c None",
-".	c #F9F900",
-"+	c #F9E100",
-"@	c #897B00",
-"#	c #CFCF2C",
-"$	c #888C78",
-"%	c #7C7E7E",
-"&	c #B3B300",
-"*	c #96A911",
-"=	c #737E61",
-"-	c #535353",
-";	c #8A8F7A",
-">	c #86A821",
-",	c #86AB23",
-"'	c #AAC95C",
-")	c #377553",
-"!	c #1A5F48",
-"~	c #91BB62",
-"{	c #CCCC00",
-"]	c #A5B20C",
-"^	c #80885F",
-"/	c #77817F",
-"(	c #0C5041",
-"_	c #0E5747",
-":	c #2074B8",
-"<	c #14606F",
-"[	c #508EB2",
-"}	c #1B6169",
-"|	c #7BA158",
-"1	c #548068",
-"2	c #5A6A66",
-"3	c #77807E",
-"4	c #0B483A",
-"5	c #0C5141",
-"6	c #0B5455",
-"7	c #0B5047",
-"8	c #1C5B59",
-"9	c #0B4639",
-"0	c #124B43",
-"a	c #124641",
-"b	c #2A626A",
-"c	c #54898E",
-"d	c #A6BA13",
-"e	c #5F8827",
-"f	c #165247",
-"g	c #8CB4A9",
-"h	c #EEEE00",
-"i	c #EDED00",
-"j	c #676740",
-"k	c #797F7D",
-"l	c #3E6240",
-"m	c #98AB13",
-"n	c #C8C800",
-"o	c #CECE20",
-"p	c #3E5D49",
-"q	c #506837",
-"r	c #BBBB00",
-"s	c #BABA00",
-"t	c #EAEA00",
-"u	c #454545",
-"v	c #797951",
-"w	c #B7B714",
-"x	c #C7C72A",
-"y	c #8F8F71",
-"z	c #7E7E7E",
-"A	c #87876A",
-"B	c #A5A526",
-"C	c #595946",
-"D	c #767655",
-"E	c #818181",
-"F	c #737373",
-"G	c #383838",
-"H	c #6F6F6F",
-"I	c #787878",
-"J	c #7F7F7F",
-"K	c #7D7D7D",
-"L	c #717171",
-"M	c #525252",
-".......+.+  ",
-".@..@.+@+.  ",
-".@@.@+@+@+  ",
-".@.@@.@@@+  ",
-".@.+@+@+@+% ",
-"++++++++++=-",
-" ;>,')!~{]^-",
-" /(_:<[}|12-",
-" 34567890a2-",
-" 3bcdefghi.j",
-" klmnopqrstj",
-" uvwxyzABBBC",
-"    DEzFG   ",
-"   HIJzKLM  "};
+/* columns rows colors chars-per-pixel */
+"16 16 5 1",
+"  c black",
+". c #00fc00",
+"X c #f80000",
+"o c #f8fcf8",
+"O c None",
+/* pixels */
+"OOOOOOO  OOOOOOO",
+"OOOOOO o. O   OO",
+"OO  O o..   o. O",
+"O o   o..  o.. O",
+"OXXXXXXXXXXXXXXO",
+"XXooooooooooooXX",
+"Xo oo ooo o  ooX",
+"Xo  o oo o oo oX",
+"Xo o  oo o    oX",
+"Xo oo o oo oo oX",
+"Xo oo o oo oo oX",
+"XXooooooooooooXX",
+"OXXXXXXXXXXXXXXO",
+"O  O o.   o.. OO",
+"OOOO o  O  o  OO",
+"OOOO   OOOO  OOO"
+};

Index: gnomeicu-occ.xpm
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/gnomeicu-occ.xpm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnomeicu-occ.xpm	20 Nov 2001 20:19:43 -0000	1.2
+++ gnomeicu-occ.xpm	23 Feb 2002 23:24:32 -0000	1.3
@@ -1,82 +1,28 @@
 /* XPM */
 static char * icon_occ_xpm[] = {
-"12 14 65 1",
-" 	c None",
-".	c #89898D",
-"+	c #80809E",
-"@	c #7F7F9E",
-"#	c #7F7F88",
-"$	c #86879A",
-"%	c #6870ED",
-"&	c #5F6DED",
-"*	c #5F6CED",
-"=	c #5E6CED",
-"-	c #5C6AEC",
-";	c #5969EA",
-">	c #636DEB",
-",	c #797AA0",
-"'	c #535353",
-")	c #919394",
-"!	c #A7BEC9",
-"~	c #84ACC0",
-"{	c #79A0B4",
-"]	c #88B0C4",
-"^	c #79A0B5",
-"/	c #739CB2",
-"(	c #73A0B7",
-"_	c #98B6C5",
-":	c #8E9395",
-"<	c #7BA2B6",
-"[	c #658B9E",
-"}	c #6F95A9",
-"|	c #7AA3B7",
-"1	c #6890A3",
-"2	c #77A4BB",
-"3	c #97B6C5",
-"4	c #A5BCC8",
-"5	c #85AFC5",
-"6	c #82ABC1",
-"7	c #80AAC0",
-"8	c #83AFC6",
-"9	c #7BA8BF",
-"0	c #7CABC2",
-"a	c #97B5C5",
-"b	c #A6BCC7",
-"c	c #7FA3B6",
-"d	c #7294A5",
-"e	c #7194A5",
-"f	c #7396A7",
-"g	c #81A9BD",
-"h	c #789DB0",
-"i	c #9DB8C5",
-"j	c #8B8C8D",
-"k	c #A1ABB0",
-"l	c #898C8E",
-"m	c #6D6C6D",
-"n	c #656565",
-"o	c #787878",
-"p	c #808080",
-"q	c #7E7E7E",
-"r	c #797979",
-"s	c #4F4F4F",
-"t	c #777777",
-"u	c #818181",
-"v	c #737373",
-"w	c #505050",
-"x	c #7F7F7F",
-"y	c #7D7D7D",
-"z	c #626262",
-".+++@@@+@#  ",
-"$%&&*=-;>,' ",
-")!~{]^/(_:' ",
-")!<[}|123:' ",
-")4567890a:' ",
-")bcdefghi:' ",
-"jkkkkkkkkl' ",
-"mnnopqrnnns ",
-"   tuqvw    ",
-"  qqxqytz   ",
-" sss        ",
-" s s ss ss  ",
-" s s s  s   ",
-" sss ss ss s"};
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+"  c black",
+". c #00fc00",
+"X c #f80000",
+"o c #808080",
+"O c #f8fcf8",
+"+ c None",
+/* pixels */
+"+++++++  +++++++",
+"++++++ O. +   ++",
+"++  + O .   O. +",
+"+ O    o   O.. +",
+"+ O.   O  O.. ++",
+"++ O   O     +++",
+"    XX O XXX  ++",
+"  XX   O     X +",
+"+   XX  OOo X  +",
+"+      OOOOO    ",
+"  O..  OO  O O +",
+" O..   oO OO O +",
+" OO  O. O   oO +",
+"+  + O. OOO Oo +",
+"++++ O  oOOOO ++",
+"++++   +      ++"
+};

Index: gnomeicu-offline.xpm
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/gnomeicu-offline.xpm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gnomeicu-offline.xpm	20 Nov 2001 21:09:54 -0000	1.3
+++ gnomeicu-offline.xpm	23 Feb 2002 23:24:32 -0000	1.4
@@ -1,38 +1,27 @@
 /* XPM */
-static char *icon_offline_xpm[] = {
+static char * icon_offline_xpm[] = {
 /* columns rows colors chars-per-pixel */
-"12 14 18 1",
+"16 16 5 1",
 "  c black",
-". c #3d4e53",
-"X c #3f5156",
-"o c #4c4c4c",
-"O c #425357",
-"+ c #43555a",
-"@ c #45585e",
-"# c #475b61",
-"$ c #485d63",
-"% c #4b6066",
-"& c #4e636a",
-"* c #50676d",
-"= c #51686e",
-"- c #556d74",
-"; c #59737a",
-": c #7e7e7e",
-"> c #8b8b8b",
-", c None",
+". c #f80000",
+"X c #f8fc00",
+"o c #f8fcf8",
+"O c None",
 /* pixels */
-",,,,,,,,,,,,",
-">>>>>>>>>>:,",
-">$&&&%#@+X:o",
-">$;;;--#+X:o",
-">-;;;;;#+X:o",
-">*;;;-;$+X:o",
-">#*--=&#+X:o",
-">$&$&*&#+O:o",
-">O$$@.@..X:o",
-":::::::::::o",
-",oo>:::ooooo",
-",,,,>::o,,,,",
-",,>::::::o,,",
-",,,,,,,,,,,,"};
-
+"OOOOOOO  OOOOOOO",
+"OOOOOO o. O   OO",
+"OO  O o..   o. O",
+"O o   o..  o.. O",
+"O o.  o.. o.. OO",
+"OO o.  o  o. OOO",
+"    o.       OOO",
+" o..  oXX o.  OO",
+"O oo. oXX o... O",
+"O      oX  o..  ",
+"  o..          O",
+" o..  o. o.  OOO",
+" oo  o.  o... OO",
+"O  O o.   o.. OO",
+"OOOO o  O  o  OO",
+"OOOO   OOOO  OOO"
+};

Index: gnomeicu-online.xpm
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/gnomeicu-online.xpm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnomeicu-online.xpm	20 Nov 2001 20:19:43 -0000	1.2
+++ gnomeicu-online.xpm	23 Feb 2002 23:24:32 -0000	1.3
@@ -1,68 +1,27 @@
 /* XPM */
 static char * icon_online_xpm[] = {
-"12 14 50 1",
-" 	c None",
-".	c #8B8B8B",
-"+	c #7F7F7F",
-"@	c #00A700",
-"#	c #00B600",
-"$	c #00B100",
-"%	c #00B400",
-"&	c #00AB00",
-"*	c #009C00",
-"=	c #009E00",
-"-	c #009D00",
-";	c #009700",
-">	c #008D00",
-",	c #4C4C4C",
-"'	c #00A800",
-")	c #00CE00",
-"!	c #00CA00",
-"~	c #00C600",
-"{	c #00B700",
-"]	c #00A100",
-"^	c #00BC00",
-"/	c #00D300",
-"(	c #00CF00",
-"_	c #00CB00",
-":	c #00CC00",
-"<	c #00BF00",
-"[	c #00A500",
-"}	c #009900",
-"|	c #00D100",
-"1	c #00C500",
-"2	c #00C400",
-"3	c #009500",
-"4	c #00A200",
-"5	c #00B800",
-"6	c #00BB00",
-"7	c #009400",
-"8	c #00AE00",
-"9	c #00AD00",
-"0	c #00B000",
-"a	c #00A300",
-"b	c #00A400",
-"c	c #019701",
-"d	c #058E05",
-"e	c #089C08",
-"f	c #0A9D0A",
-"g	c #069406",
-"h	c #038803",
-"i	c #028502",
-"j	c #008600",
-"k	c #7E7E7E",
-"            ",
-"..........+ ",
-".@#$%&*-;>+,",
-".')!!!~];>+,",
-".^/(_:([}>+,",
-".#)|)12[3>+,",
-".4%~56%[7>+,",
-".@898%0bcd+,",
-".7efghgjj>+,",
-"+++k+++++++,",
-" ,,,.++,,,,,",
-"    .++,    ",
-"  .++++++,  ",
-"            ",
-"            "};
+/* columns rows colors chars-per-pixel */
+"16 16 5 1",
+"  c black",
+". c #00fc00",
+"X c #f8fc00",
+"o c #f8fcf8",
+"O c None",
+/* pixels */
+"OOOOOOO  OOOOOOO",
+"OOOOOO o. O   OO",
+"OO  O o..   o. O",
+"O o   o..  o.. O",
+"O o.  o.. o.. OO",
+"OO o.  o  o. OOO",
+"    o.       OOO",
+" o..  oXX o.  OO",
+"O oo. oXX o... O",
+"O      oX  o..  ",
+"  o..          O",
+" o..  o. o.  OOO",
+" oo  o.  o... OO",
+"O  O o.   o.. OO",
+"OOOO o  O  o  OO",
+"OOOO   OOOO  OOO"
+};

[Gaim-commits] CVS: gaim ChangeLog,1.397,1.398

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv21098

Modified Files:
	ChangeLog 
Log Message:
Better icons for ICQ.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -d -r1.397 -r1.398
--- ChangeLog	23 Feb 2002 23:18:12 -0000	1.397
+++ ChangeLog	23 Feb 2002 23:24:31 -0000	1.398
@@ -6,7 +6,8 @@
 	* Minor bug fixes re: queued away messages
 	* Better buddy icon transparency (for real this time ;-))
 	* Ability to change formatting of Oscar screen name
-	* Better selection in HTML widget
+	* Better selection in HTML widget (Thanks BMiller)
+	* New icons for ICQ (Thanks Kevin Miller)
 
 version 0.52 (02/17/2002):
 	* Better buddy icon transparency (thanks SeanEgan)

[Gaim-commits] CVS: gaim ChangeLog,1.396,1.397

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv19787

Modified Files:
	ChangeLog 
Log Message:
I'll never poop



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -d -r1.396 -r1.397
--- ChangeLog	23 Feb 2002 22:51:39 -0000	1.396
+++ ChangeLog	23 Feb 2002 23:18:12 -0000	1.397
@@ -6,6 +6,7 @@
 	* Minor bug fixes re: queued away messages
 	* Better buddy icon transparency (for real this time ;-))
 	* Ability to change formatting of Oscar screen name
+	* Better selection in HTML widget
 
 version 0.52 (02/17/2002):
 	* Better buddy icon transparency (thanks SeanEgan)

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.94,1.95 gtkimhtml.h,1.10,1.11

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv19663

Modified Files:
	gtkimhtml.c gtkimhtml.h 
Log Message:
Thanks BMiller! :-)



Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- gtkimhtml.c	10 Feb 2002 22:36:18 -0000	1.94
+++ gtkimhtml.c	23 Feb 2002 23:17:43 -0000	1.95
@@ -1051,6 +1051,25 @@
 	return new_string;
 }
 
+static void
+chunk_select_words (struct line_info *chunk)
+{
+	char *start, *end;
+
+	start = chunk->sel_start;
+	end = chunk->sel_end;
+
+	if (start != chunk->text)
+		while (start > chunk->text && *(start-1) != ' ')
+			start--;
+	chunk->sel_start = start;
+
+	if (end != NULL)
+		while (*end != '\0' && *end != ' ')
+			end++;
+	chunk->sel_end = end;
+}
+
 #define COORDS_IN_CHUNK(xx, yy) (((xx) < chunk->x + chunk->width) && \
 				 ((yy) < chunk->y + chunk->height))
 
@@ -1068,6 +1087,7 @@
 	      endy   = imhtml->sel_endy;
 	gchar *new_pos;
 	gint selection = 0;
+	guint mode = imhtml->sel_mode;
 	gboolean smileys = imhtml->smileys;
 	gboolean redraw = FALSE;
 	gboolean got_start = FALSE;
@@ -1083,6 +1103,9 @@
 		imhtml->selected_text = g_string_new ("");
 	}
 
+	if (mode == 2)
+		startx = endx = 0;
+
 	bits = imhtml->bits;
 	while (bits) {
 		bit = bits->data;
@@ -1095,7 +1118,7 @@
 			case 0:
 				if (COORDS_IN_CHUNK (startx, starty)) {
 					new_pos = get_position (chunk, startx, smileys);
-					if ( !chunk->selected ||
+					if (!chunk->selected ||
 					    (chunk->sel_start != new_pos) ||
 					    (chunk->sel_end != NULL))
 						redraw = TRUE;
@@ -1104,6 +1127,10 @@
 					chunk->sel_end = NULL;
 					selection++;
 					got_start = TRUE;
+					if (mode == 2)
+						endy += chunk->height;
+					if (mode == 1)
+						chunk_select_words (chunk);
 				}
 
 				if (COORDS_IN_CHUNK (endx, endy)) {
@@ -1119,6 +1146,8 @@
 						selection = 2;
 						imhtml->sel_endchunk = chunk;
 						got_end = TRUE;
+						if (mode == 1)
+							chunk_select_words (chunk);
 					} else {
 						new_pos = get_position (chunk, endx, smileys);
 						if ( !chunk->selected ||
@@ -1131,6 +1160,10 @@
 						selection++;
 						imhtml->sel_endchunk = chunk;
 						got_end = TRUE;
+						if (mode == 2)
+							starty += chunk->height;
+						if (mode == 1)
+							chunk_select_words (chunk);
 					}
 				} else if (!COORDS_IN_CHUNK (startx, starty) && !got_start) {
 					if (chunk->selected)
@@ -1153,6 +1186,8 @@
 					chunk->sel_end = new_pos;
 					selection++;
 					got_start = TRUE;
+					if (mode == 1)
+						chunk_select_words (chunk);
 				} else if (!got_end && COORDS_IN_CHUNK (endx, endy)) {
 					new_pos = get_position (chunk, endx, smileys);
 					if ( !chunk->selected ||
@@ -1165,6 +1200,8 @@
 					selection++;
 					imhtml->sel_endchunk = chunk;
 					got_end = TRUE;
+					if (mode == 1)
+						chunk_select_words (chunk);
 				} else {
 					if ( !chunk->selected ||
 					    (chunk->sel_end != NULL) ||
@@ -1402,7 +1439,8 @@
 			    (x < chunk->x) ||
 			    (x > chunk->x + chunk->width) ||
 			    (y < chunk->y) ||
-			    (y > chunk->y + chunk->height))
+			    (y > chunk->y + chunk->height) ||
+			    (imhtml->sel_mode > 0))
 				gtk_imhtml_select_bits (imhtml);
 			else
 				gtk_imhtml_select_in_chunk (imhtml, chunk);
@@ -1509,10 +1547,19 @@
 	y = event->y + vadj->value;
 
 	if (event->button == 1) {
-		imhtml->sel_startx = x;
-		imhtml->sel_starty = y;
+		imhtml->sel_startx = imhtml->sel_endx = x;
+		imhtml->sel_starty = imhtml->sel_endy = y;
 		imhtml->selection = TRUE;
-		gtk_imhtml_select_none (imhtml);
+		if (event->type == GDK_BUTTON_PRESS) {
+			imhtml->sel_mode = 0; /* select by letter */
+			gtk_imhtml_select_none (imhtml);
+		} else if (event->type == GDK_2BUTTON_PRESS) {
+			imhtml->sel_mode = 1; /* select by word */
+			gtk_imhtml_select_none (imhtml);
+		} else if (event->type == GDK_3BUTTON_PRESS) {
+			imhtml->sel_mode = 2; /* select by line */
+			gtk_imhtml_select_bits (imhtml);
+		}
 	}
 
 	if (event->button == 3) {
@@ -1574,7 +1621,8 @@
 	y = event->y + vadj->value;
 
 	if ((event->button == 1) && imhtml->selection) {
-		if ((x == imhtml->sel_startx) && (y == imhtml->sel_starty)) {
+		if ((x == imhtml->sel_startx) && (y == imhtml->sel_starty) &&
+		    (imhtml->sel_mode == 0)) {
 			imhtml->sel_startx = imhtml->sel_starty = 0;
 			imhtml->selection = FALSE;
 			gtk_imhtml_select_none (imhtml);

Index: gtkimhtml.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gtkimhtml.h	8 Dec 2001 09:48:51 -0000	1.10
+++ gtkimhtml.h	23 Feb 2002 23:17:43 -0000	1.11
@@ -61,6 +61,7 @@
 	guint sel_startx, sel_starty;
 	guint sel_endx, sel_endy;
 	gboolean selection;
+	guint sel_mode;
 	GString *selected_text;
 	struct line_info *sel_endchunk;
 	guint scroll_timer;

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.96,1.97

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv18179/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
Thanks KingAnt -- pant licker.



Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- oscar.c	23 Feb 2002 22:50:43 -0000	1.96
+++ oscar.c	23 Feb 2002 23:10:39 -0000	1.97
@@ -1677,7 +1677,8 @@
 			"<IMG SRC=\"free_icon.gif\"> : Normal AIM User<br>"
 			"<IMG SRC=\"aol_icon.gif\"> : AOL User <br>"
 			"<IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br>"
-			"<IMG SRC=\"admin_icon.gif\"> : Administrator"));
+			"<IMG SRC=\"admin_icon.gif\"> : Administrator <br>"
+			"<IMG SRC=\"ab_icon.gif\"> : ActiveBuddy <br>"));
 
 	if (info->membersince)
 		asc = g_strdup_printf("Member Since : <B>%s</B><BR>\n",

[Gaim-commits] CVS: gaim ChangeLog,1.395,1.396

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv14044

Modified Files:
	ChangeLog 
Log Message:
I said I'd never tell...



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -d -r1.395 -r1.396
--- ChangeLog	21 Feb 2002 12:59:25 -0000	1.395
+++ ChangeLog	23 Feb 2002 22:51:39 -0000	1.396
@@ -3,6 +3,9 @@
 version 0.53:
 	* Updated Polish Translation (thanks Przemyslaw Sulek)
 	* Slovak translation added (Thanks Daniel Rezny)
+	* Minor bug fixes re: queued away messages
+	* Better buddy icon transparency (for real this time ;-))
+	* Ability to change formatting of Oscar screen name
 
 version 0.52 (02/17/2002):
 	* Better buddy icon transparency (thanks SeanEgan)

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.31,1.32

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory usw-pr-cvs1:/tmp/cvs-serv13638/protocols/yahoo

Modified Files:
	yahoo.c 
Log Message:
I'll never tell...



Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- yahoo.c	7 Feb 2002 00:13:43 -0000	1.31
+++ yahoo.c	23 Feb 2002 22:50:44 -0000	1.32
@@ -405,11 +405,8 @@
 			break;
 		case 60: /* no clue */
 			 break;
-		case 16: /* Maybe this does more.  Maybe it doesn't. */
-			do_error_dialog("This version of the Yahoo! Messenger plugin is no longer"
-					"being supported.  The latest version of Gaim is available"
-					"at " WEBSITE ".\n\nYou may be disconnected shortly.",
-					"Gaim -- Yahoo! Error");
+		case 16: /* Custom error message */
+			do_error_dialog(pair->value, "Gaim -- Yahoo! Error");
 			break;
 		default:
 			debug_printf("unknown status key %d\n", pair->key);

[Gaim-commits] CVS: gaim/src away.c,1.69,1.70 buddy.c,1.284,1.285 conversation.c,1.326,1.327 server.c,1.217,1.218

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv13638

Modified Files:
	away.c buddy.c conversation.c server.c 
Log Message:
I'll never tell...



Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- away.c	21 Dec 2001 10:23:04 -0000	1.69
+++ away.c	23 Feb 2002 22:50:43 -0000	1.70
@@ -73,7 +73,6 @@
 			cnv = new_conversation(qm->name);
 		if (g_slist_index(connections, qm->gc) >= 0)
 			set_convo_gc(cnv, qm->gc);
-
 		write_to_conv(cnv, qm->message, qm->flags, NULL, qm->tm, qm->len);
 
 		message_queue = g_slist_remove(message_queue, qm);

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- buddy.c	1 Jan 2002 09:49:04 -0000	1.284
+++ buddy.c	23 Feb 2002 22:50:43 -0000	1.285
@@ -2133,6 +2133,7 @@
 					write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
 				} else if (clistqueue && find_queue_total_by_name(b->name)) {
 					struct queued_message *qm = g_new0(struct queued_message, 1);
+					g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
 					qm->message = g_strdup_printf(_("%s logged in."), b->name);
 					qm->gc = gc;
 					qm->tm = time(NULL);
@@ -2196,6 +2197,7 @@
 				write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
 			} else if (clistqueue && find_queue_total_by_name(b->name)) {
 				struct queued_message *qm = g_new0(struct queued_message, 1);
+				g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
 				qm->message = g_strdup_printf(_("%s logged out."), b->name);
 				qm->gc = gc;
 				qm->tm = time(NULL);

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- conversation.c	25 Jan 2002 04:49:39 -0000	1.326
+++ conversation.c	23 Feb 2002 22:50:43 -0000	1.327
@@ -2867,15 +2867,19 @@
 						MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
 						    gdk_pixbuf_animation_get_height(c->anim), 1),
 						GDK_INTERP_NEAREST);
-		gdk_pixbuf_render_pixmap_and_mask(scale, &src, NULL, 0);
+		gdk_pixbuf_render_pixmap_and_mask(scale, &src, &bm, 100);
 		gdk_pixbuf_unref(scale);
-		gtk_pixmap_get(GTK_PIXMAP(c->icon), &pm, &bm);
+		gtk_pixmap_get(GTK_PIXMAP(c->icon), &pm, NULL);
 		gc = gdk_gc_new(pm);
-		gdk_draw_pixmap(pm, gc, src, 0, 0,
-				MAX(gdk_pixbuf_frame_get_x_offset(frame) * SCALE(c->anim) /
-				    gdk_pixbuf_animation_get_width(c->anim), 1),
-				MAX(gdk_pixbuf_frame_get_y_offset(frame) * SCALE(c->anim) /
-				    gdk_pixbuf_animation_get_height(c->anim), 1), -1, -1);
+		gdk_gc_set_clip_mask(gc, bm);
+
+		gdk_gc_set_clip_origin(gc, gdk_pixbuf_frame_get_x_offset(frame) *
+				       SCALE(c->anim)/gdk_pixbuf_get_width(scale),  
+				       gdk_pixbuf_frame_get_y_offset(frame));   
+		gdk_draw_pixmap(pm, gc, src, 0, 0, gdk_pixbuf_frame_get_x_offset(frame)*
+				SCALE(c->anim)/gdk_pixbuf_get_width(scale),
+				gdk_pixbuf_frame_get_y_offset(frame),-1,-1);
+		
 		gdk_pixmap_unref(src);
 		gtk_widget_queue_draw(c->icon);
 		gdk_gc_unref(gc);
@@ -2888,7 +2892,7 @@
 						MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
 						    gdk_pixbuf_animation_get_height(c->anim), 1),
 						GDK_INTERP_NEAREST);
-		gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 0);
+		gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 100);
 		gdk_pixbuf_unref(scale);
 		gtk_pixmap_set(GTK_PIXMAP(c->icon), pm, bm);
 		gdk_pixmap_unref(pm);
@@ -2904,7 +2908,7 @@
 						MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
 						    gdk_pixbuf_animation_get_height(c->anim), 1),
 						GDK_INTERP_NEAREST);
-		gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 0);
+		gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 100);
 		gdk_pixbuf_unref(scale);
 		gtk_pixmap_set(GTK_PIXMAP(c->icon), pm, bm);
 		gdk_pixmap_unref(pm);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- server.c	25 Jan 2002 04:49:39 -0000	1.217
+++ server.c	23 Feb 2002 22:50:43 -0000	1.218
@@ -621,6 +621,7 @@
 			qm->gc = gc;
 			qm->tm = mtime;
 			qm->flags = WFLAG_SEND | WFLAG_AUTO;
+			qm->len = -1;
 			message_queue = g_slist_append(message_queue, qm);
 		} else if (cnv != NULL)
 			write_to_conv(cnv, away_subs(tmpmsg, alias), WFLAG_SEND | WFLAG_AUTO, NULL,

[Gaim-commits] CVS: gaim/src/protocols/oscar admin.c,1.4,1.5 aim.h,1.29,1.30 info.c,1.12,1.13 oscar.c,1.95,1.96

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv13638/protocols/oscar

Modified Files:
	admin.c aim.h info.c oscar.c 
Log Message:
I'll never tell...



Index: admin.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/admin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- admin.c	10 Nov 2001 01:48:17 -0000	1.4
+++ admin.c	23 Feb 2002 22:50:43 -0000	1.5
@@ -173,3 +173,25 @@
 	return 0;
 }
 
+faim_export int aim_admin_setnick(aim_session_t *sess, aim_conn_t *conn, const char *newnick)
+{
+	aim_frame_t *tx;
+	aim_snacid_t snacid;
+	aim_tlvlist_t *tl = NULL;
+
+	if (!(tx = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+2+2+strlen(newnick))))
+		return -ENOMEM;
+
+	snacid = aim_cachesnac(sess, 0x0007, 0x0004, 0x0000, NULL, 0);
+	aim_putsnac(&tx->data, 0x0007, 0x0004, 0x0000, snacid);
+
+	aim_addtlvtochain_raw(&tl, 0x0001, strlen(newnick), newnick);
+	
+	aim_writetlvchain(&tx->data, &tl);
+	aim_freetlvchain(&tl);
+	
+	aim_tx_enqueue(sess, tx);
+
+
+	return 0;
+}

Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- aim.h	1 Jan 2002 09:49:04 -0000	1.29
+++ aim.h	23 Feb 2002 22:50:43 -0000	1.30
@@ -841,7 +841,7 @@
 #define AIM_CAPS_SENDBUDDYLIST  0x00000100
 #define AIM_CAPS_GAMES2         0x00000200
 #define AIM_CAPS_ICQ            0x00000400
-#define AIM_CAPS_ABINTERNAL     0x00000800
+#define AIM_CAPS_APINFO         0x00000800
 #define AIM_CAPS_ICQRTF		0x00001000
 #define AIM_CAPS_EMPTY		0x00002000
 #define AIM_CAPS_ICQSERVERRELAY 0x00004000
@@ -938,6 +938,7 @@
 faim_export int aim_admin_reqconfirm(aim_session_t *sess, aim_conn_t *conn);
 faim_export int aim_admin_getinfo(aim_session_t *sess, aim_conn_t *conn, fu16_t info);
 faim_export int aim_admin_setemail(aim_session_t *sess, aim_conn_t *conn, const char *newemail);
+faim_export int aim_admin_setnick(aim_session_t *sess, aim_conn_t *conn, const char *newnick);
 
 /* aim_buddylist.c */
 faim_export int aim_add_buddy(aim_session_t *, aim_conn_t *, const char *);

Index: info.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/info.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- info.c	1 Jan 2002 09:49:04 -0000	1.12
+++ info.c	23 Feb 2002 22:50:43 -0000	1.13
@@ -190,10 +190,6 @@
 	 {0x09, 0x46, 0x13, 0x4b, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
-	{AIM_CAPS_ABINTERNAL,
-	 {0x09, 0x46, 0x13, 0x4f, 0x4c, 0x7f, 0x11, 0xd1,
-	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
-
 	{AIM_CAPS_ICQRTF,
 	 {0x97, 0xb1, 0x27, 0x51, 0x24, 0x3c, 0x43, 0x34, 
 	  0xad, 0x22, 0xd6, 0xab, 0xf7, 0x3f, 0x14, 0x92}},
@@ -209,6 +205,13 @@
 	{AIM_CAPS_TRILLIANCRYPT,
 	 {0xf2, 0xe7, 0xc7, 0xf4, 0xfe, 0xad, 0x4d, 0xfb,
 	  0xb2, 0x35, 0x36, 0x79, 0x8b, 0xdf, 0x00, 0x00}},
+
+	{AIM_CAPS_APINFO, 
+         {0xAA, 0x4A, 0x32, 0xB5,
+	         0xF8, 0x84,
+                0x48, 0xc6,
+	         0xA3, 0xD7,
+	         0x8C, 0x50, 0x97, 0x19, 0xFD, 0x5B}},
 
 	{AIM_CAPS_LAST}
 };

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- oscar.c	30 Jan 2002 22:30:15 -0000	1.95
+++ oscar.c	23 Feb 2002 22:50:43 -0000	1.96
@@ -88,6 +88,8 @@
 	gboolean reqemail;
 	gboolean setemail;
 	char *email;
+	gboolean setnick;
+	char *newsn;
 	gboolean chpass;
 	char *oldp;
 	char *newp;
@@ -2073,6 +2075,13 @@
 		od->newp = NULL;
 		od->chpass = FALSE;
 	}
+	if (od->setnick) {
+		debug_printf("formatting screenname\n");
+		aim_admin_setnick(sess, fr->conn, od->newsn);
+		g_free(od->newsn);
+		od->newsn = NULL;
+		od->setnick = FALSE;
+	}
 	if (od->conf) {
 		debug_printf("confirming account\n");
 		aim_admin_reqconfirm(sess, fr->conn);
@@ -2986,6 +2995,21 @@
 	}
 }
 
+static void oscar_format_screenname(struct gaim_connection *gc, char *nick) {
+	struct oscar_data *od = gc->proto_data;
+	if (!strcmp(normalize(nick), gc->username)) {
+		if (!aim_getconn_type(od->sess, AIM_CONN_TYPE_AUTH)) {
+			od->setnick = TRUE;
+			od->newsn = g_strdup(nick);
+			aim_reqservice(od->sess, od->conn, AIM_CONN_TYPE_AUTH);
+		} else {
+			aim_admin_setnick(od->sess, aim_getconn_type(od->sess, AIM_CONN_TYPE_AUTH), nick);
+		}
+	} else {
+		do_error_dialog("The new formatting is invalid.", "Gaim");
+	}
+}
+
 static void oscar_do_action(struct gaim_connection *gc, char *act)
 {
 	struct oscar_data *od = gc->proto_data;
@@ -2995,6 +3019,9 @@
 		show_set_info(gc);
 	} else if (!strcmp(act, "Change Password")) {
 		show_change_passwd(gc);
+	} else if (!strcmp(act, "Format Screenname")) {
+		do_prompt_dialog("New screenname formatting:", 
+				 gc->displayname, gc, oscar_format_screenname, NULL);
 	} else if (!strcmp(act, "Confirm Account")) {
 		if (!conn) {
 			od->conf = TRUE;
@@ -3021,6 +3048,7 @@
 	m = g_list_append(m, "Set User Info");
 	m = g_list_append(m, NULL);
 	m = g_list_append(m, "Change Password");
+	m = g_list_append(m, "Format Screenname");
 	m = g_list_append(m, "Confirm Account");
 	m = g_list_append(m, "Display Current Registered Address");
 	m = g_list_append(m, "Change Current Registered Address");

[Gaim-commits] CVS: gaim NEWS,1.114,1.115

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv29074

Modified Files:
	NEWS 
Log Message:
Enter Log.  Lines beginning with `CVS:' are removed automatically



Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- NEWS	17 Feb 2002 19:09:58 -0000	1.114
+++ NEWS	23 Feb 2002 04:29:48 -0000	1.115
@@ -1,5 +1,7 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
+0.53:
+
 0.52 (02/17/2002):
 	Rob: Well, after a long delay we're finally ready for another release. 
 	I finally got settled into my new apartment, the new job is going 

[Gaim-commits] CVS: gaim/po .cvsignore,1.13,1.14 zh_CN.po,1.18,1.19

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv28898

Modified Files:
	.cvsignore zh_CN.po 
Log Message:
(22:39:14) RobFlynn: predicate calculus
(22:39:26) LSchiere: what of it?


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gaim/gaim/po/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- .cvsignore	5 Jan 2002 23:01:28 -0000	1.13
+++ .cvsignore	23 Feb 2002 04:28:34 -0000	1.14
@@ -15,4 +15,5 @@
 pl.gmo
 nl.gmo
 sv.gmo
+sk.gmo
 fi.gmo

Index: zh_CN.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/zh_CN.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- zh_CN.po	22 Feb 2002 23:48:23 -0000	1.18
+++ zh_CN.po	23 Feb 2002 04:28:34 -0000	1.19
@@ -2813,12 +2813,6 @@
 "not the same version I cannot safely tell you which one it was. Needless to "
 "say, it was not successfully loaded."
 msgstr ""
-"You have attempted to load a protocol which was not compiled from the same "
-"version of the source as this application was. Unfortunately, because it is "
-"not the same version I cannot safely tell you which one it was. Needless to "
-"say, it was not successfully loaded.ÄãÕýÔÚ³¢ÊÔ¼ÓÔØÒ»¸öΪ²»Í¬°æ±¾µÄ Gaim "
-"±àÒëµÄЭÒé²å¼þ¡£ºÜ²»ÐÒ£¬ÓÉÓÚ°æ±¾²»Í¬£¬ÎÒÎÞ·¨ÕýÈ·µØ±æÈÏËüÊÇʲô¡£²»±Ø¶à˵ÁË£¬¸"
-"òå¼þûÓгɹ¦¼ÓÔØ¡£"
 
 #: src/prpl.c:74
 msgid "Protocol Error"

[Gaim-commits] CVS: gaim/po de.po,1.31,1.32 es.po,1.17,1.18 fi.po,1.1,1.2 fr.po,1.23,1.24 ko.po,1.21,1.22 ru.po,1.5,1.6 sv.po,1.1,1.2 zh_CN.po,1.17,1.18

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv2880

Modified Files:
	de.po es.po fi.po fr.po ko.po ru.po sv.po zh_CN.po 
Log Message:
I think I'm a clone now



Index: de.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/de.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- de.po	30 Jan 2002 22:30:15 -0000	1.31
+++ de.po	22 Feb 2002 23:48:22 -0000	1.32
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2002-01-30 18:58+0100\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2002-01-30 22:42+0100\n"
 "Last-Translator: Karsten Weiss <kn...@gm...>\n"
 "Language-Team: de <de...@li...>\n"
@@ -24,35 +24,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
[...1181 lines suppressed...]
+#~ "IRC: #gaim auf irc.openprojects.net"
+
+#~ msgid ""
+#~ "Rob Flynn (maintainer)               ro...@ma...\n"
+#~ "Eric Warmenhoven war...@ya...\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (original author)   mar...@ma..."
+#~ msgstr ""
+#~ "Rob Flynn (Maintainer)               ro...@ma...\n"
+#~ "Eric Warmenhoven war...@ya...\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (Ursprünglicher Autor)   mar...@ma..."

Index: es.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/es.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- es.po	18 Oct 2001 12:12:37 -0000	1.17
+++ es.po	22 Feb 2002 23:48:23 -0000	1.18
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-06-17 23:52-0700\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -14,280 +14,1191 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
[...4202 lines suppressed...]
@@ -2571,9 +3308,6 @@
 #~ msgid "Internal HTML Widget (Quite likely a bad idea!)"
 #~ msgstr "Programa de HTML Interno (Probablemente una idea mala!)"
 
-#~ msgid "Connection"
-#~ msgstr "Connección"
-
 #~ msgid "Applet"
 #~ msgstr "Applet"
 
@@ -2604,9 +3338,6 @@
 
 #~ msgid "No Idle"
 #~ msgstr "No desocupado"
-
-#~ msgid "SOCKS v4 Proxy"
-#~ msgstr "Proxy SOCKS v4"
 
 #~ msgid "SOCKS v5 Proxy (DOES NOT WORK!)"
 #~ msgstr "Proxy SOCKS v5 (NO SIRVE!)"

Index: fi.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/fi.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fi.po	5 Jan 2002 03:28:16 -0000	1.1
+++ fi.po	22 Feb 2002 23:48:23 -0000	1.2
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.50\n"
-"POT-Creation-Date: 2002-01-03 19:26+0200\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2002-01-03 22:17+0200\n"
 "Last-Translator: Tero Kuusela <te...@ya...>\n"
 "Language-Team: Finnish <fi...@li...>\n"
@@ -13,364 +13,443 @@
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
[...3492 lines suppressed...]
+#~ "Rauhoitu, apu on heti nurkan takana. Ensimmäinen asia, joka sinun täytyy "
+#~ "tehdä, on AIM-tilin hankkiminen. Voit tehdä sen sivustolla "
+#~ "http://aim.aol.com/. Napsauta vain nappia jossa lukee \"New Users\" ja voit "
+#~ "luoda tilin sitä kautta. Kun sinulla on tili, kirjoita käyttäjänimesi ja "
+#~ "salasanasi sisäänkirjautumisikkunaan, joka ilmestyy kun käynnistät Gaim:in, "
+#~ "ja napsauta sisäänkirjautumisnappia. Kun olet kirjautunut sisään, voit "
+#~ "keskustella yhdelle Gaim:in kehittäjistä lisäavun saamiseksi - heidän "
+#~ "yhteystietonsa löytyvät AUTHORS-tiedostosta Gaim:in lähdekoodissa tai "
+#~ "sivulta "
+
+#~ msgid ""
+#~ "contactinfo.php. If you can't get online and still need more assistance, "
+#~ "feel free to email us at ga...@ma.... Thanks for using Gaim!"
+#~ msgstr ""
+#~ "contactinfo.php. Jos et pääse kirjautumaan sisään ja kaipaat yhä lisäapua, "
+#~ "voit vapaasti lähettää meille sähköpostia osoitteeseen ga...@ma.... "
+#~ "Kiitos että käytät Gaim:ia!"
+
+#~ msgid "Help!"
+#~ msgstr "Apua!"

Index: fr.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/fr.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- fr.po	11 Jan 2002 01:19:23 -0000	1.23
+++ fr.po	22 Feb 2002 23:48:23 -0000	1.24
@@ -7,291 +7,1243 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2001-06-17 23:41-0700\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2001-12-27 22:26-0700\n"
 "Last-Translator: Sebfrance\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
[...4324 lines suppressed...]
@@ -2592,9 +3396,6 @@
 #~ msgid "Internal HTML Widget (Quite likely a bad idea!)"
 #~ msgstr "Support HTML Interne (plutot une mauvaise idée!)"
 
-#~ msgid "Connection"
-#~ msgstr "Connection"
-
 #~ msgid "Applet"
 #~ msgstr "Applet"
 
@@ -2625,9 +3426,6 @@
 
 #~ msgid "No Idle"
 #~ msgstr "Actif"
-
-#~ msgid "SOCKS v4 Proxy"
-#~ msgstr "Proxy SOCKS v4"
 
 #~ msgid "SOCKS v5 Proxy (DOES NOT WORK!)"
 #~ msgstr "Proxy SOCKS v5 (NE MARCHE PAS!)"

Index: ko.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/ko.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ko.po	20 Nov 2001 21:12:24 -0000	1.21
+++ ko.po	22 Feb 2002 23:48:23 -0000	1.22
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2001-11-01 09:55-0800\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2001-11-07 16:22+0900\n"
 "Last-Translator: ÀÌÈ£¼® <al...@de...>\n"
 "Language-Team: artsilly and alee team <>\n"
@@ -13,271 +13,343 @@
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
[...4326 lines suppressed...]
+#~ "their contact information is in the AUTHORS file in the Gaim source, or at "
+#~ msgstr ""
+#~ "±äÀåÀ» Ǫ½Ê½Ã¿À. µµ¿ò¸»Àº ±¸¼®±¸¼®¿¡ ÀÖ½À´Ï´Ù. ¸ÕÀú AIM °èÁ¤À» ¸¸µé¾î¾ß "
+#~ "ÇÕ´Ï´Ù. AIM °èÁ¤Àº http://aim.aol.com/¿¡¼­ ¸¸µé ¼ö ÀÖ½À´Ï´Ù. \"New Users\" "
+#~ "¹öÆ°À» Ŭ¸¯ÇÏ¸é »õ °èÁ¤À» ¸¸µé ¼ö ÀÖ½À´Ï´Ù. °èÁ¤À» ¸¸µé¾úÀ¸¸é °¡ÀÓÀ» ½ÇÇàÇÒ "
+#~ "¶§ ³ª¿À´Â ·Î±×ÀΠâ¿¡ »ç¿ëÀÚID¿Í ºñ¹Ð¹øÈ£¸¦ ÀÔ·ÂÇÏ°í Á¢¼Ó ¹öÆ°À» "
+#~ "Ŭ¸¯ÇϽʽÿÀ. Á¢¼ÓÀÌ µÇ¸é °¡ÀÓ °³¹ßÀÚ¿Í À̾߱âÇÒ ¼ö ÀÖ½À´Ï´Ù. °¡ÀÓ "
+#~ "°³¹ßÀڵ鿡 ´ëÇÑ Á¤º¸´Â °¡ÀÓ ¼Ò½ºÀÇ AUTHORS ÆÄÀÏ¿¡ µé¾îÀÖ½À´Ï´Ù. ¶Ç´Â ´ÙÀ½ "
+#~ "À§Ä¡¿¡¼­µµ ¾Ë¾Æº¼ ¼ö ÀÖ½À´Ï´Ù"
+
+#~ msgid ""
+#~ "contactinfo.php. If you can't get online and still need more assistance, "
+#~ "feel free to email us at ga...@ma.... Thanks for using Gaim!"
+#~ msgstr ""
+#~ "contactinfo.php. ¸¸¾à ¿©ÀüÈ÷ Á¢¼ÓÇÒ ¼ö ¾ø°Å³ª º¸´Ù ¸¹Àº µµ¿òÀÌ ÇÊ¿äÇÏ´Ù¸é "
+#~ "ga...@ma... À¸·Î ¸ÞÀÏÀ» º¸³»ÁֽʽÿÀ. °¡ÀÓÀ» »ç¿ëÇØ Áּż­ °¨»çÇÕ´Ï´Ù."
+
+# src/buddy.c:2703
+#~ msgid "Help!"
+#~ msgstr "µµ¿ò¸»!"

Index: ru.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/ru.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ru.po	19 Nov 2001 09:43:40 -0000	1.5
+++ ru.po	22 Feb 2002 23:48:23 -0000	1.6
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2001-11-15 11:03+0400\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2001-11-16 13:51+0400\n"
 "Last-Translator: Sergey Volozhanin <sv...@as...>\n"
 "Language-Team: RUSSIAN <RU...@li...>\n"
@@ -13,494 +13,642 @@
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
[...3733 lines suppressed...]
+#~ msgid "Logging in %s\n"
+#~ msgstr "ðÒÉÓÏÅÄÉÎÅÎÉÅ Ë %s\n"
+
+#~ msgid "Send offline message"
+#~ msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ ÞÅÒÅÚ ÓÅÒ×ÅÒ"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim on irc.openprojects.net"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim on irc.openprojects.net"
+
+#~ msgid "Help!"
+#~ msgstr "ðÏÍÏÝØ!"
+
+#~ msgid "Use aliases instead screen name"
+#~ msgstr "÷ ÚÁËÌÁÄËÁÈ ÉÓÐÏÌØÚÀÔÓÑ ÐÓÅ×ÄÏÎÉÍÙ"

Index: sv.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/sv.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sv.po	3 Dec 2001 06:25:29 -0000	1.1
+++ sv.po	22 Feb 2002 23:48:23 -0000	1.2
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2001-11-15 02:19-0800\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2001-12-02 19:44+0100\n"
 "Last-Translator: Christian Rose <me...@me...>\n"
 "Language-Team: Swedish <sv...@li...>\n"
@@ -15,364 +15,443 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
[...3486 lines suppressed...]
+#~ "inloggningsfönstret som kommer upp när du startar Gaim, och klickar på "
+#~ "inloggningsknappen. När du väl är ansluten kan du prata med en av "
+#~ "Gaim-utvecklarna för mer hjälp. Deras kontaktinformation finns i filen "
+#~ "AUTHORS i Gaim-källkoden, eller på "
+
+#~ msgid ""
+#~ "contactinfo.php. If you can't get online and still need more assistance, "
+#~ "feel free to email us at ga...@ma.... Thanks for using Gaim!"
+#~ msgstr ""
+#~ "contactinfo.php. Om du inte kan ansluta och behöver mer hjälp, kan du skicka "
+#~ "e-post till oss på ga...@ma.... Tack för att du använder Gaim!"
+
+#~ msgid "Help!"
+#~ msgstr "Hjälp!"
+
 #~ msgid "Error while writing to socket."
 #~ msgstr "Fel vid skrivande till uttag (socket)."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Lösenordsändring lyckades"

Index: zh_CN.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/zh_CN.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- zh_CN.po	30 Jan 2002 06:41:32 -0000	1.17
+++ zh_CN.po	22 Feb 2002 23:48:23 -0000	1.18
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2001-06-17 23:52-0700\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2000-06-17 17:55+08\n"
 "Last-Translator: hashao <ha...@ch...>\n"
 "Language-Team: Simplified Chinese <zh...@li...>\n"
@@ -16,279 +16,1187 @@
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
[...4165 lines suppressed...]
@@ -2486,9 +3189,6 @@
 #~ msgid "Internal HTML Widget (Quite likely a bad idea!)"
 #~ msgstr "ÄÚ²¿³¬Îı¾Îļþ¿Ø¼þ £¨×îºÃ±ðÓã¡£©"
 
-#~ msgid "Connection"
-#~ msgstr "Á¬½Ó"
-
 #~ msgid "Permit/Deny"
 #~ msgstr "Ö»ÔÊÐíijЩÈË"
 
@@ -2515,9 +3215,6 @@
 
 #~ msgid "No Idle"
 #~ msgstr "ûÓпÕת"
-
-#~ msgid "SOCKS v4 Proxy"
-#~ msgstr "SOCKS v4 ´úÀí"
 
 #~ msgid "SOCKS v5 Proxy (DOES NOT WORK!)"
 #~ msgstr "SOCKS v5 ´úÀí £¨»¹²»ÄÜÓã¡£©"

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.33,1.34

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv2776/protocols/jabber

Modified Files:
	jabber.c 
Log Message:
I think I'm alone now ...



Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- jabber.c	17 Feb 2002 18:08:12 -0000	1.33
+++ jabber.c	22 Feb 2002 23:47:55 -0000	1.34
@@ -690,13 +690,13 @@
 
 	if((show = xmlnode_get_tag_data(p->x, "show")) != NULL) {
 		if (!strcasecmp(show, "away")) {
-			vshow = "Away";
+			vshow = _("Away");
 		} else if (!strcasecmp(show, "chat")) {
-			vshow = "Online";
+			vshow = _("Online");
 		} else if (!strcasecmp(show, "xa")) {
-			vshow = "Extended Away";
+			vshow = _("Extended Away");
 		} else if (!strcasecmp(show, "dnd")) {
-			vshow = "Do Not Disturb";
+			vshow = _("Do Not Disturb");
 		}
 	}
 
@@ -1085,7 +1085,7 @@
 	buddyname = g_strdup_printf("%s@%s", who->user, who->server);
 
 	if((g = xmlnode_get_tag(x, "group")) == NULL || (groupname = xmlnode_get_data(g)) == NULL) {
-		groupname = "Buddies";
+		groupname = _("Buddies");
 	}
 
 
@@ -1138,7 +1138,7 @@
 	if (jpacket_subtype(p) == JPACKET__RESULT) {
 		if (xmlnode_has_children(p->x)) {
 			xmlnode query = xmlnode_get_tag(p->x, "query");
-			set_login_progress(GJ_GC(gjc), 4, "Authenticating");
+			set_login_progress(GJ_GC(gjc), 4, _("Authenticating"));
 			if (!xmlnode_get_tag(query, "digest")) {
 				g_free(gjc->sid);
 				gjc->sid = NULL;
@@ -1175,7 +1175,7 @@
 				g_snprintf(msg, sizeof(msg), "%s", errmsg);
 			hide_login_progress(GJ_GC(gjc), msg);
 		} else {
-			hide_login_progress(GJ_GC(gjc), "Unknown login error");
+			hide_login_progress(GJ_GC(gjc), _("Unknown login error"));
 		}
 
 		jd->die = TRUE;
@@ -1405,14 +1405,14 @@
 {
 	switch (state) {
 	case JCONN_STATE_OFF:
-		hide_login_progress(GJ_GC(gjc), "Unable to connect");
+		hide_login_progress(GJ_GC(gjc), _("Unable to connect"));
 		signoff(GJ_GC(gjc));
 		break;
 	case JCONN_STATE_CONNECTED:
-		set_login_progress(GJ_GC(gjc), 2, "Connected");
+		set_login_progress(GJ_GC(gjc), 2, _("Connected"));
 		break;
 	case JCONN_STATE_ON:
-		set_login_progress(GJ_GC(gjc), 3, "Requesting Authentication Method");
+		set_login_progress(GJ_GC(gjc), 3, _("Requesting Authentication Method"));
 		gjab_reqauth(gjc);
 		break;
 	default:
@@ -1430,12 +1430,12 @@
 	jd->hash = g_hash_table_new(g_str_hash, g_str_equal);
 	jd->chats = NULL;	/* we have no chats yet */
 
-	set_login_progress(gc, 1, "Connecting");
+	set_login_progress(gc, 1, _("Connecting"));
 
 	if (!(jd->gjc = gjab_new(loginname, user->password, gc))) {
 		g_free(loginname);
 		debug_printf("jabber: unable to connect (jab_new failed)\n");
-		hide_login_progress(gc, "Unable to connect");
+		hide_login_progress(gc, _("Unable to connect"));
 		signoff(gc);
 		return;
 	}
@@ -1968,7 +1968,7 @@
 	*ap++ = g_strdup_printf("<B>Jabber ID:</B> %s<BR>\n", realwho);
 
 	if((status = g_hash_table_lookup(jd->hash, realwho)) == NULL) {
-		status = "Online";
+		status = _("Online");
 	}
 	*ap++ = g_strdup_printf("<B>Status:</B> %s<BR>\n", status);
 
@@ -2205,25 +2205,25 @@
 	char *ptag;			/* parent tag "path" text */
 	char *url;			/* vCard display format if URL */
 } vcard_template_data[] = {
-	{"Full Name",          NULL, TRUE, TRUE, "FN",        NULL,  NULL},
-	{"Family Name",        NULL, TRUE, TRUE, "FAMILY",    "N",   NULL},
-	{"Given Name",         NULL, TRUE, TRUE, "GIVEN",     "N",   NULL},
-	{"Nickname",           NULL, TRUE, TRUE, "NICKNAME",  NULL,  NULL},
-	{"URL",                NULL, TRUE, TRUE, "URL",       NULL,  "<A HREF=\"%s\">%s</A>"},
-	{"Street Address",     NULL, TRUE, TRUE, "STREET",    "ADR", NULL},
-	{"Extended Address",   NULL, TRUE, TRUE, "EXTADD",    "ADR", NULL},
-	{"Locality",           NULL, TRUE, TRUE, "LOCALITY",  "ADR", NULL},
-	{"Region",             NULL, TRUE, TRUE, "REGION",    "ADR", NULL},
-	{"Postal Code",        NULL, TRUE, TRUE, "PCODE",     "ADR", NULL},
-	{"Country",            NULL, TRUE, TRUE, "COUNTRY",   "ADR", NULL},
-	{"Telephone",          NULL, TRUE, TRUE, "TELEPHONE", NULL,  NULL},
-	{"Email",              NULL, TRUE, TRUE, "EMAIL",     NULL,  "<A HREF=\"mailto:%s\">%s</A>"},
-	{"Organization Name",  NULL, TRUE, TRUE, "ORGNAME",   "ORG", NULL},
-	{"Organization Unit",  NULL, TRUE, TRUE, "ORGUNIT",   "ORG", NULL},
-	{"Title",              NULL, TRUE, TRUE, "TITLE",     NULL,  NULL},
-	{"Role",               NULL, TRUE, TRUE, "ROLE",      NULL,  NULL},
-	{"Birthday",           NULL, TRUE, TRUE, "BDAY",      NULL,  NULL},
-	{"Description",        NULL, TRUE, TRUE, "DESC",      NULL,  NULL},
+	{N_("Full Name"),          NULL, TRUE, TRUE, "FN",        NULL,  NULL},
+	{N_("Family Name"),        NULL, TRUE, TRUE, "FAMILY",    "N",   NULL},
+	{N_("Given Name"),         NULL, TRUE, TRUE, "GIVEN",     "N",   NULL},
+	{N_("Nickname"),           NULL, TRUE, TRUE, "NICKNAME",  NULL,  NULL},
+	{N_("URL"),                NULL, TRUE, TRUE, "URL",       NULL,  "<A HREF=\"%s\">%s</A>"},
+	{N_("Street Address"),     NULL, TRUE, TRUE, "STREET",    "ADR", NULL},
+	{N_("Extended Address"),   NULL, TRUE, TRUE, "EXTADD",    "ADR", NULL},
+	{N_("Locality"),           NULL, TRUE, TRUE, "LOCALITY",  "ADR", NULL},
+	{N_("Region"),             NULL, TRUE, TRUE, "REGION",    "ADR", NULL},
+	{N_("Postal Code"),        NULL, TRUE, TRUE, "PCODE",     "ADR", NULL},
+	{N_("Country"),            NULL, TRUE, TRUE, "COUNTRY",   "ADR", NULL},
+	{N_("Telephone"),          NULL, TRUE, TRUE, "TELEPHONE", NULL,  NULL},
+	{N_("Email"),              NULL, TRUE, TRUE, "EMAIL",     NULL,  "<A HREF=\"mailto:%s\">%s</A>"},
+	{N_("Organization Name"),  NULL, TRUE, TRUE, "ORGNAME",   "ORG", NULL},
+	{N_("Organization Unit"),  NULL, TRUE, TRUE, "ORGUNIT",   "ORG", NULL},
+	{N_("Title"),              NULL, TRUE, TRUE, "TITLE",     NULL,  NULL},
+	{N_("Role"),               NULL, TRUE, TRUE, "ROLE",      NULL,  NULL},
+	{N_("Birthday"),           NULL, TRUE, TRUE, "BDAY",      NULL,  NULL},
+	{N_("Description"),        NULL, TRUE, TRUE, "DESC",      NULL,  NULL},
 	{"", NULL, TRUE, TRUE, "N",     NULL, NULL},
 	{"", NULL, TRUE, TRUE, "ADR",   NULL, NULL},
 	{"", NULL, TRUE, TRUE, "ORG",   NULL, NULL},
@@ -2248,7 +2248,8 @@
  * V-Card user instructions
  */
 static char *multi_entry_instructions =
-	"Enter the stuff you feel comfortable with.  Leave the rest blank.";
+	N_("All items below are optional. Enter only the information with which you feel comfortable");
+static char *entries_title = N_("User Identity");
 
 /*
  * Used by routines to parse an XML-encoded string into an xmlnode tree
@@ -2306,7 +2307,7 @@
 	}
 
 	if((status = g_hash_table_lookup(jd->hash, buddy)) == NULL) {
-		status = "Online";
+		status = _("Online");
 	}
 	*ap++ = g_strdup_printf("<B>Status:</B> %s<BR>\n", status);
 
@@ -2664,10 +2665,11 @@
 		g_free(user_info);
 	}
 
-	b->title = "Gaim - vCard Wizzard";
+	b->title = _("Gaim - Edit Jabber vCard");
 	b->wmclass_name = "set_info";
 	b->wmclass_class = "Gaim";
 	b->instructions->text = g_strdup(multi_entry_instructions);
+	b->entries_title = g_strdup(entries_title);
 
 	b->custom = (void *) jabber_format_info;
 
@@ -2737,7 +2739,7 @@
 		} else {
 			debug_printf("registration successful!\n");
 
-			hide_login_progress_notice(GJ_GC(gjc), "Server Registration successful!");
+			hide_login_progress_notice(GJ_GC(gjc), _("Server Registration successful!"));
 			/*
 			 * TBD: is this the correct way to do away with a
 			 * gaim_connection and all its associated memory
@@ -2764,7 +2766,7 @@
 				g_snprintf(msg, sizeof(msg), "%s", errmsg);
 			hide_login_progress(GJ_GC(gjc), msg);
 		} else {
-			hide_login_progress(GJ_GC(gjc), "Unknown registration error");
+			hide_login_progress(GJ_GC(gjc), _("Unknown registration error"));
 		}
 
 		jd->die = TRUE;
@@ -2840,19 +2842,19 @@
 {
 	switch (state) {
 	case JCONN_STATE_OFF:
-		hide_login_progress(GJ_GC(gjc), "Unable to connect");
+		hide_login_progress(GJ_GC(gjc), _("Unable to connect"));
 		signoff(GJ_GC(gjc));
 		break;
 	case JCONN_STATE_CONNECTED:
 		/*
 		 * TBD?
-		set_login_progress(GJ_GC(gjc), 2, "Connected");
+		set_login_progress(GJ_GC(gjc), 2, _("Connected"));
 		 */
 		break;
 	case JCONN_STATE_ON:
 		/*
 		 * TBD?
-		set_login_progress(GJ_GC(gjc), 3, "Requesting Authentication Method");
+		set_login_progress(GJ_GC(gjc), 3, _("Requesting Authentication Method"));
 		 */
 		gjab_reqreg(gjc);
 		/*
@@ -2884,7 +2886,7 @@
 	if ((jd->gjc = gjab_new(loginname, au->password, gc)) == NULL) {
 		g_free(loginname);
 		debug_printf("jabber: unable to connect (jab_new failed)\n");
-		hide_login_progress(gc, "Unable to connect");
+		hide_login_progress(gc, _("Unable to connect"));
 		signoff(gc);
 	} else {
 		gjab_state_handler(jd->gjc, jabber_handle_registration_state);
@@ -2902,12 +2904,12 @@
 
 static void jabber_do_action(struct gaim_connection *gc, char *act)
 {
-	if (!strcmp(act, "Set User Info")) {
+	if (!strcmp(act, _("Set User Info"))) {
 		jabber_setup_set_info(gc);
 	/*
-	} else if (!strcmp(act, "Set Dir Info")) {
+	} else if (!strcmp(act, _("Set Dir Info"))) {
 		show_set_dir(gc);
-	} else if (!strcmp(act, "Change Password")) {
+	} else if (!strcmp(act, _("Change Password"))) {
 		show_change_passwd(gc);
 	 */
 	}
@@ -2917,10 +2919,10 @@
 {
 	GList *m = NULL;
 
-	m = g_list_append(m, "Set User Info");
+	m = g_list_append(m, _("Set User Info"));
 	/*
-	m = g_list_append(m, "Set Dir Info");
-	m = g_list_append(m, "Change Password");
+	m = g_list_append(m, _("Set Dir Info"));
+	m = g_list_append(m, _("Change Password"));
 	 */
 
 	return m;

[Gaim-commits] CVS: gaim/src dialogs.c,1.299,1.300 gaim.h,1.305,1.306 multi.c,1.107,1.108

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv2776

Modified Files:
	dialogs.c gaim.h multi.c 
Log Message:
I think I'm alone now ...



Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- dialogs.c	17 Feb 2002 21:16:02 -0000	1.299
+++ dialogs.c	22 Feb 2002 23:47:55 -0000	1.300
@@ -4355,7 +4355,7 @@
 	GSList *found;
 	MultiEntryData *data;
 
-	if((found = g_slist_find_custom(*list, label, multi_entry_data_label_compare)) == NULL) {
+	if((found = g_slist_find_custom(*list, (void *)label, multi_entry_data_label_compare)) == NULL) {
 		if(add_it) {
 			data = (MultiEntryData *) g_slist_last(*list =
 				g_slist_append(*list, g_malloc(sizeof(MultiEntryData))))->data;
@@ -4408,7 +4408,7 @@
 	GSList *found;
 	MultiTextData *data;
 
-	if((found = g_slist_find_custom(*list, label, multi_text_data_label_compare)) == NULL) {
+	if((found = g_slist_find_custom(*list, (void *)label, multi_text_data_label_compare)) == NULL) {
 		if(add_it) {
 			data = (MultiTextData *) g_slist_last(*list =
 				g_slist_append(*list, g_malloc(sizeof(MultiTextData))))->data;
@@ -4443,6 +4443,7 @@
 	multi_text_items_free_all(&(b->multi_text_items));
 	g_free(b->instructions->text);
 	g_free(b->instructions);
+	g_free(b->entries_title);
 	g_free(b);
 }
 
@@ -4485,45 +4486,52 @@
 	GtkWidget *label;
 	GSList *multi_entry;
 	MultiEntryData *med;
-	int rows = 0;
-	int rowNum;
+	int rows, row_num, col_num, col_offset;
+	int cols = 1;
 
 	/* Figure-out number of rows needed for table */
-	rows = g_slist_length(multi_entry_items);
+	if((rows = g_slist_length(multi_entry_items)) > 9) {
+		rows /= 2;
+		++cols;
+	}
 
 	if(*entries_table != NULL) {
 		gtk_widget_destroy(GTK_WIDGET (*entries_table));
 	}
-	*entries_table = gtk_table_new(rows, 3, FALSE);
-	gtk_table_set_col_spacings(GTK_TABLE(*entries_table), 5);
-	gtk_table_set_row_spacings(GTK_TABLE(*entries_table), 5);
-	gtk_container_set_border_width(GTK_CONTAINER(*entries_table), 5);
+	*entries_table = gtk_table_new(rows, 3 * cols, FALSE);
 	gtk_container_add(GTK_CONTAINER (entries_frame), *entries_table);
 
-	for(rowNum = 0, multi_entry = multi_entry_items;
-		multi_entry != NULL; ++rowNum, multi_entry = multi_entry->next) {
+	for(col_num = 0, multi_entry = multi_entry_items; col_num < cols && multi_entry != NULL;
+			++col_num) {
+		col_offset = col_num * 3;
+		for(row_num = 0; row_num < rows && multi_entry != NULL;
+				++row_num, multi_entry = multi_entry->next) {
 
-		med = (MultiEntryData *) multi_entry->data;
+			med = (MultiEntryData *) multi_entry->data;
 
-		label = gtk_label_new(med->label);
-		gtk_misc_set_alignment(GTK_MISC(label), (gfloat) 1.0, (gfloat) 0.5);
-		gtk_table_attach_defaults(GTK_TABLE (*entries_table), label, 0, 1, rowNum, rowNum +1);
-		gtk_widget_show(label);
+			label = gtk_label_new(med->label);
+			gtk_misc_set_alignment(GTK_MISC(label), (gfloat) 1.0, (gfloat) 0.5);
+			gtk_table_attach_defaults(GTK_TABLE (*entries_table), label,
+				    col_offset, 1 + col_offset, row_num, row_num +1);
+			gtk_widget_show(label);
 
-		label = gtk_label_new(": ");
-		gtk_misc_set_alignment(GTK_MISC(label), (gfloat) 0.0, (gfloat) 0.5);
-		gtk_table_attach_defaults(GTK_TABLE (*entries_table), label, 1, 2, rowNum, rowNum +1);
-		gtk_widget_show(label);
+			label = gtk_label_new(": ");
+			gtk_misc_set_alignment(GTK_MISC(label), (gfloat) 0.0, (gfloat) 0.5);
+			gtk_table_attach_defaults(GTK_TABLE (*entries_table), label,
+				1 + col_offset, 2 + col_offset, row_num, row_num +1);
+			gtk_widget_show(label);
 
-		med->widget = gtk_entry_new_with_max_length(50);
-		if(med->text != NULL) {
-			gtk_entry_set_text(GTK_ENTRY (med->widget), med->text);
+			med->widget = gtk_entry_new_with_max_length(50);
+			if(med->text != NULL) {
+				gtk_entry_set_text(GTK_ENTRY (med->widget), med->text);
+			}
+			gtk_entry_set_visibility(GTK_ENTRY (med->widget), med->visible);
+			gtk_entry_set_editable(GTK_ENTRY (med->widget), med->editable);
+			gtk_table_attach(GTK_TABLE (*entries_table), med->widget,
+				2 + col_offset, 3 + col_offset, row_num, row_num +1,
+				GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
+			gtk_widget_show(med->widget);
 		}
-		gtk_entry_set_visibility(GTK_ENTRY (med->widget), med->visible);
-		gtk_entry_set_editable(GTK_ENTRY (med->widget), med->editable);
-		gtk_table_attach_defaults(GTK_TABLE (*entries_table),
-			med->widget, 2, 3, rowNum, rowNum +1);
-		gtk_widget_show(med->widget);
 	}
 
 	gtk_widget_show(*entries_table);
@@ -4628,7 +4636,7 @@
 	gtk_box_pack_start(GTK_BOX (vbox), b->instructions->label, TRUE, TRUE, 5);
 	re_show_multi_entry_instr(b->instructions);
 
-	b->entries_frame = gtk_frame_new(NULL);
+	b->entries_frame = gtk_frame_new(b->entries_title);
 	gtk_box_pack_start(GTK_BOX (vbox), b->entries_frame, TRUE, TRUE, 5);
 	gtk_widget_show(b->entries_frame);
 	b->entries_table = NULL;

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- gaim.h	17 Feb 2002 18:08:12 -0000	1.305
+++ gaim.h	22 Feb 2002 23:47:55 -0000	1.306
@@ -467,6 +467,7 @@
 
 	GtkWidget *entries_table;		/* table widget containing m-e lables & entries */
 	GtkWidget *entries_frame;		/* frame widget containing the table widget */
+	gchar *entries_title;			/* title of multi-entries list */
 	GSList *multi_entry_items;		/* entry dialogs parameters */
 
 	GtkWidget *texts_ibox;			/* inner vbox containing multi-text frames */

Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- multi.c	17 Feb 2002 18:08:12 -0000	1.107
+++ multi.c	22 Feb 2002 23:47:55 -0000	1.108
@@ -666,7 +666,7 @@
 	}
 
 	if(p->register_user != NULL) {
-		u->register_user = gtk_check_button_new_with_label("Register with server");
+		u->register_user = gtk_check_button_new_with_label(_("Register with server"));
 		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(u->register_user), FALSE);
 		gtk_box_pack_start(GTK_BOX(vbox), u->register_user, FALSE, FALSE, 0);
 		gtk_widget_show(u->register_user);

[Gaim-commits] CVS: gaim/po sk.po,NONE,1.1

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv25315/po

Added Files:
	sk.po 
Log Message:
bla bla bla



--- NEW FILE: sk.po ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
# Daniel Re¾ný <da...@re...>, 2002.
#
msgid ""
msgstr ""
"Project-Id-Version: gaim 0.48\n"
"POT-Creation-Date: 2001-11-15 02:19-0800\n"
"PO-Revision-Date: 2001-02-22 00:00\n"
"Last-Translator: Daniel Re¾ný <da...@re...>\n"
"Language-Team: SK <SK...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"

#: src/protocols/gg/gg.c:68
msgid "Available"
msgstr "Prítomný"

[...2614 lines suppressed...]
#: src/server.c:535
#, c-format
msgid "(%d messages)"
msgstr "(%d správ)"

#: src/server.c:541
msgid "(1 message)"
msgstr "(1 správa)"

#: src/server.c:756
msgid "Warned"
msgstr ""

#: src/server.c:827
msgid "Yes"
msgstr "Áno"

#: src/server.c:828
msgid "No"
msgstr "Nie"

[Gaim-commits] CVS: gaim ChangeLog,1.394,1.395 configure.ac,1.44,1.45

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv25315

Modified Files:
	ChangeLog configure.ac 
Log Message:
bla bla bla



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -d -r1.394 -r1.395
--- ChangeLog	20 Feb 2002 01:05:53 -0000	1.394
+++ ChangeLog	21 Feb 2002 12:59:25 -0000	1.395
@@ -2,6 +2,7 @@
 
 version 0.53:
 	* Updated Polish Translation (thanks Przemyslaw Sulek)
+	* Slovak translation added (Thanks Daniel Rezny)
 
 version 0.52 (02/17/2002):
 	* Better buddy icon transparency (thanks SeanEgan)

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- configure.ac	17 Feb 2002 23:58:38 -0000	1.44
+++ configure.ac	21 Feb 2002 12:59:25 -0000	1.45
@@ -13,7 +13,7 @@
 AC_PROG_INSTALL
 
 
-ALL_LINGUAS="de es fr ko ru zh_CN pl nl sv fi"
+ALL_LINGUAS="de es fr ko ru zh_CN pl nl sv fi sk"
 AM_GNU_GETTEXT
 
 AC_CYGWIN

[Gaim-commits] CVS: gaim/po pl.po,1.7,1.8

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/po
In directory usw-pr-cvs1:/tmp/cvs-serv6920/po

Modified Files:
	pl.po 
Log Message:
bla bla bla



Index: pl.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/pl.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pl.po	25 Jan 2002 15:33:48 -0000	1.7
+++ pl.po	20 Feb 2002 01:05:53 -0000	1.8
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.51\n"
-"POT-Creation-Date: 2002-01-24 13:58-0500\n"
-"PO-Revision-Date: 2002-02-25 9:30+0200\n"
+"Project-Id-Version: gaim 0.52\n"
+"POT-Creation-Date: 2002-02-17 20:13+0000\n"
+"PO-Revision-Date: 2002-02-19 9:30+0200\n"
 "Last-Translator: Przemys³aw Su³ek <pb...@li...>\n"
 "Language-Team: POLISH <pl...@li...>\n"
[...1283 lines suppressed...]
+#~ "Rob Flynn (maintainer)               ro...@ma...\n"
+#~ "Eric Warmenhoven (lead coder)  war...@ya...\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (original author)   mar...@ma..."
+#~ msgstr ""
+#~ "Rob Flynn (opiekun projektu)               ro...@ma...\n"
+#~ "Eric Warmenhoven (g³ówny koder)  war...@ya...\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (autor orygina³u)   mar...@ma..."
 
 #~ msgid "Handshake"
 #~ msgstr "U¶cisk d³oni"

[Gaim-commits] CVS: gaim ChangeLog,1.393,1.394

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv6920

Modified Files:
	ChangeLog 
Log Message:
bla bla bla



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -d -r1.393 -r1.394
--- ChangeLog	17 Feb 2002 20:48:55 -0000	1.393
+++ ChangeLog	20 Feb 2002 01:05:53 -0000	1.394
@@ -1,6 +1,7 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
 version 0.53:
+	* Updated Polish Translation (thanks Przemyslaw Sulek)
 
 version 0.52 (02/17/2002):
 	* Better buddy icon transparency (thanks SeanEgan)

[Gaim-commits] CVS: gaim configure.ac,1.43,1.44

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv5299

Modified Files:
	configure.ac 
Log Message:
JSeymour is a whore. ;-)



Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- configure.ac	17 Feb 2002 18:17:50 -0000	1.43
+++ configure.ac	17 Feb 2002 23:58:38 -0000	1.44
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.52])
+AM_INIT_AUTOMAKE([gaim], [0.53])
 
 AC_PATH_PROG(sedpath, sed)
 

[Gaim-commits] CVS: gaim/doc gaim.1,1.46,1.47

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/doc
In directory usw-pr-cvs1:/tmp/cvs-serv31903

Modified Files:
	gaim.1 
Log Message:
Typo Much?



Index: gaim.1
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/gaim.1,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- gaim.1	17 Feb 2002 20:48:55 -0000	1.46
+++ gaim.1	17 Feb 2002 22:23:45 -0000	1.47
@@ -198,7 +198,7 @@
 \fBGaim\fR allows for perl scripting.  This submenu provides for the loading of individual perl scripts and for the unloading of all of them.  See PERL-HOWTO for more information about perl scripting.
 
 .SH PLUGINS
-\fBGain\fR allows for dynamic loading of plugins.  The plugin window shows the paths to loaded plugins on the left, and the name and description of the plugin on the right.
+\fBGaim\fR allows for dynamic loading of plugins.  The plugin window shows the paths to loaded plugins on the left, and the name and description of the plugin on the right.
 
 You may load and unload plugins using the appropriate buttons.
 

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.51,1.52

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv27297

Modified Files:
	msn.c 
Log Message:
Blah



Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- msn.c	7 Feb 2002 01:44:05 -0000	1.51
+++ msn.c	17 Feb 2002 22:11:32 -0000	1.52
@@ -538,6 +538,10 @@
 	int cont = 1;
 	int len;
 
+	/* This is really stupid and I hate to put this here. */
+	if (ms->fd != source)
+		ms->fd = source;
+
 	len = read(ms->fd, buf, sizeof(buf));
 
 	if (len <= 0) {