2011-10-07 [colin] 3.7.10cvs21

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

diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
index adb0b9f84778e773cee2776671480b378b8d601b..4b01d3f2cc95aa927804aa14324d8c0471f322c2 100644 (file)
--- a/src/gtk/logwindow.c
+++ b/src/gtk/logwindow.c
@@ -155,9 +155,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,6 +180,7 @@ void log_window_init(LogWindow *logwin)
        logwin->status_nok_color = color[6];
        logwin->status_skip_color = color[7];
 
+#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);
 
@@ -195,6 +198,7 @@ void log_window_init(LogWindow *logwin)
                        break;
                }
        }
+#endif
 
        buffer = logwin->buffer;
        gtk_text_buffer_create_tag(buffer, "message",
@@ -384,9 +388,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;