in the UI replace 'POP3' with 'POP' and 'IMAP4' with 'IMAP'

[claws.git] / src / gtk / logwindow.c

diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
index d94eeb0e12149a986e96e505b87e9d3f31296c36..8faaf818ab7d81753187571608d2966dbcc6718f 100644 (file)
--- a/src/gtk/logwindow.c
+++ b/src/gtk/logwindow.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -189,7 +189,7 @@ void log_window_init(LogWindow *logwin)
                if (success[i] == FALSE) {
                        GtkStyle *style;
 
-                       g_warning("LogWindow: color allocation failed\n");
+                       g_warning("LogWindow: color allocation failed");
                        style = gtk_widget_get_style(logwin->window);
                        logwin->msg_color = logwin->warn_color =
                                        logwin->error_color = logwin->in_color =
@@ -249,10 +249,6 @@ void log_window_show(LogWindow *logwin)
        gtk_window_deiconify(GTK_WINDOW(logwin->window));
        gtk_widget_show(logwin->window);
        gtk_window_present(GTK_WINDOW(logwin->window));
-#ifdef MAEMO
-       maemo_window_full_screen_if_needed(GTK_WINDOW(logwin->window));
-       maemo_connect_key_press_to_mainwindow(GTK_WINDOW(logwin->window));
-#endif
 }
 
 static void log_window_jump_to_error(LogWindow *logwin)
@@ -334,14 +330,14 @@ static gboolean log_window_append(gpointer source, gpointer data)
 
        if (logtext->instance == LOG_PROTOCOL) {
                if (tag == NULL) {
-                       if (strstr(logtext->text, "] POP3>")
-                       ||  strstr(logtext->text, "] IMAP4>")
+                       if (strstr(logtext->text, "] POP>")
+                       ||  strstr(logtext->text, "] IMAP>")
                        ||  strstr(logtext->text, "] SMTP>")
                        ||  strstr(logtext->text, "] ESMTP>")
                        ||  strstr(logtext->text, "] NNTP>"))
                                tag = "output";
-                       if (strstr(logtext->text, "] POP3<")
-                       ||  strstr(logtext->text, "] IMAP4<")
+                       if (strstr(logtext->text, "] POP<")
+                       ||  strstr(logtext->text, "] IMAP<")
                        ||  strstr(logtext->text, "] SMTP<")
                        ||  strstr(logtext->text, "] ESMTP<")
                        ||  strstr(logtext->text, "] NNTP<"))