112,146d111
< 
< 	char pfilename[256]="";
<         strcpy(pfilename,dIconConfig->getPictureFilename().c_str());
<         strcpy(pfilename+strlen(pfilename),"_");
< 	
< 	pimage = imlib_load_image(pfilename);
< 
< 	if (pimage)
< 	{
< 		imlib_context_set_image(pimage);
< 
< 		orgWidth = imlib_image_get_width();
< 		orgHeight = imlib_image_get_height();
< 
< 		if (width == 0)
< 			width = imlib_image_get_width();
< 		if (height == 0)
< 			height= imlib_image_get_height();
< 		
< 		Imlib_Image tempImg = imlib_create_cropped_scaled_image(0, 0,
< 				orgWidth, orgHeight, width, height);
< 
< 		imlib_free_image();
< 
< 		pimage = tempImg;
<         
< 		hasAlpha = true; //TODO add checks here
< 	}    
< 	else
< 	{
< 		cout << "Can't load secondary image : " << dIconConfig->getPictureFilename()
< 				<< " bailing -- "
< 				<< dIconConfig->getCaption() << endl
< 				<< "Check to see if the image and path to image is valid\n";
< 	}
251c216
<     imlib_context_set_image(glowing?image:pimage);
---
>     imlib_context_set_image(image);
256,258d220
< 
<     //imlib_context_set_image(pimage);
< 
260,262c222,223
< 
< //    XSetWindowBackgroundPixmap (display, window, pixmap);
<    
---
>     XSetWindowBackgroundPixmap (display, window, pixmap);
>     
264c225
< //    XShapeCombineMask(display, window, ShapeBounding, 0, 0, pixMask, ShapeSet);
---
>     XShapeCombineMask(display, window, ShapeBounding, 0, 0, pixMask, ShapeSet);
269d229
< 
324,325c284
<     //imlib_context_set_image(image);
<     //imlib_context_set_image(glowing?image:pimage);
---
>     imlib_context_set_image(image);
331d289
< 
336d293
<     shapeWindow();
348c305
<     imlib_blend_image_onto_image(glowing?image:pimage, 1, 0, 0, width, height, 0, 0, width, height);
---
>     imlib_blend_image_onto_image(image, 1, 0, 0, width, height, 0, 0, width, height);
356d312
< 
358,360d313
< 
< 
<     // Hier einfuegen
364d316
< 
367,375d318
< 
< 
< //// ENDE
< 
< 
< 
< 
< 
<