Mercurial > pidgin.yaz

changeset 25296:32ad012ef6ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 56f8f1ef1ec93d71fadc9152a3ca7d9a6d4f8057) to branch 'im.pidgin.pidgin.next.minor' (head 48459d414ca1ecedc43f0340b6bf2c645f488d7d)
author Richard Laager <rlaager@wiktel.com>
date Sun, 02 Nov 2008 06:41:34 +0000
parents 53c27ca1bb71 (current diff) dcb1960ed69d (diff)
children 88a66cb4a8d9
files libpurple/protocols/irc/irc.c pidgin/gtkblist.c pidgin/gtksound.c
diffstat 11 files changed, 28 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Sat Nov 01 13:48:25 2008 +0000
+++ b/COPYRIGHT	Sun Nov 02 06:41:34 2008 +0000
@@ -287,6 +287,7 @@
 Christopher O'Brien (siege)
 Peter O'Gorman
 Jon Oberheide
+Marcos García Ochoa
 Yusuke Odate
 Ruediger Oertel
 Gudmundur Bjarni Olafsson
--- a/libpurple/plugins/ssl/ssl-nss.c	Sat Nov 01 13:48:25 2008 +0000
+++ b/libpurple/plugins/ssl/ssl-nss.c	Sun Nov 02 06:41:34 2008 +0000
@@ -757,7 +757,7 @@
 	crt_dat = X509_NSS_DATA(crt);
 	g_return_val_if_fail(crt_dat, NULL);
 
-	return g_strdup(crt_dat->subjectName);
+	return g_strdup(crt_dat->issuerName);
 }
 
 static gchar *
--- a/libpurple/protocols/irc/irc.c	Sat Nov 01 13:48:25 2008 +0000
+++ b/libpurple/protocols/irc/irc.c	Sun Nov 02 06:41:34 2008 +0000
@@ -62,8 +62,6 @@
 
 PurplePlugin *_irc_plugin = NULL;
 
-static const char *status_chars = "@+%&";
-
 static void irc_view_motd(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
@@ -518,10 +516,7 @@
 	char *plain;
 	const char *args[2];
 
-	if (strchr(status_chars, *who) != NULL)
-		args[0] = who + 1;
-	else
-		args[0] = who;
+	args[0] = irc_nick_skip_mode(irc, who);
 
 	purple_markup_html_to_xhtml(what, NULL, &plain);
 	args[1] = plain;
--- a/libpurple/protocols/irc/irc.h	Sat Nov 01 13:48:25 2008 +0000
+++ b/libpurple/protocols/irc/irc.h	Sun Nov 02 06:41:34 2008 +0000
@@ -109,6 +109,8 @@
 char *irc_mirc2html(const char *string);
 char *irc_mirc2txt(const char *string);
 
+const char *irc_nick_skip_mode(struct irc_conn *irc, const char *string);
+
 gboolean irc_ischannel(const char *string);
 
 void irc_register_commands(void);
--- a/libpurple/protocols/irc/parse.c	Sat Nov 01 13:48:25 2008 +0000
+++ b/libpurple/protocols/irc/parse.c	Sun Nov 02 06:41:34 2008 +0000
@@ -497,6 +497,19 @@
         return result;
 }
 
+const char *irc_nick_skip_mode(struct irc_conn *irc, const char *nick)
+{
+	static const char *default_modes = "@+%&";
+	const char *mode_chars;
+
+	mode_chars = irc->mode_chars ? irc->mode_chars : default_modes;
+
+	while (strchr(mode_chars, *nick) != NULL)
+		nick++;
+
+	return nick;
+}
+
 gboolean irc_ischannel(const char *string)
 {
 	return (string[0] == '#' || string[0] == '&');
--- a/libpurple/protocols/qq/buddy_info.c	Sat Nov 01 13:48:25 2008 +0000
+++ b/libpurple/protocols/qq/buddy_info.c	Sun Nov 02 06:41:34 2008 +0000
@@ -69,9 +69,9 @@
 };
 
 static const gchar *genders_zh[] = {
-	N_("-"),
-	N_("\xc4\xd0"),
-	N_("\xc5\xae"),
+	"-",
+	"\xc4\xd0",
+	"\xc5\xae",
 };
 
 #define QQ_FACES	    134
--- a/pidgin/gtkaccount.c	Sat Nov 01 13:48:25 2008 +0000
+++ b/pidgin/gtkaccount.c	Sun Nov 02 06:41:34 2008 +0000
@@ -562,7 +562,8 @@
 
 	/* Set the fields. */
 	if (dialog->account != NULL) {
-		if (purple_account_get_password(dialog->account))
+		if (purple_account_get_password(dialog->account) &&
+		    purple_account_get_remember_password(dialog->account))
 			gtk_entry_set_text(GTK_ENTRY(dialog->password_entry),
 							   purple_account_get_password(dialog->account));
 
--- a/pidgin/gtkblist.c	Sat Nov 01 13:48:25 2008 +0000
+++ b/pidgin/gtkblist.c	Sun Nov 02 06:41:34 2008 +0000
@@ -7050,7 +7050,7 @@
 	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Group:"), data->sg, data->group_combo, TRUE, NULL);
 	
 	data->autojoin = gtk_check_button_new_with_mnemonic(_("Auto_join when account becomes online."));
-	data->persistent = gtk_check_button_new_with_mnemonic(_("_Hide chat when the window is closed."));
+	data->persistent = gtk_check_button_new_with_mnemonic(_("_Remain in chat after window is closed."));
 	gtk_box_pack_start(GTK_BOX(vbox), data->autojoin, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), data->persistent, FALSE, FALSE, 0);
 
--- a/pidgin/gtkconn.c	Sat Nov 01 13:48:25 2008 +0000
+++ b/pidgin/gtkconn.c	Sun Nov 02 06:41:34 2008 +0000
@@ -208,7 +208,10 @@
 	while (l) {
 		PurpleAccount *a = (PurpleAccount*)l->data;
 		if (!purple_account_is_disconnected(a)) {
+			char *password = g_strdup(purple_account_get_password(a));
 			purple_account_disconnect(a);
+			purple_account_set_password(a, password);
+			g_free(password);
 		}
 		l = l->next;
 	}
--- a/pidgin/gtksound.c	Sat Nov 01 13:48:25 2008 +0000
+++ b/pidgin/gtksound.c	Sun Nov 02 06:41:34 2008 +0000
@@ -450,7 +450,7 @@
 		if (!sound_cmd || *sound_cmd == '\0') {
 			purple_debug_error("gtksound",
 					 "'Command' sound method has been chosen, "
-					 "but no command has been set.");
+					 "but no command has been set.\n");
 			return;
 		}
 
--- a/po/POTFILES.in	Sat Nov 01 13:48:25 2008 +0000
+++ b/po/POTFILES.in	Sun Nov 02 06:41:34 2008 +0000
@@ -145,7 +145,6 @@
 libpurple/protocols/qq/qq_network.c
 libpurple/protocols/qq/qq_process.c
 libpurple/protocols/qq/send_file.c
-libpurple/protocols/qq/sys_msg.c
 libpurple/protocols/sametime/sametime.c
 libpurple/protocols/silc/buddy.c
 libpurple/protocols/silc/chat.c