merged from trunk

(bzr r11608.1.56)

1 files changed, 5 insertions, 40 deletions

diff --git a/src/sp-paint-server.cpp b/src/sp-paint-server.cpp
index d9e224167..7b38c554d 100644
--- a/src/sp-paint-server.cpp
+++ b/src/sp-paint-server.cpp
@@ -20,12 +20,6 @@
 #include "sp-gradient.h"
 #include "xml/node.h"
 
-static void sp_paint_server_class_init(SPPaintServerClass *psc);
-
-static cairo_pattern_t *sp_paint_server_create_dummy_pattern(SPPaintServer *ps, cairo_t *ct, Geom::OptRect const &bbox, double opacity);
-
-static SPObjectClass *parent_class;
-
 SPPaintServer *SPPaintServerReference::getObject() const
 {
     return static_cast<SPPaintServer *>(URIReference::getObject());
@@ -36,32 +30,10 @@ bool SPPaintServerReference::_acceptObject(SPObject *obj) const
     return SP_IS_PAINT_SERVER(obj);
 }
 
-GType SPPaintServer::get_type(void)
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPPaintServerClass),
-            NULL,       /* base_init */
-            NULL,       /* base_finalize */
-            (GClassInitFunc) sp_paint_server_class_init,
-            NULL,       /* class_finalize */
-            NULL,       /* class_data */
-            sizeof(SPPaintServer),
-            16, /* n_preallocs */
-            (GInstanceInitFunc) SPPaintServer::init,
-            NULL,       /* value_table */
-        };
-        type = g_type_register_static(SP_TYPE_OBJECT, "SPPaintServer", &info, (GTypeFlags) 0);
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPPaintServer, sp_paint_server, SP_TYPE_OBJECT);
 
 static void sp_paint_server_class_init(SPPaintServerClass *psc)
 {
-    //psc->pattern_new = sp_paint_server_create_dummy_pattern;
-
-    parent_class = static_cast<SPObjectClass *>(g_type_class_ref(SP_TYPE_OBJECT));
 }
 
 CPaintServer::CPaintServer(SPPaintServer* paintserver) : CObject(paintserver) {
@@ -71,9 +43,12 @@ CPaintServer::CPaintServer(SPPaintServer* paintserver) : CObject(paintserver) {
 CPaintServer::~CPaintServer() {
 }
 
-void SPPaintServer::init(SPPaintServer * ps)
+static void
+sp_paint_server_init(SPPaintServer *ps)
 {
 	ps->cpaintserver = new CPaintServer(ps);
+
+	delete ps->cobject;
 	ps->cobject = ps->cpaintserver;
 }
 
@@ -109,16 +84,6 @@ cairo_pattern_t *sp_paint_server_create_pattern(SPPaintServer *ps,
 	return sp_paint_server_invoke_create_pattern(ps, ct, bbox, opacity);
 }
 
-static cairo_pattern_t *
-sp_paint_server_create_dummy_pattern(SPPaintServer */*ps*/,
-                                     cairo_t */* ct */,
-                                     Geom::OptRect const &/*bbox*/,
-                                     double /* opacity */)
-{
-    cairo_pattern_t *cp = cairo_pattern_create_rgb(1.0, 0.0, 1.0);
-    return cp;
-}
-
 bool SPPaintServer::isSwatch() const
 {
     return swatch;