wDefaultGetImage renamed to get_icon_image
authorRodolfo García Peñas (kix) <kix@kix.es>
Sat, 10 Nov 2012 18:25:55 +0000 (10 19:25 +0100)
committerCarlos R. Mafra <crmafra@gmail.com>
Sat, 10 Nov 2012 19:47:40 +0000 (10 19:47 +0000)
The function wDefaultGetImage is renamed to get_icon_image.

src/defaults.h
src/screen.c
src/switchpanel.c
src/wdefaults.c

index e834c5a..197b9ab 100644 (file)
@@ -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_ */
index 2efe7c3..1ba325c 100644 (file)
@@ -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));
index 5006bce..ca2994c 100644 (file)
@@ -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);
index a342369..4000085 100644 (file)
@@ -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;