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

[Gaim-commits] CVS: gaim acconfig.h,1.15,1.16 configure.ac,1.54,1.55

[Sean E. <sea...@us...>]

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

Modified Files:
	acconfig.h configure.ac 
Log Message:
Now EVERYBODY can compile!  Whee!


Index: acconfig.h
===================================================================
RCS file: /cvsroot/gaim/gaim/acconfig.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- acconfig.h	15 Apr 2002 03:23:08 -0000	1.15
+++ acconfig.h	21 Apr 2002 22:08:41 -0000	1.16
@@ -23,3 +23,5 @@
 #undef STATIC_PROTO_INIT
 #endif
 #undef socklen_t
+#undef HAVE_TM_GMTOFF
+#undef HAVE_TIMEZONE

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- configure.ac	18 Apr 2002 01:22:37 -0000	1.54
+++ configure.ac	21 Apr 2002 22:08:41 -0000	1.55
@@ -256,6 +256,35 @@
 AC_SUBST(XSS_LIBS)
 
 
+dnl Shamelessly stolen from gnome-pim
+dnl This determines, if struct tm containes tm_gmtoff field
+dnl or we should use extern long int timezone.
+dnl Actually this should go into acinclude.m4
+AC_DEFUN(GC_TIMEZONE,
+[AC_REQUIRE([AC_STRUCT_TM])dnl
+AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
+  ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
+if test "$ac_cv_struct_tm_gmtoff" = yes; then
+  AC_DEFINE(HAVE_TM_GMTOFF)
+else
+  AC_CACHE_CHECK(for timezone, ac_cv_var_timezone,
+[AC_TRY_LINK(
+changequote(<<, >>)dnl
+<<#include <time.h>
+extern long int timezone;>>,
+changequote([, ])dnl
+[long int l = timezone;], ac_cv_var_timezone=yes, ac_cv_var_timezone=no)])
+  if test $ac_cv_var_timezone = yes; then
+    AC_DEFINE(HAVE_TIMEZONE)
+  fi
+fi
+])
+
+GC_TIMEZONE
+
+
 
 dnl This was taken straight from X-Chat.
 dnl X-Chat is the greatest application ever, not only

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.42,1.43

[Sean E. <sea...@us...>]

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

Modified Files:
	jabber.c 
Log Message:
Try this out.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- jabber.c	20 Apr 2002 08:10:13 -0000	1.42
+++ jabber.c	21 Apr 2002 19:05:29 -0000	1.43
@@ -738,7 +738,7 @@
    {
       t.tm_year -= 1900;
       t.tm_mon -= 1;
-      return mktime(&t) - timezone;
+      return mktime(&t) - t.tm_gmtoff;
    }
    return 0;
 }

[Gaim-commits] CVS: gaim/src/protocols/toc toc.c,1.47,1.48

[Sean E. <sea...@us...>]

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

Modified Files:
	toc.c 
Log Message:
new shortcuts:
Ctrl--  Decrease Font Size
Ctrl-=  Increase Font Size
Ctrl-0  Normal Font Size
Ctrl-F  Select Font
Ctrl-C  Text Color
Ctrl-W  Close IM/Chat Window (or Tab, if using tabbed conversations)
Ctrl-N  New IM/Chat Tab (if using tabbed conversations)
Ctrl-Z  Minimize (Iconify) IM/Chat Window
-As suggested by Shreedeep K Bhachech



Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- toc.c	4 Apr 2002 00:59:12 -0000	1.47
+++ toc.c	20 Apr 2002 08:10:13 -0000	1.48
@@ -789,7 +789,7 @@
 	} else if (!strcasecmp(c, "RVOUS_PROPOSE")) {
 		char *user, *uuid, *cookie;
 		int seq;
-		char *rip, *pip, *vip, *trillian;
+		char *rip, *pip, *vip, *trillian = NULL;
 		int port;
 		
 		user = strtok(NULL, ":");

[Gaim-commits] CVS: gaim/src/protocols/oscar im.c,1.21,1.22 oscar.c,1.132,1.133

[Sean E. <sea...@us...>]

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

Modified Files:
	im.c oscar.c 
Log Message:
new shortcuts:
Ctrl--  Decrease Font Size
Ctrl-=  Increase Font Size
Ctrl-0  Normal Font Size
Ctrl-F  Select Font
Ctrl-C  Text Color
Ctrl-W  Close IM/Chat Window (or Tab, if using tabbed conversations)
Ctrl-N  New IM/Chat Tab (if using tabbed conversations)
Ctrl-Z  Minimize (Iconify) IM/Chat Window
-As suggested by Shreedeep K Bhachech



Index: im.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/im.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- im.c	12 Apr 2002 02:43:50 -0000	1.21
+++ im.c	20 Apr 2002 08:10:13 -0000	1.22
@@ -1603,7 +1603,7 @@
 	aim_rxcallback_t userfunc;
 	aim_tlv_t *block;
 	struct aim_incomingim_ch4_args args;
-	int ret;
+	int ret = 0;
 
 	/*
 	 * Make a bstream for the meaty part.  Yum.  Meat.

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- oscar.c	15 Apr 2002 03:23:09 -0000	1.132
+++ oscar.c	20 Apr 2002 08:10:13 -0000	1.133
@@ -1444,7 +1444,7 @@
 static void gaim_icq_authgrant(gpointer w, struct icq_auth *data) {
 	char *uin, message;
 	struct oscar_data *od = (struct oscar_data *)data->gc->proto_data;
-	uin = g_strdup_printf("%d", data->uin);
+	uin = g_strdup_printf("%lu", data->uin);
 	message = 0;
 	aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
 	show_got_added(data->gc, NULL, uin, NULL, NULL);
@@ -1456,7 +1456,7 @@
 	if (data->uin) {
 		char *uin, *message;
 		struct oscar_data *od = (struct oscar_data *)data->gc->proto_data;
-		uin = g_strdup_printf("%d", data->uin);
+		uin = g_strdup_printf("%lu", data->uin);
 		message = g_strdup_printf("No reason given.");
 		aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHDENIED, message);
 		g_free(uin);
@@ -1471,8 +1471,8 @@
 static void gaim_icq_authask(struct gaim_connection *gc, fu32_t uin, char *msg) {
 	struct icq_auth *data = g_new(struct icq_auth, 1);
 	/* The first 6 chars of the message are some type of alien gibberish, so skip them */
-	char *dialog_msg = g_strdup_printf("The user %d wants to add you to their buddy list for the following reason:\n\n%s", uin, (msg && strlen(msg)>6) ? msg+6 : "No reason given.");
-	debug_printf("Received an authorization request from UIN %ld\n", uin);
+	char *dialog_msg = g_strdup_printf("The user %lu wants to add you to their buddy list for the following reason:\n\n%s", uin, (msg && strlen(msg)>6) ? msg+6 : "No reason given.");
+	debug_printf("Received an authorization request from UIN %lu\n", uin);
 	data->gc = gc;
 	data->uin = uin;
 	do_ask_dialog(dialog_msg, data, gaim_icq_authgrant, gaim_icq_authdeny);
@@ -1489,14 +1489,14 @@
 
 		case 0x0007: { /* Someone has denied you authorization */
 			char *dialog_msg;
-			dialog_msg = g_strdup_printf(_("The user %d has denied your request to add them to your contact list for the following reason:\n\n"), args->uin, args->msg ? args->msg : _("No reason given."));
+			dialog_msg = g_strdup_printf(_("The user %lu has denied your request to add them to your contact list for the following reason:\n%s"), args->uin, args->msg ? args->msg : _("No reason given."));
 			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Denied"));
 			g_free(dialog_msg);
 		} break;
 
 		case 0x0008: { /* Someone has granted you authorization */
 			char *dialog_msg;
-			dialog_msg = g_strdup_printf(_("The user %d has granted your request to add them to your contact list."), args->uin);
+			dialog_msg = g_strdup_printf(_("The user %lu has granted your request to add them to your contact list."), args->uin);
 			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Granted"));
 			g_free(dialog_msg);
 		} break;
@@ -2364,14 +2364,14 @@
 
 		case 0x0007: { /* Someone has denied you authorization */
 			char *dialog_msg;
-			dialog_msg = g_strdup_printf(_("The user %d has denied your request to add them to your contact list for the following reason:\n\n"), msg->sender, msg->msg ? msg->msg : _("No reason given."));
+			dialog_msg = g_strdup_printf(_("The user %lu has denied your request to add them to your contact list for the following reason:\n%s"), msg->sender, msg->msg ? msg->msg : _("No reason given."));
 			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Denied"));
 			g_free(dialog_msg);
 		} break;
 
 		case 0x0008: { /* Someone has granted you authorization */
 			char *dialog_msg;
-			dialog_msg = g_strdup_printf(_("The user %d has granted your request to add them to your contact list."), msg->sender);
+			dialog_msg = g_strdup_printf(_("The user %lu has granted your request to add them to your contact list."), msg->sender);
 			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Granted"));
 			g_free(dialog_msg);
 		} break;

[Gaim-commits] CVS: gaim/src buddy.c,1.305,1.306 conversation.c,1.348,1.349 dialogs.c,1.317,1.318 gtkimhtml.c,1.104,1.105 gtkimhtml.h,1.13,1.14 ui.h,1.34,1.35

[Sean E. <sea...@us...>]

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

Modified Files:
	buddy.c conversation.c dialogs.c gtkimhtml.c gtkimhtml.h ui.h 
Log Message:
new shortcuts:
Ctrl--  Decrease Font Size
Ctrl-=  Increase Font Size
Ctrl-0  Normal Font Size
Ctrl-F  Select Font
Ctrl-C  Text Color
Ctrl-W  Close IM/Chat Window (or Tab, if using tabbed conversations)
Ctrl-N  New IM/Chat Tab (if using tabbed conversations)
Ctrl-Z  Minimize (Iconify) IM/Chat Window
-As suggested by Shreedeep K Bhachech



Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- buddy.c	16 Apr 2002 15:24:59 -0000	1.305
+++ buddy.c	20 Apr 2002 08:10:12 -0000	1.306
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include <math.h>
 #include <time.h>
 #include <unistd.h>
@@ -1194,7 +1195,7 @@
 	
 	style = gtk_widget_get_style( widget );
 	
-	if (gc->prpl->list_icon)
+	if (gc->prpl->list_icon) {
 		if (gc->prpl->protocol ==  PROTO_OSCAR) { 
 			if (isdigit(*gc->username)) {
 				xpm = gc->prpl->list_icon(0);
@@ -1204,6 +1205,7 @@
 		} else { 
 			xpm = gc->prpl->list_icon (0);
 		}
+	}
 	if (xpm == NULL)
 		xpm = (char **)no_icon_xpm;
 	
@@ -1826,7 +1828,6 @@
 	GdkBitmap *bm;
 	GtkStyle *style;
 	GtkStyle *style2;
-	int j;
 
 	g->name = g_strdup(group);
 

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -d -r1.348 -r1.349
--- conversation.c	4 Apr 2002 20:11:25 -0000	1.348
+++ conversation.c	20 Apr 2002 08:10:12 -0000	1.349
@@ -31,6 +31,8 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <ctype.h>
+#include <gdk/gdkx.h>
+#include <X11/Xlib.h>
 #include <gtk/gtk.h>
 #include "gtkimhtml.h"
 #include <gdk/gdkkeysyms.h>
@@ -852,18 +854,14 @@
 		int pos = 0;
 		switch (event->keyval) {
 		case GDK_Up:
-			debug_printf("YOU HIT UP!\n");
 			if (!c->send_history)
 				break;
-			debug_printf("history exists\n");
 			if (!c->send_history->prev) {
-				debug_printf("at curent\n");
 				if (c->send_history->data)
 					g_free(c->send_history->data);
 				c->send_history->data = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
 			} 
 			if (c->send_history->next && c->send_history->next->data) {
-				debug_printf("going to ->next\n");
 				c->send_history = c->send_history->next;
 				gtk_editable_delete_text (GTK_EDITABLE(entry),0,-1);
 				gtk_editable_insert_text(GTK_EDITABLE(entry), 
@@ -918,6 +916,34 @@
 				do_strike(c->strike, c->entry);
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 				break;
+			
+			case '-':
+				do_small(NULL, c->entry);
+				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+				break;
+			case '=':
+			case '+':
+				do_big(NULL, c->entry);
+				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+				break;	
+			case '0':
+				do_normal(NULL, c->entry);
+				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+				break;
+			case 'f':
+			case 'F':
+				quiet_set(c->font,
+					  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->font)));
+				toggle_font(c->font, c);
+				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+				break;
+			case 'c':
+			case 'C':
+				quiet_set(c->fgcolorbtn,
+					  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->fgcolorbtn)));
+				toggle_fg_color(c->fgcolorbtn, c);
+				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+				break;
 			}
 		}
 		if (convo_options & OPT_CONVO_CTL_SMILEYS) {
@@ -990,7 +1016,22 @@
 			gtk_imhtml_clear(GTK_IMHTML(c->text));
 			g_string_free(c->history, TRUE);
 			c->history = g_string_new("");
+		} else if (event->keyval == 'w') {
+			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+			close_callback(c->close, c);
+			c = NULL;
+			return TRUE;
+		} else if (event->keyval == 'n') {
+			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+			show_im_dialog();
+		} else if (event->keyval == 'z') {
+			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+			XIconifyWindow(GDK_DISPLAY(),
+				       GDK_WINDOW_XWINDOW(c->window->window),
+				       ((_XPrivDisplay)GDK_DISPLAY())->default_screen);		     
 		}
+		
+
 		if ((!c->is_chat && (im_options & OPT_IM_ONE_WINDOW)) ||
 		    (c->is_chat && (chat_options & OPT_CHAT_ONE_WINDOW))) {
 			GtkWidget *notebook = (c->is_chat ? chat_notebook : convo_notebook);
@@ -1164,8 +1205,8 @@
 				imflags = IM_FLAG_CHECKBOX;
 			
 			if (c->images) {
-				int id, offset;
-				char *bigbuf;
+				int id = 0, offset = 0;
+				char *bigbuf = NULL;
 				GSList *tmplist = c->images;
 				id = 1;
 				

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -d -r1.317 -r1.318
--- dialogs.c	16 Apr 2002 02:12:16 -0000	1.317
+++ dialogs.c	20 Apr 2002 08:10:12 -0000	1.318
@@ -3218,7 +3218,6 @@
 void insert_smiley_text(GtkWidget *widget, struct conversation *c)
 {
 	char *smiley_text;
-	int i;
 
 	smiley_text = strdup(current_smiley);
 

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- gtkimhtml.c	17 Mar 2002 06:43:54 -0000	1.104
+++ gtkimhtml.c	20 Apr 2002 08:10:13 -0000	1.105
@@ -2263,7 +2263,7 @@
 	return imhtml_type;
 }
 
-static void
+void
 gtk_imhtml_init_smileys (GtkIMHtml *imhtml)
 {
 	g_return_if_fail (imhtml != NULL);

Index: gtkimhtml.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gtkimhtml.h	15 Mar 2002 02:34:10 -0000	1.13
+++ gtkimhtml.h	20 Apr 2002 08:10:13 -0000	1.14
@@ -121,7 +121,7 @@
 					gchar            *text,
 					gchar           **xpm);
 
-static void 	   gtk_imhtml_init_smileys     (GtkIMHtml *imhtml);
+void 	   gtk_imhtml_init_smileys     (GtkIMHtml *imhtml);
 
 void       gtk_imhtml_remove_smileys   (GtkIMHtml        *imhtml);
 

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ui.h	3 Apr 2002 03:02:02 -0000	1.34
+++ ui.h	20 Apr 2002 08:10:13 -0000	1.35
@@ -348,6 +348,7 @@
 extern void toggle_buddy_pixmaps();
 extern void gaim_separator(GtkWidget *);
 extern void redo_buddy_list(); /* you really shouldn't call this function */
+extern void set_blist_tab();
 
 /* Functions in buddy_chat.c */
 extern void join_chat();
@@ -395,6 +396,7 @@
 extern void toggle_spellchk();
 extern void set_convo_gc(struct conversation *, struct gaim_connection *);
 extern void update_buttons_by_protocol(struct conversation *);
+extern void toggle_fg_color(GtkWidget *, struct conversation *);
 extern void toggle_smileys();
 extern void toggle_timestamps();
 extern void update_pixmaps();
@@ -408,6 +410,7 @@
 extern void update_progress(struct conversation *, float);
 extern void show_typing(struct conversation *);
 extern gboolean reset_typing(char *);
+extern void set_anim();
 
 /* Functions in dialogs.c */
 extern void alias_dialog_bud(struct buddy *);

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.41,1.42 jconn.c,1.1,1.2 xstream.c,1.3,1.4

[Sean E. <sea...@us...>]

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

Modified Files:
	jabber.c jconn.c xstream.c 
Log Message:
new shortcuts:
Ctrl--  Decrease Font Size
Ctrl-=  Increase Font Size
Ctrl-0  Normal Font Size
Ctrl-F  Select Font
Ctrl-C  Text Color
Ctrl-W  Close IM/Chat Window (or Tab, if using tabbed conversations)
Ctrl-N  New IM/Chat Tab (if using tabbed conversations)
Ctrl-Z  Minimize (Iconify) IM/Chat Window
-As suggested by Shreedeep K Bhachech



Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- jabber.c	15 Apr 2002 03:23:09 -0000	1.41
+++ jabber.c	20 Apr 2002 08:10:13 -0000	1.42
@@ -731,15 +731,40 @@
 	}
 }
 
+static time_t iso8601_to_time(char *timestamp)
+{
+   struct tm t;
+   if(sscanf(timestamp,"%04d%02d%02dT%02d:%02d:%02d", &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec))
+   {
+      t.tm_year -= 1900;
+      t.tm_mon -= 1;
+      return mktime(&t) - timezone;
+   }
+   return 0;
+}
+
 static void jabber_handlemessage(gjconn gjc, jpacket p)
 {
-	xmlnode y, xmlns, subj;
+	xmlnode y, xmlns, subj, z;
+	time_t time_sent = time(NULL);
 
 	char *from = NULL, *msg = NULL, *type = NULL, *topic = NULL;
 	char m[BUF_LONG * 2];
 
 	type = xmlnode_get_attrib(p->x, "type");
 
+	z = xmlnode_get_firstchild(p->x);
+
+	while(z)
+	{
+	   if(NSCHECK(z,NS_DELAY))
+	   {
+	      char *timestamp = xmlnode_get_attrib(z,"stamp");
+	      time_sent = iso8601_to_time(timestamp);
+	   }
+	   z = xmlnode_get_nextsibling(z);
+	}
+
 	if (!type || !strcasecmp(type, "normal") || !strcasecmp(type, "chat")) {
 
 		/* XXX namespaces could be handled better. (mid) */
@@ -778,13 +803,13 @@
 			struct jabber_chat *jc;
 			g_snprintf(m, sizeof(m), "%s", msg);
 			if (((jc = find_existing_chat(GJ_GC(gjc), p->from)) != NULL) && jc->b)
-				serv_got_chat_in(GJ_GC(gjc), jc->b->id, p->from->resource, 1, m, time(NULL));
+				serv_got_chat_in(GJ_GC(gjc), jc->b->id, p->from->resource, 1, m, time_sent);
 			else {
 				int flags = 0;
 				if (xmlnode_get_tag(p->x, "gaim"))
 					flags = IM_FLAG_GAIMUSER;
 				if (find_conversation(jid_full(p->from)))
-					serv_got_im(GJ_GC(gjc), jid_full(p->from), m, flags, time(NULL), -1);
+					serv_got_im(GJ_GC(gjc), jid_full(p->from), m, flags, time_sent, -1);
 				else {
 					if(p->from->user) {
 					    from = g_strdup_printf("%s@%s", p->from->user, p->from->server);
@@ -792,7 +817,7 @@
 					    /* server message? */
 					    from = g_strdup(p->from->server);
 					}
-					serv_got_im(GJ_GC(gjc), from, m, flags, time(NULL), -1);
+					serv_got_im(GJ_GC(gjc), from, m, flags, time_sent, -1);
 					g_free(from);
 				}
 			}
@@ -870,7 +895,7 @@
 				
 
 				g_snprintf(buf, sizeof(buf), "%s", msg);
-				serv_got_chat_in(GJ_GC(gjc), jc->b->id, p->from->resource, 0, buf, time(NULL));
+				serv_got_chat_in(GJ_GC(gjc), jc->b->id, p->from->resource, 0, buf, time_sent);
 			}
 		} else { /* message from the server */
 		   	if(jc->b && topic) {
@@ -887,7 +912,7 @@
 		debug_printf("unhandled message %s\n", type);
 	}
 }
-
+	   
 static void jabber_handlepresence(gjconn gjc, jpacket p)
 {
 	char *to, *from, *type;
@@ -908,20 +933,18 @@
 	from = xmlnode_get_attrib(p->x, "from");
 	type = xmlnode_get_attrib(p->x, "type");
 	
-	z = xmlnode_get_tag(p->x, "x");
+	z = xmlnode_get_firstchild(p->x);
 	
-	if(NSCHECK(z,NS_DELAY))
+	while(z)
 	{
-	   struct tm t;
-	   char *timestamp = xmlnode_get_attrib(z,"stamp");
-	   if(sscanf(timestamp,"%04d%02d%02dT%02d:%02d:%02d", &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec))
+	   if(NSCHECK(z,NS_DELAY))
 	   {
-	      t.tm_year -= 1900;
-	      t.tm_mon -= 1;
-	      signon = mktime(&t) - timezone;
+	      char *timestamp = xmlnode_get_attrib(z,"stamp");
+	      signon = iso8601_to_time(timestamp);
 	   }
+	   z = xmlnode_get_nextsibling(z);
 	}
-
+	
 	if ((y = xmlnode_get_tag(p->x, "show"))) {
 		show = xmlnode_get_data(y);
 		if (!show) {

Index: jconn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jconn.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jconn.c	31 Jul 2001 01:00:38 -0000	1.1
+++ jconn.c	20 Apr 2002 08:10:13 -0000	1.2
@@ -384,7 +384,7 @@
 char *jab_reg(jconn j)
 {
     xmlnode x,y,z;
-    char *hash, *user, *id;
+    char *user, *id;
 
     if (!j) return(NULL);
 

Index: xstream.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/xstream.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xstream.c	4 Apr 2002 03:04:57 -0000	1.3
+++ xstream.c	20 Apr 2002 08:10:13 -0000	1.4
@@ -153,7 +153,7 @@
 /* attempts to parse the buff onto this stream firing events to the handler, returns the last known status */
 int xstream_eat(xstream xs, char *buff, int len)
 {
-    char *err;
+    char *err = NULL;
     xmlnode xerr;
     static char maxerr[] = "maximum node size reached";
     static char deeperr[] = "maximum node depth reached";

[Gaim-commits] CVS: gaim/po .cvsignore,1.15,1.16

[Sean E. <sea...@us...>]

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

Modified Files:
	.cvsignore 
Log Message:
new shortcuts:
Ctrl--  Decrease Font Size
Ctrl-=  Increase Font Size
Ctrl-0  Normal Font Size
Ctrl-F  Select Font
Ctrl-C  Text Color
Ctrl-W  Close IM/Chat Window (or Tab, if using tabbed conversations)
Ctrl-N  New IM/Chat Tab (if using tabbed conversations)
Ctrl-Z  Minimize (Iconify) IM/Chat Window
-As suggested by Shreedeep K Bhachech



Index: .cvsignore
===================================================================
RCS file: /cvsroot/gaim/gaim/po/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- .cvsignore	14 Mar 2002 02:49:18 -0000	1.15
+++ .cvsignore	20 Apr 2002 08:10:12 -0000	1.16
@@ -18,3 +18,4 @@
 sk.gmo
 fi.gmo
 it.gmo
+da.gmo

[Gaim-commits] CVS: gaim ChangeLog,1.454,1.455

[Sean E. <sea...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
new shortcuts:
Ctrl--  Decrease Font Size
Ctrl-=  Increase Font Size
Ctrl-0  Normal Font Size
Ctrl-F  Select Font
Ctrl-C  Text Color
Ctrl-W  Close IM/Chat Window (or Tab, if using tabbed conversations)
Ctrl-N  New IM/Chat Tab (if using tabbed conversations)
Ctrl-Z  Minimize (Iconify) IM/Chat Window
-As suggested by Shreedeep K Bhachech



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -d -r1.454 -r1.455
--- ChangeLog	18 Apr 2002 01:19:40 -0000	1.454
+++ ChangeLog	20 Apr 2002 08:10:12 -0000	1.455
@@ -7,6 +7,8 @@
 	  Nathan Walp)
 	* Danish translation added (Thanks, Sarauw Hansen)
 	* Finnish translation update (Thanks, Tero Kuusela)
+	* Jabber improvements (Thanks, Nathan Walp)
+	* More keyboard shortcuts
 
 version 0.56 (04/11/2002):
 	* German translation update (Thanks Karsten Weiss)

[Gaim-commits] CVS: gaim/src/protocols/zephyr zephyr.c,1.20,1.21

[Sean E. <sea...@us...>]

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

Modified Files:
	zephyr.c 
Log Message:
Zephyr fix.

Thanks Harald Barth and Neil Sanchala.


Index: zephyr.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/zephyr.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- zephyr.c	12 Mar 2002 17:21:46 -0000	1.20
+++ zephyr.c	20 Apr 2002 07:07:06 -0000	1.21
@@ -837,15 +837,15 @@
 
 	pce = g_new0(struct proto_chat_entry, 1);
 	pce->label = _("Class:");
-	m = g_list_append(m, NULL);
+	m = g_list_append(m, pce);
 
 	pce = g_new0(struct proto_chat_entry, 1);
 	pce->label = _("Instance:");
-	m = g_list_append(m, NULL);
+	m = g_list_append(m, pce);
 
 	pce = g_new0(struct proto_chat_entry, 1);
 	pce->label = _("Recipient:");
-	m = g_list_append(m, NULL);
+	m = g_list_append(m, pce);
 
 	return m;
 }

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.41,1.42

[Sean E. <sea...@us...>]

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

Modified Files:
	yahoo.c 
Log Message:
This should fix Yahoo so it works 100%

Many thanks to Toby Gray for the patch.  We went to the zoo together; it was fun.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- yahoo.c	14 Apr 2002 07:50:48 -0000	1.41
+++ yahoo.c	18 Apr 2002 23:49:42 -0000	1.42
@@ -378,7 +378,6 @@
 {
 	struct yahoo_data *yd = gc->proto_data;
 	GSList *l = pkt->hash;
-	struct yahoo_packet *newpkt;
 	char *name = NULL;
 	int state = 0;
 	int gamestate = 0;
@@ -745,45 +744,15 @@
 		char *hash_string_p = g_malloc(50 + strlen(sn));
 		char *hash_string_c = g_malloc(50 + strlen(sn));
 		
-		int ordering;
 		char checksum;
 		
-		char sv;
+		int sv;
 		
 		char *result6 = g_malloc(25);
 		char *result96 = g_malloc(25);
 
 		sv = seed[15];
-		checksum = sv % 16;
-
-		/* I bet there's some really cool mathematical pattern here if I looked hard enough.
-		 * But, this works. */
-		switch (checksum) {
-		case 1:
-		case 6:
-		case 9:
-		case 14:
-			
-			checksum = seed[9];
-			break;
-		case 3:
-		case 11:
-			checksum = seed[1];
-			break;
-		case 4:
-		case 12:
-			checksum = seed[3];
-			break;
-		case 5:
-		case 8:
-		case 13:
-		case 0:
-			checksum = seed[7];
-			break;
-		}
-		checksum = seed[checksum % 16];
-		
-		ordering = sv % 8;
+		sv = sv % 8;
 
 		md5_init(&ctx);
 		md5_append(&ctx, gc->password, strlen(gc->password));
@@ -795,49 +764,50 @@
 		md5_append(&ctx, crypt_result, strlen(crypt_result));
 		md5_finish(&ctx, result);
 		to_y64(crypt_hash, result, 16);
-		
-		/* I bet there's a nice pattern here, too. */
-		switch (ordering) {
+
+		switch (sv) {
 		case 1:
 		case 6:
+			checksum = seed[seed[9] % 16];
 			g_snprintf(hash_string_p, strlen(sn) + 50,
-				   "%c%s%s%s", checksum, gc->username, seed, password_hash);
-			g_snprintf(hash_string_c, strlen(sn) + 50,
+                                   "%c%s%s%s", checksum, gc->username, seed, password_hash);
+                        g_snprintf(hash_string_c, strlen(sn) + 50,
 				   "%c%s%s%s", checksum, gc->username, seed, crypt_hash);
 			break;
 		case 2:
 		case 7:
+			checksum = seed[seed[15] % 16];
 			g_snprintf(hash_string_p, strlen(sn) + 50,
-				   "%c%s%s%s", checksum, seed, password_hash, gc->username);
-			g_snprintf(hash_string_c, strlen(sn) + 50,
-				   "%c%s%s%s", checksum, seed, crypt_hash, gc->username);
-			break;			
+                                   "%c%s%s%s", checksum, seed, password_hash, gc->username);
+                        g_snprintf(hash_string_c, strlen(sn) + 50,
+                                   "%c%s%s%s", checksum, seed, crypt_hash, gc->username);
+			break;
 		case 3:
+			checksum = seed[seed[1] % 16];
 			g_snprintf(hash_string_p, strlen(sn) + 50,
-				   "%c%s%s%s", checksum, gc->username, password_hash, seed);
-			g_snprintf(hash_string_c, strlen(sn) + 50,
-				   "%c%s%s%s", checksum, gc->username, crypt_hash, seed);
-			break;			
+                                   "%c%s%s%s", checksum, gc->username, password_hash, seed);
+                        g_snprintf(hash_string_c, strlen(sn) + 50,
+                                   "%c%s%s%s", checksum, gc->username, crypt_hash, seed);
+			break;
 		case 4:
+			checksum = seed[seed[3] % 16];
 			g_snprintf(hash_string_p, strlen(sn) + 50,
-				   "%c%s%s%s", checksum, gc->username, password_hash, seed);
+				   "%c%s%s%s", checksum, password_hash, seed, gc->username);
 			g_snprintf(hash_string_c, strlen(sn) + 50,
-				   "%c%s%s%s", checksum, gc->username, crypt_hash, seed);
-			break;	
+				   "%c%s%s%s", checksum, crypt_hash, seed, gc->username);
+			break;
 		case 0:
 		case 5:
+			checksum = seed[seed[7] % 16];
 			g_snprintf(hash_string_p, strlen(sn) + 50,
-				   "%c%s%s%s", checksum, password_hash, gc->username, seed);
-			g_snprintf(hash_string_c, strlen(sn) + 50,
+                                   "%c%s%s%s", checksum, password_hash, gc->username, seed);
+                        g_snprintf(hash_string_c, strlen(sn) + 50,
 				   "%c%s%s%s", checksum, crypt_hash, gc->username, seed);
-			break;		
+			break;
 		}
-
-		debug_printf("\nPassword: %s\n", hash_string_p);
-		debug_printf("Crypt:    %s\n\n", hash_string_c);
-
+		
 		md5_init(&ctx);  
-		md5_append(&ctx, hash_string_p, strlen(hash_string_c));
+		md5_append(&ctx, hash_string_p, strlen(hash_string_p));
 		md5_finish(&ctx, result);
 		to_y64(result6, result, 16);
 
@@ -845,11 +815,6 @@
 		md5_append(&ctx, hash_string_c, strlen(hash_string_c));
 		md5_finish(&ctx, result);
 		to_y64(result96, result, 16);
-
-		md5_init(&ctx);
-		md5_append(&ctx, gc->password, strlen(gc->password));
-		md5_finish(&ctx, result);
-		to_y64(password_hash, result, 16);
 
 		pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, YAHOO_STATUS_AVAILABLE, 0);
 		yahoo_packet_hash(pack, 0, gc->username);

Re: [Gaim-commits] CVS: gaim/src gaim.h,1.310,1.311 plugins.c,1.86,1.87 prefs.c,1.215,1.216 sound.c,1.49,1.50

[<mi...@fi...>]

q

[Gaim-commits] CVS: gaim configure.ac,1.53,1.54

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

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

Modified Files:
	configure.ac 
Log Message:
Forgot this , somehow.



Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- configure.ac	15 Apr 2002 03:23:08 -0000	1.53
+++ configure.ac	18 Apr 2002 01:22:37 -0000	1.54
@@ -13,7 +13,7 @@
 AC_PROG_INSTALL
 
 
-ALL_LINGUAS="de es fr ko ru zh_CN pl nl sv fi sk it"
+ALL_LINGUAS="da de es fr ko ru zh_CN pl nl sv fi sk it"
 AM_GNU_GETTEXT
 
 AC_CYGWIN

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

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

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

Added Files:
	da.po 
Log Message:
Forgot this , somehow.



--- NEW FILE: da.po ---
# LANGUAGE translation of GAIM.
# Copyright (C) 2002 Free Software Foundation, Inc.
# 
# Konventioner:
# Buddy pounce = handling, evt. logind-handling
# Away = fravær eller fraværende 
# 
msgid ""
msgstr ""
"Project-Id-Version: GAIM 0.55\n"
"POT-Creation-Date: 2002-03-30 16:35-0800\n"
"PO-Revision-Date: 2002-04-01 23:04+0200\n"
"Last-Translator: Lars Sarauw Hansen <sa...@dk...>\n"
"Language-Team: Danish <da...@kl...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"

#: src/protocols/gg/gg.c:182
[...3020 lines suppressed...]
#: src/server.c:561
msgid "(1 message)"
msgstr "(1 besked)"

#: src/server.c:753
msgid "Warned"
msgstr "Advaret!"

#: src/server.c:846
msgid "Yes"
msgstr "Ja"

#: src/server.c:847
msgid "No"
msgstr "Nej"

#: src/server.c:1023
msgid "More Info"
msgstr "Flere oplysninger"

[Gaim-commits] CVS: gaim ChangeLog,1.453,1.454

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

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

Modified Files:
	ChangeLog 
Log Message:
Wepo



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -d -r1.453 -r1.454
--- ChangeLog	15 Apr 2002 03:23:08 -0000	1.453
+++ ChangeLog	18 Apr 2002 01:19:40 -0000	1.454
@@ -5,6 +5,8 @@
 	* Polish translation updated (Thanks Przemyslaw Sulek)
 	* Jabber will tell you when your buddies signed on (Thanks
 	  Nathan Walp)
+	* Danish translation added (Thanks, Sarauw Hansen)
+	* Finnish translation update (Thanks, Tero Kuusela)
 
 version 0.56 (04/11/2002):
 	* German translation update (Thanks Karsten Weiss)

[Gaim-commits] CVS: gaim/po fi.po,1.5,1.6

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

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

Modified Files:
	fi.po 
Log Message:
Wepo



Index: fi.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/fi.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fi.po	12 Apr 2002 02:57:19 -0000	1.5
+++ fi.po	18 Apr 2002 01:19:40 -0000	1.6
@@ -30,12 +30,10 @@
 msgstr "Virhe luettaessa socketista."
 
 #: src/protocols/gg/gg.c:194
-#, fuzzy
 msgid "Error while writing to socket."
 msgstr "Virhe kirjoitettaessa socketiin."
 
 #: src/protocols/gg/gg.c:197
-#, fuzzy
 msgid "Authentication failed."
 msgstr "Todennus epäonnistui."
 
@@ -110,7 +108,6 @@
 msgstr "%s: yhteyden muodostaminen epäonnistui"
 
 #: src/protocols/gg/gg.c:594
-#, fuzzy
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Yrität lähettää viestiä epäkelvolle Gadu-Gadu-UIN:lle!"
 
@@ -184,7 +181,6 @@
 msgstr "Ei voitu tuoda tuttavalistaa palvelimelta"
 
 #: src/protocols/gg/gg.c:815
-#, fuzzy
 msgid "Buddy List successfully transferred to server"
 msgstr "Tuttavalista siirretty onnistuneesti palvelimelle"
 
@@ -194,22 +190,18 @@
 msgstr "Gadu-Gadu-tietoja"
 
 #: src/protocols/gg/gg.c:821
-#, fuzzy
 msgid "Couldn't transfer Buddy List to server"
 msgstr "Ei voitu siirtää tuttavalistaa palvelimelle"
 
 #: src/protocols/gg/gg.c:827
-#, fuzzy
 msgid "Buddy List sucessfully deleted from server"
 msgstr "Tuttavalista onnistuneesti poistettu palvelimelta"
 
 #: src/protocols/gg/gg.c:833
-#, fuzzy
 msgid "Couldn't delete Buddy List from server"
 msgstr "Ei voitu poistaa tuttavalistaa palvelimelta"
 
 #: src/protocols/gg/gg.c:839
-#, fuzzy
 msgid "Password changed successfully"
 msgstr "Salasanan vaihto onnistui"
 
@@ -308,7 +300,8 @@
 msgid ""
 "%s has requested a DCC chat.  Would you like to establish the direct "
 "connection?"
-msgstr "%s on pyytänyt DCC-keskustelua. Haluatko muodostaa suoran yhteyden?"
+msgstr ""
+"%s on pyytänyt DCC-keskustelua. Haluatko muodostaa suoran yhteyden?"
 
 #: src/protocols/irc/irc.c:1001
 msgid "Unable to write"
@@ -347,7 +340,7 @@
 
 #: src/protocols/jabber/jabber.c:699
 msgid "Unavailable"
-msgstr ""
+msgstr "Tavoittamattomissa"
 
 #: src/applet.c:293 src/buddy.c:493 src/buddy.c:2508 src/buddy.c:2644
 #: src/protocols/jabber/jabber.c:703
@@ -368,14 +361,12 @@
 msgstr "älä häiritse"
 
 #: src/protocols/jabber/jabber.c:1042
-#, fuzzy
 msgid "No such user"
 msgstr "Palvelinta ei ole olemassa"
 
 #: src/protocols/jabber/jabber.c:1044
-#, fuzzy
 msgid "Jabber Error"
-msgstr "Viestivirhe"
+msgstr "Jabber-virhe"
 
 #: src/dialogs.c:845 src/protocols/jabber/jabber.c:1124
 msgid "Buddies"
@@ -390,9 +381,8 @@
 msgstr "Tuntematon sisäänkirjautumisvirhe"
 
 #: src/protocols/jabber/jabber.c:1455 src/protocols/jabber/jabber.c:2903
-#, fuzzy
 msgid "Connection lost"
-msgstr "Yhteys suljettu"
+msgstr "Yhteys kadotettu"
 
 #: src/protocols/jabber/jabber.c:1457 src/protocols/jabber/jabber.c:1489
 #: src/protocols/jabber/jabber.c:2905 src/protocols/jabber/jabber.c:2951
@@ -425,9 +415,8 @@
 msgstr "Kädensija:"
 
 #: src/protocols/jabber/jabber.c:2062 src/protocols/jabber/jabber.c:2401
-#, fuzzy
 msgid "Unknown"
-msgstr "ICQ tuntematon"
+msgstr "Tuntematon"
 
 #: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2117
 #: src/protocols/oscar/oscar.c:3443
@@ -680,24 +669,26 @@
 "following reason:\n"
 "\n"
 msgstr ""
+"Käyttäjä %d on evännyt pyyntösi lisätä hänet tuttavalistallesi seuraavasta "
+"syystä:\n"
+"\n"
 
 #: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
-#, fuzzy
 msgid "No reason given."
-msgstr "Kutsumanimeä ei annettu"
+msgstr "Syytä ei annettu"
 
 #: src/protocols/oscar/oscar.c:1497 src/protocols/oscar/oscar.c:2372
 msgid "Gaim - ICQ Authorization Denied"
-msgstr ""
+msgstr "Gaim - ICQ valtuutus evätty"
 
 #: src/protocols/oscar/oscar.c:1503 src/protocols/oscar/oscar.c:2378
 #, c-format
 msgid "The user %d has granted your request to add them to your contact list."
-msgstr ""
+msgstr "Käyttäjä %d on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
 #: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2379
 msgid "Gaim - ICQ Authorization Granted"
-msgstr ""
+msgstr "Gaim - ICQ valtuutus hyväksytty"
 
 #: src/protocols/oscar/oscar.c:1577
 #, c-format
@@ -855,7 +846,6 @@
 msgstr "Trillian-salaus"
 
 #: src/protocols/oscar/oscar.c:1801
-#, fuzzy
 msgid ""
 "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
 "SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
@@ -868,7 +858,8 @@
 "SRC=\"free_icon.gif\"> : Tavallinen AIM-käyttäjä<br><IMG "
 "SRC=\"aol_icon.gif\"> : AOL-käyttäjä <br><IMG SRC=\"dt_icon.gif\"> : "
 "AIM-koekäyttäjä <br><IMG SRC=\"admin_icon.gif\"> : Pääkäyttäjä <br><IMG "
-"SRC=\"ab_icon.gif\"> : ActiveBuddy vuorovaikutteinen agentti<br>"
+"SRC=\"ab_icon.gif\"> : ActiveBuddy vuorovaikutteinen agentti<br><IMG "
+"SRC=\"wireless_icon.gif\"> : Langattoman laitteen käyttäjä<br>"
 
 #: src/protocols/oscar/oscar.c:1829
 msgid ""
@@ -1058,7 +1049,7 @@
 msgstr "Tuntematon sisäänkirjautumisvirhe esiintyi: %s."
 
 #: src/protocols/toc/toc.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Tuntematon virhe, %d, esiintyi. Tiedot: %s"
 
@@ -1083,7 +1074,6 @@
 msgstr "Ryhmäkeskusteluvirhe"
 
 #: src/protocols/toc/toc.c:782
-#, fuzzy
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
@@ -2224,7 +2214,7 @@
 msgstr "Asetusvirhe"
 
 #: src/html.c:183
-#, fuzzy, c-format
+#, c-format
 msgid "Received: '%s'\n"
 msgstr "Vastaanotettu: \"%s\"\n"
 
@@ -2344,14 +2334,13 @@
 msgstr "Ilmoitus"
 
 #: src/multi.c:1408
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been signed off"
-msgstr "%s ei kyennyt kirjautumaan sisään"
+msgstr "%s on kirjautunut ulos"
 
 #: src/multi.c:1409
-#, fuzzy
 msgid "Connection Error"
-msgstr "Yhteys suljettu"
+msgstr "Yhteysvirhe"
 
 #: src/perl.c:856
 msgid "Perl Scripts"
@@ -2887,23 +2876,21 @@
 msgstr "äänet poissaollessasi"
 
 #: src/prefs.c:1651
-#, fuzzy
 msgid "Sound method"
-msgstr "äänivalinnat"
+msgstr "Äänimenetelmä"
 
 #: src/prefs.c:1725
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound command\n"
 "(%s for filename)"
 msgstr ""
-"Komento äänitiedostojen soittamiseen\n"
+"Äänikomento\n"
 "(%s tiedostonimeksi)"
 
 #: src/prefs.c:1737
-#, fuzzy
 msgid "Sound played when:"
-msgstr "äänisoitin:"
+msgstr "Ääni soitetaan kun:"
 
 #: src/prefs.c:1881 src/prefs.c:2939
 msgid "Away Messages"
@@ -3106,32 +3093,3 @@
 msgid "More Info"
 msgstr "Lisää tietoja"
 
-#~ msgid "Events"
-#~ msgstr "Tapahtumat"
-
-#~ msgid "Sound when buddy logs in"
-#~ msgstr "ääni kun tuttava kirjautuu sisään"
-
-#~ msgid "Sound when buddy logs out"
-#~ msgstr "ääni kun tuttava kirjautuu ulos"
-
-#~ msgid "Sound when received message begins conversation"
-#~ msgstr "ääni kun vastaanotettu viesti aloittaa keskustelun"
-
-#~ msgid "Sound when message is received"
-#~ msgstr "ääni kun viesti vastaanotetaan"
-
-#~ msgid "Sound when message is sent"
-#~ msgstr "ääni kun viesti lähetetään"
-
-#~ msgid "Sound in chat rooms when people enter"
-#~ msgstr "ääni keskusteluhuoneissa ihmisten saapuessa"
-
-#~ msgid "Sound in chat rooms when people leave"
-#~ msgstr "ääni keskusteluhuoneissa ihmisten poistuessa"
-
-#~ msgid "Sound in chat rooms when you talk"
-#~ msgstr "ääni keskusteluhuoneissa viestittäessäsi"
-
-#~ msgid "Sound in chat rooms when others talk"
-#~ msgstr "ääni keskusteluhuoneissa muiden viestittäessä"

[Gaim-commits] CVS: gaim/src buddy.c,1.304,1.305

[Sean E. <sea...@us...>]

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

Modified Files:
	buddy.c 
Log Message:
Whoops, wrong CVS commit. ;)

Thanks, Jason Willis.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -d -r1.304 -r1.305
--- buddy.c	16 Apr 2002 02:12:16 -0000	1.304
+++ buddy.c	16 Apr 2002 15:24:59 -0000	1.305
@@ -506,7 +506,9 @@
 void set_blist_tab()
 {
 	GtkWidget *blist_notebook;
-
+	if (!buddypane)
+		return;
+	
 	blist_notebook = buddypane->parent;  /* The "Online" Page */
 
 	debug_printf("blist_options = %d\n", blist_options);

[Gaim-commits] CVS: gaim/src util.c,1.116,1.117

[Sean E. <sea...@us...>]

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

Modified Files:
	util.c 
Log Message:
bugfix


Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- util.c	14 Apr 2002 07:50:48 -0000	1.116
+++ util.c	16 Apr 2002 15:04:28 -0000	1.117
@@ -288,8 +288,10 @@
 
 			while (flag) {
 				if (badchar(*t)) {
-					if (*(t - 1) == '.')
+					if (*(t - 1) == '.') {
+						url_buf[t-c] = '\0';
 						t--;
+					}
 					cnt += g_snprintf(&text[cnt], 1024,
 							  "<A HREF=\"mailto:%s\">%s</A>", url_buf,
 							  url_buf);

[Gaim-commits] CVS: gaim/src buddy.c,1.303,1.304 dialogs.c,1.316,1.317

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

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

Modified Files:
	buddy.c dialogs.c 
Log Message:
No changes made.















































































































Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -d -r1.303 -r1.304
--- buddy.c	12 Apr 2002 02:22:28 -0000	1.303
+++ buddy.c	16 Apr 2002 02:12:16 -0000	1.304
@@ -737,6 +737,8 @@
 			show_ee_dialog(5);
 		else if (!g_strcasecmp("chipx86", normalize (b->name)))
 			show_ee_dialog(6);
+		else if (!g_strcasecmp("kingant", normalize (b->name)))
+			show_ee_dialog(7);
 
 	} else {
 
@@ -2749,7 +2751,7 @@
 	}
 
 	edittree = gtk_ctree_new(1, 0);
-	gtk_ctree_set_line_style(GTK_CTREE(edittree), GTK_CTREE_LINES_SOLID);
+	gtk_ctree_set_line_style(GTK_CTREE(edittree), GTK_CTREE_LINES_SOLID);;
 	gtk_ctree_set_expander_style(GTK_CTREE(edittree), GTK_CTREE_EXPANDER_SQUARE);
 	gtk_clist_set_reorderable(GTK_CLIST(edittree), TRUE);
 	gtk_signal_connect(GTK_OBJECT(edittree), "button_press_event",

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -d -r1.316 -r1.317
--- dialogs.c	12 Apr 2002 02:15:24 -0000	1.316
+++ dialogs.c	16 Apr 2002 02:12:16 -0000	1.317
@@ -649,9 +649,11 @@
 		label = gtk_label_new("Ahh, and excellent choice!");
 	else  if (ee == 5)
 		label = gtk_label_new("Everytime you click my name, an angel gets its wings.");
-	else 
+	else if (ee == 6)
 		label = gtk_label_new("This sunflower seed taste like pizza.");
-
+	else 
+		label = gtk_label_new("Hey!  I was in that tumbleweed!");
+	
 	gtk_widget_show(label);
 	gtk_widget_show(ok);
 

[Gaim-commits] CVS: gaim/src gaim.h,1.317,1.318

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

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

Modified Files:
	gaim.h 
Log Message:
Kalla said so.



Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -d -r1.317 -r1.318
--- gaim.h	12 Apr 2002 02:15:24 -0000	1.317
+++ gaim.h	15 Apr 2002 20:04:30 -0000	1.318
@@ -28,6 +28,9 @@
 
 #include "core.h"
 #include "ui.h"
+
+#define XPATCH BAD /* Because Kalla Said So */
+
 /* XXX CUI: when this is done being split, the only things below should be things
  * both the core and the uis depend on e.g. the protocol definitions, etc, and
  * it won't include core.h or ui.h (i.e. it'll mostly be #define's) */

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.131,1.132

[Sean E. <sea...@us...>]

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

Modified Files:
	oscar.c 
Log Message:
Patches by Max Horn, Nathan Walp and Danny Colascione.

Thanks, guys.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- oscar.c	12 Apr 2002 02:43:50 -0000	1.131
+++ oscar.c	15 Apr 2002 03:23:09 -0000	1.132
@@ -59,10 +59,6 @@
 #include "pixmaps/gnomeicu-occ.xpm"
 #include "pixmaps/gnomeicu-ffc.xpm"
 
-#if (defined(__SVR4) && !defined(_SOCKLEN_T)) || defined(__MACH__)
-typedef uint32_t        socklen_t;
-#endif
-
 /* constants to identify proto_opts */
 #define USEROPT_AUTH      0
 #define USEROPT_AUTHPORT  1

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.40,1.41

[Sean E. <sea...@us...>]

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

Modified Files:
	jabber.c 
Log Message:
Patches by Max Horn, Nathan Walp and Danny Colascione.

Thanks, guys.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- jabber.c	12 Apr 2002 02:15:24 -0000	1.40
+++ jabber.c	15 Apr 2002 03:23:09 -0000	1.41
@@ -894,17 +894,33 @@
 	struct buddy *b = NULL;
 	jid who;
 	char *buddy;
-	xmlnode y;
+	xmlnode y,z;
 	char *show;
 	int state = 0;
 	GSList *resources;
 	char *res;
 	struct conversation *cnv = NULL;
 	struct jabber_chat *jc = NULL;
+	time_t signon = time(NULL);
+	
 
 	to = xmlnode_get_attrib(p->x, "to");
 	from = xmlnode_get_attrib(p->x, "from");
 	type = xmlnode_get_attrib(p->x, "type");
+	
+	z = xmlnode_get_tag(p->x, "x");
+	
+	if(NSCHECK(z,NS_DELAY))
+	{
+	   struct tm t;
+	   char *timestamp = xmlnode_get_attrib(z,"stamp");
+	   if(sscanf(timestamp,"%04d%02d%02dT%02d:%02d:%02d", &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec))
+	   {
+	      t.tm_year -= 1900;
+	      t.tm_mon -= 1;
+	      signon = mktime(&t) - timezone;
+	   }
+	}
 
 	if ((y = xmlnode_get_tag(p->x, "show"))) {
 		show = xmlnode_get_data(y);
@@ -972,7 +988,7 @@
 				b->proto_data = g_slist_append(b->proto_data, g_strdup(res));
 			}
 
-			serv_got_update(GJ_GC(gjc), buddy, 1, 0, 0, 0, state, 0);
+			serv_got_update(GJ_GC(gjc), buddy, 1, 0, b->signon ? b->signon : signon, b->idle, state, 0);
 
 		}
 	} else {
@@ -1133,6 +1149,8 @@
 			if(groupname && c_grp && strcmp(c_grp->name, groupname)) {
 				int present = b->present;	/* save presence state */
 				int uc = b->uc;			/* and away state (?) */
+				int idle = b->idle;
+				int signon = b->signon;
 
 				/*
 				 * seems rude, but it seems to be the only way...
@@ -1142,7 +1160,7 @@
 					name ? name : buddyname);
 				do_export(GJ_GC(gjc));
 				if(present) {
-					serv_got_update(GJ_GC(gjc), buddyname, 1, 0, 0, 0, uc, 0);
+					serv_got_update(GJ_GC(gjc), buddyname, 1, 0, signon, idle, uc, 0);
 				}
 			} else if(name != NULL && strcmp(b->show, name)) {
 				strncpy(b->show, name, BUDDY_ALIAS_MAXLEN);

[Gaim-commits] CVS: gaim/src prpl.c,1.52,1.53

[Sean E. <sea...@us...>]

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

Modified Files:
	prpl.c 
Log Message:
Patches by Max Horn, Nathan Walp and Danny Colascione.

Thanks, guys.


Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- prpl.c	13 Mar 2002 04:16:05 -0000	1.52
+++ prpl.c	15 Apr 2002 03:23:09 -0000	1.53
@@ -561,7 +561,7 @@
 	ga->who = g_strdup(who);
 	ga->alias = alias ? g_strdup(alias) : NULL;
 
-	g_snprintf(buf, sizeof(buf), _("%s%s%s%s has made %s their buddy%s%s%s"),
+	g_snprintf(buf, sizeof(buf), _("%s%s%s%s has made %s his or her buddy%s%s%s"),
 		   who,
 		   alias ? " (" : "",
 		   alias ? alias : "",
@@ -569,7 +569,7 @@
 		   id ? id : gc->displayname[0] ? gc->displayname : gc->username,
 		   msg ? ": " : ".",
 		   msg ? msg : "",
-		   find_buddy(gc, ga->who) ? "" : _("\n\nDo you wish to add them to your buddy list?"));
+		   find_buddy(gc, ga->who) ? "" : _("\n\nDo you wish to add him or her to your buddy list?"));
 	if (find_buddy(gc, ga->who))
 		do_error_dialog(buf, "Added to List");
 	else

[Gaim-commits] CVS: gaim ChangeLog,1.452,1.453 acconfig.h,1.14,1.15 configure.ac,1.52,1.53

[Sean E. <sea...@us...>]

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

Modified Files:
	ChangeLog acconfig.h configure.ac 
Log Message:
Patches by Max Horn, Nathan Walp and Danny Colascione.

Thanks, guys.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -d -r1.452 -r1.453
--- ChangeLog	14 Apr 2002 22:44:27 -0000	1.452
+++ ChangeLog	15 Apr 2002 03:23:08 -0000	1.453
@@ -3,6 +3,8 @@
 version 0.57
 	* New authorization method for Yahoo!
 	* Polish translation updated (Thanks Przemyslaw Sulek)
+	* Jabber will tell you when your buddies signed on (Thanks
+	  Nathan Walp)
 
 version 0.56 (04/11/2002):
 	* German translation update (Thanks Karsten Weiss)

Index: acconfig.h
===================================================================
RCS file: /cvsroot/gaim/gaim/acconfig.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- acconfig.h	5 Oct 2001 19:52:10 -0000	1.14
+++ acconfig.h	15 Apr 2002 03:23:08 -0000	1.15
@@ -22,3 +22,4 @@
 #ifndef STATIC_PROTO_INIT
 #undef STATIC_PROTO_INIT
 #endif
+#undef socklen_t

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- configure.ac	14 Apr 2002 08:16:56 -0000	1.52
+++ configure.ac	15 Apr 2002 03:23:08 -0000	1.53
@@ -41,6 +41,21 @@
 AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, , 
 				         [AC_ERROR(inet_aton not found)])])
 
+dnl Check for socklen_t (in Unix98)
+AC_MSG_CHECKING(for socklen_t)
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>
+socklen_t x;
+], [], [AC_MSG_RESULT(yes)], [
+AC_TRY_COMPILE([#include <sys/types>
+#include <sys/socket.h>
+int accept(int, struct sockaddr *, size_t *);
+], [], [
+AC_MSG_RESULT(size_t)
+AC_DEFINE(socklen_t, size_t)]. [
+AC_MSG_RESULT(int)
+AC_DEFINE(socklen_t, int)])])
+
 dnl This is a bad, bad hack.  I am a bad, bad man.
 CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)"
 

[Gaim-commits] CVS: gaim/po pl.po,1.11,1.12

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

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

Modified Files:
	pl.po 
Log Message:
rob



Index: pl.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/pl.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pl.po	12 Apr 2002 02:57:19 -0000	1.11
+++ pl.po	14 Apr 2002 22:44:28 -0000	1.12
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.55\n"
+"Project-Id-Version: gaim 0.56\n"
 "POT-Creation-Date: 2002-04-11 22:46-0700\n"
-"PO-Revision-Date: 2002-03-20 23:30+0200\n"
+"PO-Revision-Date: 2002-04-14 23:30+0200\n"
 "Last-Translator: Przemys³aw Su³ek <pb...@li...>\n"
 "Language-Team: POLISH <pl...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -30,12 +30,10 @@
 msgstr "B³±d podczas odczytu z gniazda sieciowego."
 
 #: src/protocols/gg/gg.c:194
-#, fuzzy
 msgid "Error while writing to socket."
 msgstr "B³±d podczas zapisu do gniazda sieciowego."
 
 #: src/protocols/gg/gg.c:197
-#, fuzzy
 msgid "Authentication failed."
 msgstr "Autoryzacja nie powiod³a siê."
 
@@ -110,7 +108,6 @@
 msgstr "Po³±czenie do %s niepowiod³o siê"
 
 #: src/protocols/gg/gg.c:594
-#, fuzzy
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Próbujesz wys³aæ wiadomo¶æ do b³êdnego Numeru Gadu-Gadu!"
 
@@ -183,7 +180,6 @@
 msgstr "Nie mo¿na zaimportowaæ listy kolesi z serwera."
 
 #: src/protocols/gg/gg.c:815
-#, fuzzy
 msgid "Buddy List successfully transferred to server"
 msgstr "Lista kolesi poprawnie przetransmitowana na serwer."
 
@@ -193,22 +189,18 @@
 msgstr "Informacje Gadu-Gadu "
 
 #: src/protocols/gg/gg.c:821
-#, fuzzy
 msgid "Couldn't transfer Buddy List to server"
 msgstr "Nie mo¿na przetransferowaæ listy kolesi na serwer."
 
 #: src/protocols/gg/gg.c:827
-#, fuzzy
 msgid "Buddy List sucessfully deleted from server"
 msgstr "Lista kolesi poprawnie usuniêta z serwera"
 
 #: src/protocols/gg/gg.c:833
-#, fuzzy
 msgid "Couldn't delete Buddy List from server"
 msgstr "Nie mo¿na usun±æ listy kolesi z serwera"
 
 #: src/protocols/gg/gg.c:839
-#, fuzzy
 msgid "Password changed successfully"
 msgstr "Pomy¶lna zmiana has³a."
 
@@ -367,14 +359,12 @@
 msgstr "Nie przeszkadzaæ"
 
 #: src/protocols/jabber/jabber.c:1042
-#, fuzzy
 msgid "No such user"
-msgstr "Brak serwera"
+msgstr "Brak u¿ytkownikaa"
 
 #: src/protocols/jabber/jabber.c:1044
-#, fuzzy
 msgid "Jabber Error"
-msgstr "B³±d wiadomo¶ci"
+msgstr "B³±d Jabber"
 
 #: src/dialogs.c:845 src/protocols/jabber/jabber.c:1124
 msgid "Buddies"
@@ -389,9 +379,8 @@
 msgstr "Nieznany b³±d logowania."
 
 #: src/protocols/jabber/jabber.c:1455 src/protocols/jabber/jabber.c:2903
-#, fuzzy
 msgid "Connection lost"
-msgstr "Po³±czenie zamkniête"
+msgstr "Po³±czenie utracone"
 
 #: src/protocols/jabber/jabber.c:1457 src/protocols/jabber/jabber.c:1489
 #: src/protocols/jabber/jabber.c:2905 src/protocols/jabber/jabber.c:2951
@@ -424,9 +413,8 @@
 msgstr "Uchwyt:"
 
 #: src/protocols/jabber/jabber.c:2062 src/protocols/jabber/jabber.c:2401
-#, fuzzy
 msgid "Unknown"
-msgstr "Nieznany ICQ"
+msgstr "Nieznany"
 
 #: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2117
 #: src/protocols/oscar/oscar.c:3443
@@ -681,22 +669,21 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:2371
-#, fuzzy
 msgid "No reason given."
-msgstr "Nie podano nicka"
+msgstr "Bez powodu."
 
 #: src/protocols/oscar/oscar.c:1497 src/protocols/oscar/oscar.c:2372
 msgid "Gaim - ICQ Authorization Denied"
-msgstr ""
+msgstr "Gaim - Odmowa autoryzacji ICQ"
 
 #: src/protocols/oscar/oscar.c:1503 src/protocols/oscar/oscar.c:2378
 #, c-format
 msgid "The user %d has granted your request to add them to your contact list."
-msgstr ""
+msgstr "U¿ytkownik %d zaakceptowa³ twoj± pro¶bê o dodanie go do listy u¿ytkowników."
 
 #: src/protocols/oscar/oscar.c:1504 src/protocols/oscar/oscar.c:2379
 msgid "Gaim - ICQ Authorization Granted"
-msgstr ""
+msgstr "Gaim - Zaakceptowano autoryzacjê ICQ"
 
 #: src/protocols/oscar/oscar.c:1577
 #, c-format
@@ -1059,7 +1046,7 @@
 msgstr "Nieznany b³±d rejestrowania: %s."
 
 #: src/protocols/toc/toc.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Nieznany b³±d, %d. Info: %s"
 
@@ -1084,7 +1071,6 @@
 msgstr "B³±d Chat"
 
 #: src/protocols/toc/toc.c:782
-#, fuzzy
 msgid "Password Change Successful"
 msgstr "Pomy¶lna zmiana has³a."
 
@@ -1761,7 +1747,7 @@
 
 #: src/conversation.c:2162
 msgid "Smiley"
-msgstr "Usmiech"
+msgstr "U¶miech"
 
 #: src/conversation.c:2165
 msgid "Insert IM Image"
@@ -2219,7 +2205,7 @@
 msgstr "B³±d preferencji"
 
 #: src/html.c:183
-#, fuzzy, c-format
+#, c-format
 msgid "Received: '%s'\n"
 msgstr "Odebrano: '%s'\n"
 
@@ -2330,25 +2316,20 @@
 #: src/multi.c:1387
 #, c-format
 msgid "%s was unable to sign on"
-msgstr ""
-"%s\n"
-"%s nie móg³ zapisaæ siê: %s"
+msgstr "%s nie móg³ siê zalogowaæ"
 
 #: src/multi.c:1398
 msgid "Notice"
 msgstr "Uwaga"
 
 #: src/multi.c:1408
-#, fuzzy, c-format
+#, c-format
 msgid "%s has been signed off"
-msgstr ""
-"%s\n"
-"%s nie móg³ zapisaæ siê: %s"
+msgstr "%s wylogowa³ siê: %s"
 
 #: src/multi.c:1409
-#, fuzzy
 msgid "Connection Error"
-msgstr "Po³±czenie zamkniête"
+msgstr "B³±d po³±czenia"
 
 #: src/perl.c:856
 msgid "Perl Scripts"
@@ -2883,12 +2864,11 @@
 msgstr "D¼wiêki podczas zajêto¶ci"
 
 #: src/prefs.c:1651
-#, fuzzy
 msgid "Sound method"
-msgstr "Opcje d¼wiêku"
+msgstr "Sposób odgrywania"
 
 #: src/prefs.c:1725
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound command\n"
 "(%s for filename)"
@@ -2897,9 +2877,8 @@
 "(%s dla nazwy pliku)"
 
 #: src/prefs.c:1737
-#, fuzzy
 msgid "Sound played when:"
-msgstr "Odtwarzacz d¼wiêku:"
+msgstr "D¼wiêk odtwarzany gdy:"
 
 #: src/prefs.c:1881 src/prefs.c:2939
 msgid "Away Messages"

[Gaim-commits] CVS: gaim ChangeLog,1.451,1.452

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

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

Modified Files:
	ChangeLog 
Log Message:
rob



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -d -r1.451 -r1.452
--- ChangeLog	14 Apr 2002 08:16:56 -0000	1.451
+++ ChangeLog	14 Apr 2002 22:44:27 -0000	1.452
@@ -2,6 +2,7 @@
 
 version 0.57
 	* New authorization method for Yahoo!
+	* Polish translation updated (Thanks Przemyslaw Sulek)
 
 version 0.56 (04/11/2002):
 	* German translation update (Thanks Karsten Weiss)