Added (forgotten) release for notifications when destroying a WMList.

WINGs/Tests/wmfile.c

@@ -70,14 +70,15 @@ int main(int argc, char **argv)
   extern char *optarg;
   extern int optind;
 
-  WMInitializeApplication("WMFile", &argc, argv);
-    
-  ProgName = argv[0];
-
   if (!dpy) {
     puts("could not open display");
     exit(1);
   }
+
+  WMInitializeApplication("WMFile", &argc, argv);
+
+  ProgName = argv[0];
+
   while((ch = getopt(argc, argv, "si:ht:")) != -1)
     switch(ch) 
     { 

WINGs/WINGs/WINGs.h

@@ -744,8 +744,6 @@ WMFont* WMEmphasizeFont(WMScreen *scr, WMFont *font);
 
 WMFont* WMUnemphasizeFont(WMScreen *scr, WMFont *font);
 
-WMFont* WMGetFontOfSize(WMScreen *scr, WMFont *font, int size);
-
 /* ....................................................................... */
 
 WMPixmap* WMRetainPixmap(WMPixmap *pixmap);

WINGs/wfont.c

@@ -681,7 +681,6 @@ changeFontProp(char *fname, char *newprop, int which)
 WMFont*
 WMNormalizeFont(WMScreen *scr, WMFont *font)
 {
-    WMFont *newfont=NULL;
     char fname[256];
 
     if (!scr || !font)
@@ -690,19 +689,16 @@ WMNormalizeFont(WMScreen *scr, WMFont *font)
     snprintf(fname, 255, "%s", font->name);
     changeFontProp(fname, "medium", 2);
     changeFontProp(fname, "r", 3);
-    newfont = WMCreateNormalFont(scr, fname);
-
-    if (!newfont)
-        return NULL;
-
-    return newfont;
+    if (font->antialiased)
+        return WMCreateAAFont(scr, fname);
+    else
+        return WMCreateNonAAFont(scr, fname);
 }
 
 
 WMFont*
 WMStrengthenFont(WMScreen *scr, WMFont *font)
 {
-    WMFont *newfont=NULL;
     char fname[256];
 
     if (!scr || !font)
@@ -710,19 +706,16 @@ WMStrengthenFont(WMScreen *scr, WMFont *font)
 
     snprintf(fname, 255, "%s", font->name);
     changeFontProp(fname, "bold", 2);
-    newfont = WMCreateNormalFont(scr, fname);
-
-    if (!newfont)
-        return NULL;
-
-    return newfont;
+    if (font->antialiased)
+        return WMCreateAAFont(scr, fname);
+    else
+        return WMCreateNonAAFont(scr, fname);
 }
 
 
 WMFont*
 WMUnstrengthenFont(WMScreen *scr, WMFont *font)
 {
-    WMFont *newfont=NULL;
     char fname[256];
 
     if (!scr || !font)
@@ -730,39 +723,37 @@ WMUnstrengthenFont(WMScreen *scr, WMFont *font)
 
     snprintf(fname, 255, "%s", font->name);
     changeFontProp(fname, "medium", 2);
-    newfont = WMCreateNormalFont(scr, fname);
-
-    if (!newfont)
-        return NULL;
-
-    return newfont;
+    if (font->antialiased)
+        return WMCreateAAFont(scr, fname);
+    else
+        return WMCreateNonAAFont(scr, fname);
 }
 
 
 WMFont*
 WMEmphasizeFont(WMScreen *scr, WMFont *font)
 {
-    WMFont *newfont=NULL;
     char fname[256];
 
     if (!scr || !font)
         return NULL;
 
     snprintf(fname, 255, "%s", font->name);
-    changeFontProp(fname, "o", 3);
-    newfont = WMCreateNormalFont(scr, fname);
+    if (font->antialiased)
+        changeFontProp(fname, "i", 3);
+    else
+        changeFontProp(fname, "o", 3);
 
-    if (!newfont)
-        return NULL;
-
-    return newfont;
+    if (font->antialiased)
+        return WMCreateAAFont(scr, fname);
+    else
+        return WMCreateNonAAFont(scr, fname);
 }
 
 
 WMFont*
 WMUnemphasizeFont(WMScreen *scr, WMFont *font)
 {
-    WMFont *newfont=NULL;
     char fname[256];
 
     if (!scr || !font)
@@ -770,22 +761,10 @@ WMUnemphasizeFont(WMScreen *scr, WMFont *font)
 
     snprintf(fname, 255, "%s", font->name);
     changeFontProp(fname, "r", 3);
-    newfont = WMCreateNormalFont(scr, fname);
-
-    if (!newfont)
-        return NULL;
-
-    return newfont;
-}
-
-
-WMFont*
-WMGetFontOfSize(WMScreen *scr, WMFont *font, int size)
-{
-    if(!scr || !font || size<1)
-        return NULL;
-
-    return font;
+    if (font->antialiased)
+        return WMCreateAAFont(scr, fname);
+    else
+        return WMCreateNonAAFont(scr, fname);
 }
 
 

WINGs/wlist.c

@@ -1264,6 +1264,8 @@ destroyList(List *lPtr)
     if (lPtr->doubleBuffer)
         XFreePixmap(lPtr->view->screen->display, lPtr->doubleBuffer);
 
+    WMRemoveNotificationObserver(lPtr);
+
     wfree(lPtr);
 }
 

wrlib/Makefile.am

@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = no-dependencies
 
 lib_LTLIBRARIES = libwraster.la
 
-libwraster_la_LDFLAGS = -version-info 5:0:3
+libwraster_la_LDFLAGS = -version-info 3:0:0
 
 bin_SCRIPTS = get-wraster-flags