merge from trunk (r12122)

(bzr r11668.1.51)

1 files changed, 3 insertions, 27 deletions

diff --git a/src/sp-paint-server.cpp b/src/sp-paint-server.cpp
index ae4a60ba6..298b39117 100644
--- a/src/sp-paint-server.cpp
+++ b/src/sp-paint-server.cpp
@@ -20,12 +20,8 @@
 #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,35 +32,15 @@ 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));
 }
 
-void SPPaintServer::init(SPPaintServer * /*ps*/)
+static void
+sp_paint_server_init(SPPaintServer * /*ps*/)
 {
 }