Merge pull request #42 from jasmineaura/develop

Bring Caja up to speed, stage1

1 files changed, 0 insertions, 68 deletions

diff --git a/libcaja-private/caja-cell-renderer-pixbuf-emblem.h b/libcaja-private/caja-cell-renderer-pixbuf-emblem.h
deleted file mode 100644
index cfdf93d4..00000000
--- a/libcaja-private/caja-cell-renderer-pixbuf-emblem.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-
-   caja-cell-renderer-pixbuf-emblem.h: cell renderer which can render
-   an emblem on top of a pixbuf (for use in FMListView and FMTreeView)
-
-   Copyright (C) 2003 Juerg Billeter
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the
-   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-
-   This is based on GtkCellRendererPixbuf written by
-   Jonathan Blandford <[email protected]>
-
-   Author: Juerg Billeter <[email protected]>
-*/
-
-#ifndef CAJA_CELL_RENDERER_PIXBUF_EMBLEM_H
-#define CAJA_CELL_RENDERER_PIXBUF_EMBLEM_H
-
-#include <gtk/gtk.h>
-
-#define CAJA_TYPE_CELL_RENDERER_PIXBUF_EMBLEM caja_cell_renderer_pixbuf_emblem_get_type()
-#define CAJA_CELL_RENDERER_PIXBUF_EMBLEM(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, CajaCellRendererPixbufEmblem))
-#define CAJA_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, CajaCellRendererPixbufEmblemClass))
-#define CAJA_IS_CELL_RENDERER_PIXBUF_EMBLEM(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAJA_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
-#define CAJA_IS_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), CAJA_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
-#define CAJA_CELL_RENDERER_PIXBUF_EMBLEM_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, CajaCellRendererPixbufEmblemClass))
-
-typedef struct _CajaCellRendererPixbufEmblem CajaCellRendererPixbufEmblem;
-typedef struct _CajaCellRendererPixbufEmblemClass CajaCellRendererPixbufEmblemClass;
-
-struct _CajaCellRendererPixbufEmblem
-{
-    GtkCellRenderer	parent;
-
-    /*< private >*/
-    GdkPixbuf *pixbuf;
-    GdkPixbuf *pixbuf_expander_open;
-    GdkPixbuf *pixbuf_expander_closed;
-    GdkPixbuf *pixbuf_emblem;
-};
-
-struct _CajaCellRendererPixbufEmblemClass
-{
-    GtkCellRendererClass parent_class;
-};
-
-GType		 caja_cell_renderer_pixbuf_emblem_get_type (void);
-GtkCellRenderer *caja_cell_renderer_pixbuf_emblem_new      (void);
-
-#endif /* CAJA_CELL_RENDERER_PIXBUF_EMBLEM_H */