diff -Naur Terminal-0.2.8/terminal/terminal-app.c Terminal-0.2.8-nocomp/terminal/terminal-app.c --- Terminal-0.2.8/terminal/terminal-app.c 2007-12-02 09:15:45.000000000 -0500 +++ Terminal-0.2.8-nocomp/terminal/terminal-app.c 2008-06-15 21:00:18.000000000 -0400 @@ -348,7 +348,7 @@ { const gchar *other_name; #if GTK_CHECK_VERSION(2,10,0) - GdkColormap *colormap; +// GdkColormap *colormap; #endif GdkDisplay *display = NULL; GdkScreen *screen = NULL; @@ -412,21 +412,21 @@ #if GTK_CHECK_VERSION(2,10,0) /* check if we already checked this screen */ - if (g_object_get_data (G_OBJECT (screen), "terminal-checked-screen") == NULL) - { +// if (g_object_get_data (G_OBJECT (screen), "terminal-checked-screen") == NULL) +// { /* check if we can use ARGB visual for this screen */ - colormap = gdk_screen_get_rgba_colormap (screen); - if (G_LIKELY (colormap != NULL)) - { +// colormap = gdk_screen_get_rgba_colormap (screen); +// if (G_LIKELY (colormap != NULL)) +// { /* use ARGB visual for all windows on this screen, required * for real transparency with a compositing manager. */ - gdk_screen_set_default_colormap (screen, colormap); - } +// gdk_screen_set_default_colormap (screen, colormap); +// } /* mark this screen as handled */ - g_object_set_data (G_OBJECT (screen), I_("terminal-checked-screen"), GINT_TO_POINTER (1)); - } +// g_object_set_data (G_OBJECT (screen), I_("terminal-checked-screen"), GINT_TO_POINTER (1)); +// } #endif return screen; diff -Naur Terminal-0.2.8/terminal/terminal-screen.c Terminal-0.2.8-nocomp/terminal/terminal-screen.c --- Terminal-0.2.8/terminal/terminal-screen.c 2008-06-15 16:20:52.000000000 -0400 +++ Terminal-0.2.8-nocomp/terminal/terminal-screen.c 2008-06-15 21:20:46.000000000 -0400 @@ -374,7 +374,7 @@ terminal_screen_realize (GtkWidget *widget) { #if GTK_CHECK_VERSION(2,10,0) && defined(HAVE_VTE_TERMINAL_SET_OPACITY) - GdkScreen *screen; +// GdkScreen *screen; #endif (*GTK_WIDGET_CLASS (terminal_screen_parent_class)->realize) (widget); @@ -385,8 +385,8 @@ #if GTK_CHECK_VERSION(2,10,0) && defined(HAVE_VTE_TERMINAL_SET_OPACITY) /* connect to the "composited-changed" signal */ - screen = gtk_widget_get_screen (widget); - g_signal_connect_swapped (G_OBJECT (screen), "composited-changed", G_CALLBACK (terminal_screen_update_background), widget); +// screen = gtk_widget_get_screen (widget); +// g_signal_connect_swapped (G_OBJECT (screen), "composited-changed", G_CALLBACK (terminal_screen_update_background), widget); #endif } @@ -396,11 +396,11 @@ terminal_screen_unrealize (GtkWidget *widget) { #if GTK_CHECK_VERSION(2,10,0) && defined(HAVE_VTE_TERMINAL_SET_OPACITY) - GdkScreen *screen; +// GdkScreen *screen; /* disconnect the "composited-changed" handler */ - screen = gtk_widget_get_screen (widget); - g_signal_handlers_disconnect_by_func (G_OBJECT (screen), terminal_screen_update_background, widget); +// screen = gtk_widget_get_screen (widget); +// g_signal_handlers_disconnect_by_func (G_OBJECT (screen), terminal_screen_update_background, widget); #endif (*GTK_WIDGET_CLASS (terminal_screen_parent_class)->unrealize) (widget); @@ -862,7 +862,7 @@ vte_terminal_set_background_saturation (VTE_TERMINAL (screen->terminal), 1.0); vte_terminal_set_background_transparent (VTE_TERMINAL (screen->terminal), FALSE); #if GTK_CHECK_VERSION(2,10,0) && defined(HAVE_VTE_TERMINAL_SET_OPACITY) - vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0xFFFF); +// vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0xFFFF); #endif } else if (background_mode == TERMINAL_BACKGROUND_IMAGE) @@ -876,7 +876,7 @@ screen->terminal->allocation.height); vte_terminal_set_background_image (VTE_TERMINAL (screen->terminal), image); #if GTK_CHECK_VERSION(2,10,0) && defined(HAVE_VTE_TERMINAL_SET_OPACITY) - vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0xFFFF); +// vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0xFFFF); #endif if (image != NULL) g_object_unref (G_OBJECT (image)); @@ -889,20 +889,20 @@ #if GTK_CHECK_VERSION(2,10,0) && defined(HAVE_VTE_TERMINAL_SET_OPACITY) /* check if the X screen is composited */ - if (gdk_screen_is_composited (gtk_widget_get_screen (user_data))) - { - vte_terminal_set_background_saturation (VTE_TERMINAL (screen->terminal), 1.0); - vte_terminal_set_background_transparent (VTE_TERMINAL (screen->terminal), FALSE); - vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), (guint16) (0xFFFFu * background_darkness)); - } - else - { +// if (gdk_screen_is_composited (gtk_widget_get_screen (user_data))) +// { +// vte_terminal_set_background_saturation (VTE_TERMINAL (screen->terminal), 1.0); +// vte_terminal_set_background_transparent (VTE_TERMINAL (screen->terminal), FALSE); +// vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), (guint16) (0xFFFFu * background_darkness)); +// } +// else +// { #endif vte_terminal_set_background_saturation (VTE_TERMINAL (screen->terminal), 1.0 - background_darkness); vte_terminal_set_background_transparent (VTE_TERMINAL (screen->terminal), TRUE); #if GTK_CHECK_VERSION(2,10,0) && defined(HAVE_VTE_TERMINAL_SET_OPACITY) - vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0xFFFF); - } +// vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0xFFFF); +// } #endif } diff -Naur Terminal-0.2.8/terminal/terminal-window.c Terminal-0.2.8-nocomp/terminal/terminal-window.c --- Terminal-0.2.8/terminal/terminal-window.c 2008-06-15 16:02:40.000000000 -0400 +++ Terminal-0.2.8-nocomp/terminal/terminal-window.c 2008-06-15 21:36:07.000000000 -0400 @@ -105,10 +105,10 @@ guint page_num, TerminalWindow *window); #if GTK_CHECK_VERSION (2,10,0) -static void terminal_window_page_reordered (GtkNotebook *notebook, - GtkNotebookPage *page, - guint page_num, - TerminalWindow *window); +//static void terminal_window_page_reordered (GtkNotebook *notebook, +// GtkNotebookPage *page, +// guint page_num, +// TerminalWindow *window); #endif static GtkWidget *terminal_window_get_context_menu (TerminalScreen *screen, TerminalWindow *window); @@ -383,8 +383,8 @@ G_CALLBACK (terminal_window_screen_removed), window); #if GTK_CHECK_VERSION (2,10,0) - g_signal_connect (G_OBJECT (window->notebook), "page-reordered", - G_CALLBACK (terminal_window_page_reordered), window); +// g_signal_connect (G_OBJECT (window->notebook), "page-reordered", +// G_CALLBACK (terminal_window_page_reordered), window); #endif gtk_box_pack_start (GTK_BOX (vbox), window->notebook, TRUE, TRUE, 0); @@ -886,18 +886,18 @@ #if GTK_CHECK_VERSION (2,10,0) -static void -terminal_window_page_reordered (GtkNotebook *notebook, - GtkNotebookPage *page, - guint page_num, - TerminalWindow *window) -{ +//static void +//terminal_window_page_reordered (GtkNotebook *notebook, +// GtkNotebookPage *page, +// guint page_num, +// TerminalWindow *window) +//{ /* Regenerate the "Go" menu. * This also updates the accelerators. */ - terminal_window_rebuild_gomenu (window); -} +// terminal_window_rebuild_gomenu (window); +//} #endif @@ -1526,9 +1526,9 @@ TRUE, TRUE, GTK_PACK_START); #if GTK_CHECK_VERSION(2,10,0) - gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (window->notebook), - GTK_WIDGET (screen), - TRUE); +// gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (window->notebook), +// GTK_WIDGET (screen), +// TRUE); #endif /* check if we should always display tabs */