changeset 18412:304036f17274

merge of '67745ca449eb97ebc7870489be80d71559c3ecac' and '95ca36c9dbc9ea9774b0bf4723457ad3132e4e70'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sun, 01 Jul 2007 17:07:17 +0000
parents b9f003952c40 (diff) 3849776d0f71 (current diff)
children 526cc36424ab 93c5c785a811
files
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/plugins/log_reader.c	Sun Jul 01 17:05:16 2007 +0000
+++ b/libpurple/plugins/log_reader.c	Sun Jul 01 17:07:17 2007 +0000
@@ -1924,7 +1924,7 @@
 	char *utf8_string;
 	FILE *file;
 
-
+	*flags = PURPLE_LOG_READ_NO_NEWLINE;
 	g_return_val_if_fail(log != NULL, g_strdup(""));
 
 	data = log->logger_data;
--- a/libpurple/protocols/gg/lib/http.c	Sun Jul 01 17:05:16 2007 +0000
+++ b/libpurple/protocols/gg/lib/http.c	Sun Jul 01 17:07:17 2007 +0000
@@ -349,7 +349,7 @@
 			gg_debug(GG_DEBUG_MISC, "=> -----BEGIN-HTTP-HEADER-----\n%s\n=> -----END-HTTP-HEADER-----\n", h->header);
 
 			while (line) {
-				if (!g_ascii_strncasecmp(line, "Content-length: ", 16)) {
+				if (!strncasecmp(line, "Content-length: ", 16)) {
 					h->body_size = atoi(line + 16);
 				}
 				line = strchr(line, '\n');
--- a/libpurple/protocols/gg/lib/pubdir50.c	Sun Jul 01 17:05:16 2007 +0000
+++ b/libpurple/protocols/gg/lib/pubdir50.c	Sun Jul 01 17:07:17 2007 +0000
@@ -347,7 +347,7 @@
 
 		/* jeśli dostaliśmy namier na następne wyniki, to znaczy że
 		 * mamy koniec wyników i nie jest to kolejna osoba. */
-		if (!g_ascii_strcasecmp(field, "nextstart")) {
+		if (!strcasecmp(field, "nextstart")) {
 			res->next = atoi(value);
 			num--;
 		} else {
@@ -390,7 +390,7 @@
 	}
 
 	for (i = 0; i < res->entries_count; i++) {
-		if (res->entries[i].num == num && !g_ascii_strcasecmp(res->entries[i].field, field)) {
+		if (res->entries[i].num == num && !strcasecmp(res->entries[i].field, field)) {
 			value = res->entries[i].value;
 			break;
 		}
--- a/pidgin/gtkprefs.c	Sun Jul 01 17:05:16 2007 +0000
+++ b/pidgin/gtkprefs.c	Sun Jul 01 17:07:17 2007 +0000
@@ -640,7 +640,7 @@
 static void
 add_theme_button_clicked_cb(GtkWidget *widget, gpointer null)
 {
-	purple_request_file(NULL, "Install Theme", NULL, FALSE, (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, NULL) ;
+	purple_request_file(NULL, _("Install Theme"), NULL, FALSE, (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, NULL) ;
 }
 
 static void