From: Rodolfo García Peñas (kix) <kix@kix.es>
Date: Sat, 10 Nov 2012 18:25:55 +0000 (+0100)
Subject: wDefaultGetImage renamed to get_icon_image
X-Git-Tag: wmaker-0.95.4~54
X-Git-Url: https://repo.or.cz/w/wmaker-crm.git/commitdiff_plain/658597b8890e942ec11033bbda195d8259fec6d0

wDefaultGetImage renamed to get_icon_image

The function wDefaultGetImage is renamed to get_icon_image.
---

diff --git a/src/defaults.h b/src/defaults.h
index e834c5a5..197b9ab4 100644
--- a/src/defaults.h
+++ b/src/defaults.h
@@ -42,15 +42,16 @@ void wDefaultFillAttributes(char *instance, char *class,
                             Bool useGlobalDefault);
 
 char *get_default_image_path(WScreen *scr);
+RImage *get_default_image(WScreen *scr);
+
 char *wDefaultGetIconFile(char *instance, char *class, Bool default_icon);
 
-RImage * wDefaultGetImage(WScreen *scr, char *winstance, char *wclass, int max_size);
+RImage *get_icon_image(WScreen *scr, char *winstance, char *wclass, int max_size);
+char *get_icon_filename(WScreen *scr, char *winstance, char *wclass, char *command,
+			Bool default_icon);
 
 
 int wDefaultGetStartWorkspace(WScreen *scr, char *instance, char *class);
 void wDefaultChangeIcon(WScreen *scr, char *instance, char* class, char *file);
-RImage *get_default_image(WScreen *scr);
-char *get_icon_filename(WScreen *scr, char *winstance, char *wclass, char *command,
-			Bool default_icon);
 RImage *get_rimage_from_file(WScreen *scr, char *file_name, int max_size);
 #endif /* WMDEFAULTS_H_ */
diff --git a/src/screen.c b/src/screen.c
index 2efe7c35..1ba325c9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -413,7 +413,7 @@ static void createPixmaps(WScreen * scr)
 
 void create_logo_image(WScreen *scr)
 {
-	RImage *image = wDefaultGetImage(scr, "Logo", "WMPanel", wPreferences.icon_size);
+	RImage *image = get_icon_image(scr, "Logo", "WMPanel", wPreferences.icon_size);
 
 	if (!image) {
 		wwarning(_("could not load logo image for panels: %s"), RMessageForError(RErrorCode));
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 5006bce6..ca2994cb 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -161,9 +161,9 @@ static void addIconForWindow(WSwitchPanel *panel, WMWidget *parent, WWindow *wwi
 	if (!WFLAGP(wwin, always_user_icon) && wwin->net_icon_image)
 		image = RRetainImage(wwin->net_icon_image);
 
-	/* wDefaultGetImage() includes the default icon image */
+	/* get_icon_image() includes the default icon image */
 	if (!image)
-		image = wDefaultGetImage(panel->scr, wwin->wm_instance, wwin->wm_class, ICON_TILE_SIZE);
+		image = get_icon_image(panel->scr, wwin->wm_instance, wwin->wm_class, ICON_TILE_SIZE);
 
 	/* We must resize the icon size (~64) to the switchpanel icon size (~48) */
 	image = wIconValidateIconSize(image, ICON_SIZE);
diff --git a/src/wdefaults.c b/src/wdefaults.c
index a342369b..4000085e 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -469,7 +469,7 @@ RImage *get_default_image(WScreen *scr)
 	return image;
 }
 
-RImage *wDefaultGetImage(WScreen *scr, char *winstance, char *wclass, int max_size)
+RImage *get_icon_image(WScreen *scr, char *winstance, char *wclass, int max_size)
 {
 	char *file_name = NULL;