Update git.mk from master copy

[evince.git] / libview / ev-annotation-window.c

diff --git a/libview/ev-annotation-window.c b/libview/ev-annotation-window.c
index cbed0f74cc4e455678536b16b396551ac33e93e7..61002e2e61a85803fd6623b480c74bf0376a73b2 100644 (file)
--- a/libview/ev-annotation-window.c
+++ b/libview/ev-annotation-window.c
@@ -139,10 +139,6 @@ ev_annotation_window_set_color (EvAnnotationWindow *window,
 
        gcolor = *color;
 
-       /* Allocate these colors */
-       gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (window)),
-                                 &gcolor, FALSE, TRUE);
-
        /* Apply colors to style */
        rc_style = gtk_widget_get_modifier_style (GTK_WIDGET (window));
        rc_style->base[GTK_STATE_NORMAL] = gcolor;
@@ -332,6 +328,7 @@ ev_annotation_window_init (EvAnnotationWindow *window)
        gtk_widget_show (swindow);
 
        /* Resize bar */
+       gtk_window_set_has_resize_grip (GTK_WINDOW(window), FALSE);
        hbox = gtk_hbox_new (FALSE, 0);
 
        window->resize_sw = gtk_event_box_new ();