>From 9a0b41012a8dbc8a4d17823c85a2350262a03c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Sun, 15 Jul 2012 21:25:05 +0200
Subject: [PATCH 1/3] Removed WScreen argument in wIconValidateIconSize
This patch removes the argument WScreen in wIconValidateIconSize,
because is not used.
---
src/icon.c | 11 +++++------
src/icon.h | 2 +-
src/wdefaults.c | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/icon.c b/src/icon.c
index 8772f2c..812301e 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -149,7 +149,7 @@ WIcon *wIconCreate(WWindow * wwin)
return icon;
}
-WIcon *wIconCreateWithIconFile(WScreen * scr, char *iconfile, int tile)
+WIcon *wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile)
{
WIcon *icon;
@@ -160,8 +160,7 @@ WIcon *wIconCreateWithIconFile(WScreen * scr, char
*iconfile, int tile)
if (!icon->file_image)
wwarning(_("error loading image file \"%s\": %s"),
iconfile, RMessageForError(RErrorCode));
- icon->file_image = wIconValidateIconSize(scr, icon->file_image,
wPreferences.icon_size);
-
+ icon->file_image = wIconValidateIconSize(icon->file_image,
wPreferences.icon_size);
icon->file = wstrdup(iconfile);
}
@@ -338,7 +337,7 @@ void wIconChangeTitle(WIcon * icon, char *new_title)
wIconPaint(icon);
}
-RImage *wIconValidateIconSize(WScreen *scr, RImage *icon, int max_size)
+RImage *wIconValidateIconSize(RImage *icon, int max_size)
{
RImage *nimage;
@@ -376,7 +375,7 @@ Bool wIconChangeImageFile(WIcon * icon, char *file)
path = FindImage(wPreferences.icon_path, file);
if (path && (image = RLoadImage(scr->rcontext, path, 0))) {
- icon->file_image =
wIconValidateIconSize(icon->core->screen_ptr, image, wPreferences.icon_size);
+ icon->file_image = wIconValidateIconSize(image,
wPreferences.icon_size);
wIconUpdate(icon);
} else {
error = 1;
@@ -630,7 +629,7 @@ void get_pixmap_icon_from_user_icon(WScreen *scr, WIcon *
icon)
}
}
- image = wIconValidateIconSize(scr, image,
wPreferences.icon_size);
+ image = wIconValidateIconSize(image,
wPreferences.icon_size);
scr->def_icon_pixmap = makeIcon(scr, image, False,
False, icon->tile_type, icon->highlighted);
scr->def_ticon_pixmap = makeIcon(scr, image, True,
False, icon->tile_type, icon->highlighted);
if (image)
diff --git a/src/icon.h b/src/icon.h
index 62a1844..96bb7d0 100644
--- a/src/icon.h
+++ b/src/icon.h
@@ -65,7 +65,7 @@ void wIconChangeTitle(WIcon *icon, char *new_title);
Bool wIconChangeImageFile(WIcon *icon, char *file);
-RImage * wIconValidateIconSize(WScreen *scr, RImage *icon, int max_size);
+RImage *wIconValidateIconSize(RImage *icon, int max_size);
char *wIconStore(WIcon *icon);
char *get_name_for_instance_class(char *wm_instance, char *wm_class);
diff --git a/src/wdefaults.c b/src/wdefaults.c
index 1f52d7d..497cb48 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -432,7 +432,7 @@ RImage *get_default_icon_rimage(WScreen *scr, char
*file_name, int max_size)
wwarning(_("error loading image file \"%s\": %s"), file_name,
RMessageForError(RErrorCode));
- image = wIconValidateIconSize(scr, image, max_size);
+ image = wIconValidateIconSize(image, max_size);
return image;
}
--
1.7.10.4
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 9a0b41012a8dbc8a4d17823c85a2350262a03c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Sun, 15 Jul 2012 21:25:05 +0200
Subject: [PATCH 1/3] Removed WScreen argument in wIconValidateIconSize
This patch removes the argument WScreen in wIconValidateIconSize,
because is not used.
---
src/icon.c | 11 +++++------
src/icon.h | 2 +-
src/wdefaults.c | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/icon.c b/src/icon.c
index 8772f2c..812301e 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -149,7 +149,7 @@ WIcon *wIconCreate(WWindow * wwin)
return icon;
}
-WIcon *wIconCreateWithIconFile(WScreen * scr, char *iconfile, int tile)
+WIcon *wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile)
{
WIcon *icon;
@@ -160,8 +160,7 @@ WIcon *wIconCreateWithIconFile(WScreen * scr, char *iconfile, int tile)
if (!icon->file_image)
wwarning(_("error loading image file \"%s\": %s"), iconfile, RMessageForError(RErrorCode));
- icon->file_image = wIconValidateIconSize(scr, icon->file_image, wPreferences.icon_size);
-
+ icon->file_image = wIconValidateIconSize(icon->file_image, wPreferences.icon_size);
icon->file = wstrdup(iconfile);
}
@@ -338,7 +337,7 @@ void wIconChangeTitle(WIcon * icon, char *new_title)
wIconPaint(icon);
}
-RImage *wIconValidateIconSize(WScreen *scr, RImage *icon, int max_size)
+RImage *wIconValidateIconSize(RImage *icon, int max_size)
{
RImage *nimage;
@@ -376,7 +375,7 @@ Bool wIconChangeImageFile(WIcon * icon, char *file)
path = FindImage(wPreferences.icon_path, file);
if (path && (image = RLoadImage(scr->rcontext, path, 0))) {
- icon->file_image = wIconValidateIconSize(icon->core->screen_ptr, image, wPreferences.icon_size);
+ icon->file_image = wIconValidateIconSize(image, wPreferences.icon_size);
wIconUpdate(icon);
} else {
error = 1;
@@ -630,7 +629,7 @@ void get_pixmap_icon_from_user_icon(WScreen *scr, WIcon * icon)
}
}
- image = wIconValidateIconSize(scr, image, wPreferences.icon_size);
+ image = wIconValidateIconSize(image, wPreferences.icon_size);
scr->def_icon_pixmap = makeIcon(scr, image, False, False, icon->tile_type, icon->highlighted);
scr->def_ticon_pixmap = makeIcon(scr, image, True, False, icon->tile_type, icon->highlighted);
if (image)
diff --git a/src/icon.h b/src/icon.h
index 62a1844..96bb7d0 100644
--- a/src/icon.h
+++ b/src/icon.h
@@ -65,7 +65,7 @@ void wIconChangeTitle(WIcon *icon, char *new_title);
Bool wIconChangeImageFile(WIcon *icon, char *file);
-RImage * wIconValidateIconSize(WScreen *scr, RImage *icon, int max_size);
+RImage *wIconValidateIconSize(RImage *icon, int max_size);
char *wIconStore(WIcon *icon);
char *get_name_for_instance_class(char *wm_instance, char *wm_class);
diff --git a/src/wdefaults.c b/src/wdefaults.c
index 1f52d7d..497cb48 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -432,7 +432,7 @@ RImage *get_default_icon_rimage(WScreen *scr, char *file_name, int max_size)
wwarning(_("error loading image file \"%s\": %s"), file_name,
RMessageForError(RErrorCode));
- image = wIconValidateIconSize(scr, image, max_size);
+ image = wIconValidateIconSize(image, max_size);
return image;
}
--
1.7.10.4
