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 e3810feece30aa06448391fb8e51494b4ef515bc..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-2011 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
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include <glib.h>
@@ -155,9 +156,11 @@ LogWindow *log_window_create(LogInstance instance)
 void log_window_init(LogWindow *logwin)
 {
        GtkTextBuffer *buffer;
+#if !GTK_CHECK_VERSION(3, 0, 0)
        GdkColormap *colormap;
-       GdkColor color[LOG_COLORS];
        gboolean success[LOG_COLORS];
+#endif
+       GdkColor color[LOG_COLORS];
        gint i;
 
        gtkut_convert_int_to_gdk_color(prefs_common.log_msg_color, &color[0]);
@@ -178,14 +181,15 @@ void log_window_init(LogWindow *logwin)
        logwin->status_nok_color = color[6];
        logwin->status_skip_color = color[7];
 
-       colormap = gdk_drawable_get_colormap(logwin->window->window);
+#if !GTK_CHECK_VERSION(3, 0, 0)
+       colormap = gdk_drawable_get_colormap(gtk_widget_get_window(logwin->window));
        gdk_colormap_alloc_colors(colormap, color, LOG_COLORS, FALSE, TRUE, success);
 
        for (i = 0; i < LOG_COLORS; i++) {
                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 =
@@ -195,6 +199,7 @@ void log_window_init(LogWindow *logwin)
                        break;
                }
        }
+#endif
 
        buffer = logwin->buffer;
        gtk_text_buffer_create_tag(buffer, "message",
@@ -244,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)
@@ -329,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<"))
@@ -364,10 +365,12 @@ static gboolean log_window_append(gpointer source, gpointer data)
               log_window_clip (logwindow, logwindow->clip_length);
 
        if (!logwindow->hidden) {
-               GtkAdjustment *vadj = text->vadjustment;
-               gfloat upper = vadj->upper - vadj->page_size;
-               if (vadj->value == upper || 
-                   (upper - vadj->value < 16 && vadj->value < 8))
+               GtkAdjustment *vadj = gtk_text_view_get_vadjustment(text);
+               gfloat upper = gtk_adjustment_get_upper(vadj) -
+                   gtk_adjustment_get_page_size(vadj);
+               gfloat value = gtk_adjustment_get_value(vadj);
+               if (value == upper || 
+                   (upper - value < 16 && value < 8))
                        gtk_text_view_scroll_mark_onscreen(text, logwindow->end_mark);
        }
 
@@ -382,9 +385,9 @@ static void hide_cb(GtkWidget *widget, LogWindow *logwin)
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                        LogWindow *logwin)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                gtk_widget_hide(logwin->window);
-       else if (event && event->keyval == GDK_Delete) 
+       else if (event && event->keyval == GDK_KEY_Delete) 
                log_window_clear(NULL, logwin);
 
        return FALSE;