3 files changed, 4 insertions, 4 deletions
diff --git a/xparts/src/gtk/gtkbrowserextension.c b/xparts/src/gtk/gtkbrowserextension.c
index 420bb3d5..7e2310e6 100644
--- a/xparts/src/gtk/gtkbrowserextension.c
+++ b/xparts/src/gtk/gtkbrowserextension.c
@@ -121,7 +121,7 @@ gboolean gtk_xbrowserextension_dcop_process( DcopObject *obj, const char *fun, d
 {
     GtkXBrowserExtension *part = GTK_XBROWSEREXTENSION(obj);
     GtkXBrowserExtensionPrivate *d = (GtkXBrowserExtensionPrivate *)part->data;
-    GtkXBrowserExtensionClass *klass = GTK_XBROWSEREXTENSION_CLASS(GTK_OBJECT(part)->klass);
+    GtkXBrowserExtensionClass *klass = GTK_XBROWSEREXTENSION_CLASS(GTK_OBJECT_GET_CLASS(part));
 
     if ( strcmp( fun, "saveState()" ) == 0 )
     {
diff --git a/xparts/src/gtk/gtkpart.c b/xparts/src/gtk/gtkpart.c
index 655b7aa5..2a214123 100644
--- a/xparts/src/gtk/gtkpart.c
+++ b/xparts/src/gtk/gtkpart.c
@@ -22,7 +22,7 @@ struct _GtkXPartPrivate {
 };
 
 #define P ((GtkXPartPrivate *)(part->data))
-#define CLASS(obj) GTK_XPART_CLASS(GTK_OBJECT(obj)->klass)
+#define CLASS(obj) GTK_XPART_CLASS(GTK_OBJECT_GET_CLASS(obj))
 
 
 /* class and instance initialization */
@@ -131,7 +131,7 @@ gboolean gtk_xpart_dcop_process( DcopObject *obj, const char *fun, dcop_data *da
 {
     GtkXPart *part = GTK_XPART(obj);
     GtkXPartPrivate *d = (GtkXPartPrivate *)part->data;
-    GtkXPartClass *klass = GTK_XPART_CLASS(GTK_OBJECT(part)->klass);
+    GtkXPartClass *klass = GTK_XPART_CLASS(GTK_OBJECT_GET_CLASS(part));
     gboolean b;
 
     if ( strcmp( fun, "windowId()" ) == 0 )
diff --git a/xparts/src/kde/xparthost_kpart.cpp b/xparts/src/kde/xparthost_kpart.cpp
index 77def3ff..807ada77 100644
--- a/xparts/src/kde/xparthost_kpart.cpp
+++ b/xparts/src/kde/xparthost_kpart.cpp
@@ -42,11 +42,11 @@ DCOPRef XPartHost_KPart::registerXPart( const DCOPRef &part )
     assert( m_stub == 0 );
 
     m_stub = new XPart_stub( part.app(), part.object() );
+    m_stub->show();
 
     kdDebug() << "embedding window " << m_stub->windowId() << endl;
     embed->embed( static_cast<WId>( m_stub->windowId() ) );
 
-    m_stub->show();
     embed->show();
      DCOPRef ref = m_stub->queryExtension("browserextension");
      if( !ref.isNull() ) {