changeset 8063:f1822a0c103a

[gaim-migrate @ 8756] Potpourri for 500, Alex committer: Tailor Script <[e-mail]>

--- a/src/gtkprefs.c	Sat Jan 10 17:56:07 2004 +0000
+++ b/src/gtkprefs.c	Sat Jan 10 18:13:52 2004 +0000
@@ -822,7 +822,7 @@
 		l = g_list_append(l, method->id);
 	}
 
-	gaim_gtk_prefs_dropdown_from_list(vbox, _("Sorting:"), GAIM_PREF_STRING,
+	gaim_gtk_prefs_dropdown_from_list(vbox, _("_Sorting:"), GAIM_PREF_STRING,
 			"/gaim/gtk/blist/sort_type", l);
 
 	g_list_free(l);
@@ -888,7 +888,7 @@
 	gaim_gtk_prefs_checkbox(_("Send _URLs as Links"),
 				  "/core/conversations/send_urls_as_links", vbox);
 
-	gaim_gtk_prefs_checkbox(_("Show Formatting Toolbar"),
+	gaim_gtk_prefs_checkbox(_("Show _Formatting Toolbar"),
 				  "/gaim/gtk/conversations/show_formatting_toolbar", vbox);
 
 	gaim_gtk_prefs_checkbox(_("Show a_liases in tabs/titles"),

--- a/src/protocols/gg/gg.c	Sat Jan 10 17:56:07 2004 +0000
+++ b/src/protocols/gg/gg.c	Sat Jan 10 18:13:52 2004 +0000
@@ -1,6 +1,6 @@
 /*
  * gaim - Gadu-Gadu Protocol Plugin
- * $Id: gg.c 8658 2004-01-03 16:22:44Z lschiere $
+ * $Id: gg.c 8756 2004-01-10 18:13:52Z thekingant $
  *
  * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <[e-mail]>
  *
@@ -681,10 +681,10 @@
 			/* Hack, invalid_uin does what we really want here but may change in future */
 			if (invalid_uin(p))
 				ibuf =
-				    g_strconcat(oldibuf, "<B>", _("Birth year"), ":</B> <BR>\n", NULL);
+				    g_strconcat(oldibuf, "<B>", _("Birth Year"), ":</B> <BR>\n", NULL);
 			else
 				ibuf =
-				    g_strconcat(oldibuf, "<B>", _("Birth year"), ":</B> ", p, "<BR>\n",
+				    g_strconcat(oldibuf, "<B>", _("Birth Year"), ":</B> ", p, "<BR>\n",
 						NULL);
 			g_free(oldibuf);
 			break;

--- a/src/util.c	Sat Jan 10 17:56:07 2004 +0000
+++ b/src/util.c	Sat Jan 10 18:13:52 2004 +0000
@@ -279,28 +279,6 @@
 /**************************************************************************
  * MIME Functions
  **************************************************************************/
-static char *
-gaim_mime_decode_word(const char *charset, const char *encoding, const char *str)
-{
-	char *decoded, *converted;
-	int len = 0;
-
-	if ((charset == NULL) || (encoding == NULL) || (str == NULL))
-		return NULL;
-
-	if (g_ascii_strcasecmp(encoding, "Q") == 0)
-		gaim_quotedp_decode(str, &decoded, &len);
-	else if (g_ascii_strcasecmp(encoding, "B") == 0)
-		gaim_base64_decode(str, &decoded, &len);
-	else
-		return NULL;
-
-	converted = g_convert(decoded, len, "utf-8", charset, NULL, NULL, NULL);
-	g_free(decoded);
-
-	return converted;
-}
-
 char *
 gaim_mime_decode_field(const char *str)
 {
@@ -399,77 +377,9 @@
 		n = strcpy(n, unencoded);
 
 	return new;
-#if 0
-	/*
-	 * This is KingAnt's function.  It should work, but I don't know if it 
-	 * follows the RFC fully.
-	 */
-	GString *donedeal;
-	char *orig, *start, *end, *end_of_last, *tmp;
-	char **encoded_word;
-	char *charset, *encoding, *word;
-
-	g_return_val_if_fail(str != NULL, NULL);
-
-	orig = g_strdup(str);
-	donedeal = g_string_sized_new(strlen(orig));
-
-	/* One iteration per encoded-word */
-	end_of_last = orig;
-	while ((start = strstr(end_of_last, "=?"))) {
-		/*
-		 * Get to the end of the encoded word by finding the first ?, 
-		 * the second ?, then finally the ?=  If we can't find any of 
-		 * these, then break out of here because this isn't actually an 
-		 * encoded word.
-		 */
-		if (((end = strstr(start + 2, "?")) == NULL) || 
-			((end = strstr(end + 1, "?")) == NULL) ||
-			((end = strstr(end + 2, "?=")) == NULL)) {
-			break;
-		}
-
-		/* Append everything from the end of the last encoded-word to the beginning of the next */
-		tmp = g_strndup(end_of_last, (start - end_of_last));
-		donedeal = g_string_append(donedeal, tmp);
-		g_free(tmp);
-
-		/* Split the encoded word */
-		tmp = g_strndup(start + 2, end - start - 2);
-		encoded_word = g_strsplit(tmp, "?", 3);
-		g_free(tmp);
-		charset = encoded_word[0];
-		encoding = charset != NULL ? encoded_word[1] : NULL;
-		word = encoding != NULL ? encoded_word[2] : NULL;
-
-		/* Convert the decoded word to utf8 and append it */
-		tmp = gaim_mime_decode_word(charset, encoding, word);
-		if (tmp != NULL) {
-			donedeal = g_string_append(donedeal, tmp);
-			g_free(tmp);
-		}
-
-		g_strfreev(encoded_word);
-
-		end_of_last = end + 2;
-	}
-
-	/* Append everything from the end of the last encoded-word to the end of the string */
-	tmp = g_strndup(end_of_last, ((orig + strlen(orig)) - end_of_last));
-	donedeal = g_string_append(donedeal, tmp);
-	g_free(tmp);
-
-	/* Free at last, free at last... */
-	tmp = donedeal->str;
-	g_string_free(donedeal, FALSE);
-	g_free(orig);
-
-	return tmp;
-#endif
 }
 
 
-
 /**************************************************************************
  * Date/Time Functions
  **************************************************************************/