From 106af524dc03ebebca8602a5df5d5c75ed93c99d Mon Sep 17 00:00:00 2001
From: waker <wakeroid@gmail.com>
Date: Sat, 8 Oct 2011 17:27:39 +0200
Subject: removed some deprecated code

---
 plugins/gtkui/ddblistview.c | 46 ++-------------------------------------------
 plugins/gtkui/ddbtabstrip.c |  3 ---
 plugins/gtkui/drawing.h     |  6 ------
 plugins/gtkui/gdkdrawing.c  | 10 ----------
 4 files changed, 2 insertions(+), 63 deletions(-)

(limited to 'plugins')

diff --git a/plugins/gtkui/ddblistview.c b/plugins/gtkui/ddblistview.c
index f81333f4..88dab3cc 100644
--- a/plugins/gtkui/ddblistview.c
+++ b/plugins/gtkui/ddblistview.c
@@ -282,8 +282,7 @@ ddb_listview_class_init(DdbListviewClass *class)
 {
   GtkTableClass *widget_class = (GtkTableClass *) class;
   GObjectClass *object_class = (GObjectClass *) class;
-  // FIXME!!!
-  //object_class->destroy = ddb_listview_destroy;
+  object_class->finalize = ddb_listview_destroy;
 }
 
 static void
@@ -831,48 +830,8 @@ ddb_listview_vscroll_value_changed            (GtkRange        *widget,
         return;
     }
     if (newscroll != ps->scrollpos) {
-        GtkWidget *widget = ps->list;
-        int di = newscroll - ps->scrollpos;
-        int d = abs (di);
-        GtkAllocation a;
-        gtk_widget_get_allocation (ps->list, &a);
-        int height = a.height;
-        if (d < height) {
-            if (di > 0) {
-                // scroll down
-                // copy scrolled part of buffer
-#if !GTK_CHECK_VERSION(3,0,0)
-                // FIXME
-                gdk_draw_drawable (ps->list->window, widget->style->black_gc, ps->list->window, 0, d, 0, 0, a.width, a.height-d);
-#else
-//                cairo_region_copy ();
-#endif
-                // redraw other part
-                int start = height-d-1;
-                ps->scrollpos = newscroll;
-                // FIXME gtk_widget_queue_draw_area (ps->list, 0, start, ps->list->allocation.width, widget->allocation.height-start);
-            }
-            else {
-                // scroll up
-                // copy scrolled part of buffer
-#if !GTK_CHECK_VERSION(3,0,0)
-                // FIXME
-                gdk_draw_drawable (ps->list->window, widget->style->black_gc, ps->list->window, 0, 0, 0, d, widget->allocation.width, widget->allocation.height-d);
-#else
-//                cairo_region_copy ();
-#endif
-                // redraw other part
-                ps->scrollpos = newscroll;
-                // FIXME gtk_widget_queue_draw_area (ps->list, 0, 0, ps->list->allocation.width, d+1);
-            }
-        }
-        else {
-            // scrolled more than view height, redraw everything
-            ps->scrollpos = newscroll;
-            // FIXME gtk_widget_queue_draw (ps->list);
-        }
+        ps->scrollpos = newscroll;
         gtk_widget_queue_draw (ps->list);
-//        draw_drawable (widget->window, widget->style->black_gc, ps->list->window, 0, 0, 0, 0, widget->allocation.width, widget->allocation.height);
     }
 }
 
@@ -1289,7 +1248,6 @@ ddb_listview_list_render_row_background (DdbListview *ps, cairo_t *cr, DdbListvi
 
 	if (theming) {
 #if !GTK_CHECK_VERSION(3,0,0)
-        // FIXME
         if (gtk_widget_get_style (treeview)->depth == -1) {
             return; // drawing was called too early
         }
diff --git a/plugins/gtkui/ddbtabstrip.c b/plugins/gtkui/ddbtabstrip.c
index 093d5fbb..31812e01 100644
--- a/plugins/gtkui/ddbtabstrip.c
+++ b/plugins/gtkui/ddbtabstrip.c
@@ -231,7 +231,6 @@ ddb_tabstrip_class_init(DdbTabStripClass *class)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 #if !GTK_CHECK_VERSION(3,0,0)
-// FIXME?
   widget_class->expose_event = on_tabstrip_expose_event;
 #else
   widget_class->draw = on_tabstrip_draw;
@@ -248,8 +247,6 @@ ddb_tabstrip_class_init(DdbTabStripClass *class)
   widget_class->drag_end = on_tabstrip_drag_end;
   widget_class->drag_data_received = on_tabstrip_drag_data_received;
   widget_class->drag_leave = on_tabstrip_drag_leave;
-
-// FIXME?  object_class->destroy = ddb_tabstrip_destroy;
 }
 
 gboolean
diff --git a/plugins/gtkui/drawing.h b/plugins/gtkui/drawing.h
index fe3850f9..3556ec62 100644
--- a/plugins/gtkui/drawing.h
+++ b/plugins/gtkui/drawing.h
@@ -35,12 +35,6 @@ draw_begin (cairo_t *cr);
 void
 draw_end (void);
 
-void
-draw_copy (cairo_t *dest_canvas, cairo_t *src_canvas, int dx, int dy, int sx, int sy, int w, int h);
-
-void
-draw_pixbuf (cairo_t *dest_canvas, uintptr_t pixbuf, int dx, int dy, int sx, int sy, int w, int h);
-
 void
 draw_set_fg_color (float *rgb);
 
diff --git a/plugins/gtkui/gdkdrawing.c b/plugins/gtkui/gdkdrawing.c
index 7c610af8..9a86f2b4 100644
--- a/plugins/gtkui/gdkdrawing.c
+++ b/plugins/gtkui/gdkdrawing.c
@@ -45,16 +45,6 @@ draw_end (void) {
     drawable = NULL;
 }
 
-void
-draw_copy (cairo_t *dest_canvas, cairo_t *src_canvas, int dx, int dy, int sx, int sy, int w, int h) {
-// FIXME   gdk_draw_drawable (GDK_DRAWABLE (dest_canvas), gc, GDK_DRAWABLE (src_canvas), dx, dy, sx, sy, w, h);
-}
-
-void
-draw_pixbuf (cairo_t *dest_canvas, uintptr_t pixbuf, int dx, int dy, int sx, int sy, int w, int h) {
-// FIXME    gdk_draw_pixbuf (GDK_DRAWABLE (dest_canvas), gc, GDK_PIXBUF (pixbuf), sx, sy, dx, dy, w, h, GDK_RGB_DITHER_NONE, 0, 0);
-}
-
 void
 draw_set_fg_color (float *rgb) {
     cairo_set_source_rgb (drawable, rgb[0], rgb[1], rgb[2]);
-- 
cgit v1.2.3