Don't add "Go to last error" to filtering log window's context menu.

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

diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
index 0c9700973c9be338edf86ace04eb9cd6e21b7625..47ff1c891860543bd32456ffa1f9c2849f84cf2f 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-2018 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
@@ -14,11 +14,11 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include <glib.h>
@@ -146,6 +146,7 @@ LogWindow *log_window_create(LogInstance instance)
        logwin->scrolledwin = scrolledwin;
        logwin->text = text;
        logwin->hook_id = hooks_register_hook(get_log_hook(instance), log_window_append, logwin);
+       logwin->has_error_capability = get_log_error_capability(instance);
 
        return logwin;
 }
@@ -162,14 +163,14 @@ void log_window_init(LogWindow *logwin)
        GdkColor color[LOG_COLORS];
        gint i;
 
-       gtkut_convert_int_to_gdk_color(prefs_common.log_msg_color, &color[0]);
-       gtkut_convert_int_to_gdk_color(prefs_common.log_warn_color, &color[1]);
-       gtkut_convert_int_to_gdk_color(prefs_common.log_error_color, &color[2]);
-       gtkut_convert_int_to_gdk_color(prefs_common.log_in_color, &color[3]);
-       gtkut_convert_int_to_gdk_color(prefs_common.log_out_color, &color[4]);
-       gtkut_convert_int_to_gdk_color(prefs_common.log_status_ok_color, &color[5]);
-       gtkut_convert_int_to_gdk_color(prefs_common.log_status_nok_color, &color[6]);
-       gtkut_convert_int_to_gdk_color(prefs_common.log_status_skip_color, &color[7]);
+       gtkut_convert_int_to_gdk_color(prefs_common.color[COL_LOG_MSG], &color[0]);
+       gtkut_convert_int_to_gdk_color(prefs_common.color[COL_LOG_WARN], &color[1]);
+       gtkut_convert_int_to_gdk_color(prefs_common.color[COL_LOG_ERROR], &color[2]);
+       gtkut_convert_int_to_gdk_color(prefs_common.color[COL_LOG_IN], &color[3]);
+       gtkut_convert_int_to_gdk_color(prefs_common.color[COL_LOG_OUT], &color[4]);
+       gtkut_convert_int_to_gdk_color(prefs_common.color[COL_LOG_STATUS_OK], &color[5]);
+       gtkut_convert_int_to_gdk_color(prefs_common.color[COL_LOG_STATUS_NOK], &color[6]);
+       gtkut_convert_int_to_gdk_color(prefs_common.color[COL_LOG_STATUS_SKIP], &color[7]);
 
        logwin->msg_color = color[0];
        logwin->warn_color = color[1];
@@ -188,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 =
@@ -248,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)
@@ -333,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<"))
@@ -435,6 +432,11 @@ static void log_window_clear(GtkWidget *widget, LogWindow *logwin)
        gtk_text_buffer_delete(textbuf, &start_iter, &end_iter);
 }
 
+static void log_window_go_to_last_error(GtkWidget *widget, LogWindow *logwin)
+{
+       log_window_jump_to_error(logwin);
+}
+
 static void log_window_popup_menu_extend(GtkTextView *textview,
                        GtkMenu *menu, LogWindow *logwin)
 {
@@ -446,7 +448,15 @@ static void log_window_popup_menu_extend(GtkTextView *textview,
        menuitem = gtk_separator_menu_item_new();
        gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem);
        gtk_widget_show(menuitem);
-       
+
+       if (logwin->has_error_capability) {
+               menuitem = gtk_menu_item_new_with_mnemonic(_("_Go to last error"));
+               g_signal_connect(G_OBJECT(menuitem), "activate",
+                                G_CALLBACK(log_window_go_to_last_error), logwin);
+               gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem);
+               gtk_widget_show(menuitem);
+       }
+
        menuitem = gtk_menu_item_new_with_mnemonic(_("Clear _Log"));
        g_signal_connect(G_OBJECT(menuitem), "activate",
                         G_CALLBACK(log_window_clear), logwin);