[Xfce4-commits] <xfce4-session:master> Remove code for gtk < 2.14.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to b1caa88f32f431c5f2d18e66192d3ec4f9821688 (commit)
       from 6bfacf8c5125f8217349833edb7ddc8e7f92083f (commit)

commit b1caa88f32f431c5f2d18e66192d3ec4f9821688
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Oct 7 18:17:52 2010 +0200

    Remove code for gtk < 2.14.

 panel-plugin/xfsm-logout-plugin.c |    4 ----
 xfce4-session/xfsm-fadeout.c      |   37 -------------------------------------
 2 files changed, 0 insertions(+), 41 deletions(-)

diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c
index 0d1266e..0bc70db 100644
--- a/panel-plugin/xfsm-logout-plugin.c
+++ b/panel-plugin/xfsm-logout-plugin.c
@@ -249,11 +249,7 @@ xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
 
         gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
 
-#if GTK_CHECK_VERSION(2, 14, 0)
         topvbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
-#else
-        topvbox = GTK_DIALOG(dialog)->vbox;
-#endif
 
         hbox = gtk_hbox_new(FALSE, BORDER);
         gtk_container_set_border_width(GTK_CONTAINER(hbox), BORDER/2);
diff --git a/xfce4-session/xfsm-fadeout.c b/xfce4-session/xfsm-fadeout.c
index e112985..d000151 100644
--- a/xfce4-session/xfsm-fadeout.c
+++ b/xfce4-session/xfsm-fadeout.c
@@ -56,15 +56,6 @@ struct _XfsmFadeout
 
 
 
-#if !GTK_CHECK_VERSION(2,8,0)
-static char stipple_data[] = {
-  ' ', '.',
-  '.', ' ',
-};
-#endif
-
-
-
 XfsmFadeout*
 xfsm_fadeout_new (GdkDisplay *display)
 {
@@ -156,7 +147,6 @@ static void
 xfsm_fadeout_drawable_mono (XfsmFadeout *fadeout,
                             GdkDrawable *drawable)
 {
-#if GTK_CHECK_VERSION(2,8,0)
   cairo_t *cr;
 
   /* using Xrender gives better results */
@@ -164,32 +154,5 @@ xfsm_fadeout_drawable_mono (XfsmFadeout *fadeout,
   gdk_cairo_set_source_color (cr, &fadeout->color);
   cairo_paint_with_alpha (cr, 0.5);
   cairo_destroy (cr);
-#else
-  GdkGCValues  values;
-  GdkBitmap   *bm;
-  GdkGC       *gc;
-  gint         width;
-  gint         height;
-
-  bm = gdk_bitmap_create_from_data (drawable, stipple_data, 2, 2);
-
-  values.function = GDK_COPY;
-  values.fill = GDK_STIPPLED;
-  values.stipple = GDK_PIXMAP (bm);
-  values.subwindow_mode = TRUE;
-
-  gc = gdk_gc_new_with_values (drawable, &values,
-                               GDK_GC_FUNCTION | GDK_GC_FILL |
-                               GDK_GC_STIPPLE | GDK_GC_SUBWINDOW);
-
-  gdk_gc_set_rgb_fg_color (gc, &fadeout->color);
-
-  gdk_drawable_get_size (drawable, &width, &height);
-  gdk_draw_rectangle (drawable, gc, TRUE,
-                      0, 0, width, height);
-
-  g_object_unref (G_OBJECT (gc));
-  g_object_unref (G_OBJECT (bm));
-#endif
 }