[PATCH 05/16] WindowMaker: wdefaults uses now StrConcatDot

[Rodolfo García Peñas]

The new StrConcatDot function can be used now in wdefaults.c
---
 src/wdefaults.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/wdefaults.c b/src/wdefaults.c
index c22ad5b..d680cf2 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -1,3 +1,4 @@
+
 /* wdefaults.c - window specific defaults
  *
  *  Window Maker window manager
@@ -181,8 +182,7 @@ wDefaultFillAttributes(WScreen * scr, char *instance, char 
*class,
        if (class && instance) {
                char *buffer;
 
-               buffer = wmalloc(strlen(class) + strlen(instance) + 2);
-               sprintf(buffer, "%s.%s", instance, class);
+               buffer = StrConcatDot(instance, class, True);
                key1 = WMCreatePLString(buffer);
                wfree(buffer);
        } else {
@@ -472,6 +472,7 @@ void wDefaultChangeIcon(WScreen * scr, char *instance, char 
*class, char *file)
        WDDomain *db = WDWindowAttributes;
        WMPropList *icon_value = NULL, *value, *attr, *key, *def_win, *def_icon 
= NULL;
        WMPropList *dict = db->dictionary;
+       char *buffer = NULL;
        int same = 0;
 
        if (!dict) {
@@ -484,16 +485,10 @@ void wDefaultChangeIcon(WScreen * scr, char *instance, 
char *class, char *file)
 
        WMPLSetCaseSensitive(True);
 
-       if (instance && class) {
-               char *buffer;
-               buffer = wmalloc(strlen(instance) + strlen(class) + 2);
-               sprintf(buffer, "%s.%s", instance, class);
+       if (instance || class) {
+               buffer = StrConcatDot(instance, class, False);
                key = WMCreatePLString(buffer);
                wfree(buffer);
-       } else if (instance) {
-               key = WMCreatePLString(instance);
-       } else if (class) {
-               key = WMCreatePLString(class);
        } else {
                key = WMRetainPropList(AnyWindow);
        }
-- 
1.7.9.1


>From 72204f47383654525a4a7d26135f40d37df6ac95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <k...@kix.es>
Date: Sat, 14 Apr 2012 11:21:39 +0200
Subject: [PATCH 05/16] WindowMaker: wdefaults uses now StrConcatDot

The new StrConcatDot function can be used now in wdefaults.c
---
 src/wdefaults.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/wdefaults.c b/src/wdefaults.c
index c22ad5b..d680cf2 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -1,3 +1,4 @@
+
 /* wdefaults.c - window specific defaults
  *
  *  Window Maker window manager
@@ -181,8 +182,7 @@ wDefaultFillAttributes(WScreen * scr, char *instance, char *class,
 	if (class && instance) {
 		char *buffer;
 
-		buffer = wmalloc(strlen(class) + strlen(instance) + 2);
-		sprintf(buffer, "%s.%s", instance, class);
+		buffer = StrConcatDot(instance, class, True);
 		key1 = WMCreatePLString(buffer);
 		wfree(buffer);
 	} else {
@@ -472,6 +472,7 @@ void wDefaultChangeIcon(WScreen * scr, char *instance, char *class, char *file)
 	WDDomain *db = WDWindowAttributes;
 	WMPropList *icon_value = NULL, *value, *attr, *key, *def_win, *def_icon = NULL;
 	WMPropList *dict = db->dictionary;
+	char *buffer = NULL;
 	int same = 0;
 
 	if (!dict) {
@@ -484,16 +485,10 @@ void wDefaultChangeIcon(WScreen * scr, char *instance, char *class, char *file)
 
 	WMPLSetCaseSensitive(True);
 
-	if (instance && class) {
-		char *buffer;
-		buffer = wmalloc(strlen(instance) + strlen(class) + 2);
-		sprintf(buffer, "%s.%s", instance, class);
+	if (instance || class) {
+		buffer = StrConcatDot(instance, class, False);
 		key = WMCreatePLString(buffer);
 		wfree(buffer);
-	} else if (instance) {
-		key = WMCreatePLString(instance);
-	} else if (class) {
-		key = WMCreatePLString(class);
 	} else {
 		key = WMRetainPropList(AnyWindow);
 	}
-- 
1.7.9.1