--- deliantra/Deliantra-Client/Client.xs	2006/04/11 13:05:11	1.14
+++ deliantra/Deliantra-Client/Client.xs	2006/04/11 13:14:36	1.15
@@ -22,10 +22,10 @@
 typedef struct cf_layout {
   PangoLayout *pl;
   int base_height;
-} *Crossfire__Client__Layout;
+} *CFClient__Layout;
 
 static void
-layout_get_pixel_size (Crossfire__Client__Layout self, int *w, int *h)
+layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
 {
   pango_layout_get_pixel_size (self->pl, w, h);
 
@@ -34,7 +34,7 @@
   if (!*h) *h = 1;
 }
 
-MODULE = Crossfire::Client	PACKAGE = Crossfire::Client
+MODULE = CFClient	PACKAGE = CFClient
 
 PROTOTYPES: ENABLE
 
@@ -79,9 +79,9 @@
         pango_context_set_font_description (context, font);
 }
 
-MODULE = Crossfire::Client	PACKAGE = Crossfire::Client::Layout
+MODULE = CFClient	PACKAGE = CFClient::Layout
 
-Crossfire::Client::Layout
+CFClient::Layout
 new (SV *class, int base_height = 10)
 	CODE:
         New (0, RETVAL, 1, struct cf_layout);
@@ -92,13 +92,13 @@
         RETVAL
 
 void
-DESTROY (Crossfire::Client::Layout self)
+DESTROY (CFClient::Layout self)
 	CODE:
         g_object_unref (self->pl);
         Safefree (self);
 
 void
-set_markup (Crossfire::Client::Layout self, SV *text_)
+set_markup (CFClient::Layout self, SV *text_)
 	CODE:
 {
 	STRLEN textlen;
@@ -108,12 +108,12 @@
 }
 
 void
-set_width (Crossfire::Client::Layout self, int max_width = -1)
+set_width (CFClient::Layout self, int max_width = -1)
 	CODE:
         pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
 
 void
-size (Crossfire::Client::Layout self)
+size (CFClient::Layout self)
 	PPCODE:
 {
 	int w, h;
@@ -129,7 +129,7 @@
 }
 
 void
-render (Crossfire::Client::Layout self)
+render (CFClient::Layout self)
 	PPCODE:
 {
         SV *retval;
@@ -159,7 +159,7 @@
         PUSHs (sv_2mortal (retval));
 }
 
-MODULE = Crossfire::Client	PACKAGE = Crossfire::Client::Texture
+MODULE = CFClient	PACKAGE = CFClient::Texture
 
 void
 draw_quad (SV *self, double x, double y, double w = 0, double h = 0)