>From 09cd23b3abfb5519e8964c3720f8a75a80f90486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Mon, 18 Jun 2012 10:18:50 +0200
Subject: [PATCH 02/12] wAppIconSave is now void
The Bool value is not used, therefore the function don't need return
nothing.
wAppIconChangeImage is removed from appicon.h, because is not implemented.
wAppIconCreateForDock is "code clean" at appicon.h.
---
src/appicon.c | 9 +++++----
src/appicon.h | 8 +++-----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/appicon.c b/src/appicon.c
index c2707a8..d776ce4 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -396,20 +396,21 @@ void wAppIconPaint(WAppIcon * aicon)
0, 0, wPreferences.icon_size,
wPreferences.icon_size);
}
-Bool wAppIconSave(WAppIcon *aicon)
+void wAppIconSave(WAppIcon *aicon)
{
char *path;
- if (!aicon->docked || aicon->attracted) return True;
+ if (!aicon->docked || aicon->attracted)
+ return;
path = wIconStore(aicon->icon);
if (!path)
- return False;
+ return;
wApplicationSaveIconPathFor(path, aicon->wm_instance, aicon->wm_class);
wfree(path);
- return True;
+ return;
}
#define canBeDocked(wwin) ((wwin) && ((wwin)->wm_class||(wwin)->wm_instance))
diff --git a/src/appicon.h b/src/appicon.h
index b9e9636..1f0eb7c 100644
--- a/src/appicon.h
+++ b/src/appicon.h
@@ -70,8 +70,8 @@ typedef struct WAppIcon {
} WAppIcon;
WAppIcon *wAppIconCreate(WWindow *leader_win);
-WAppIcon * wAppIconCreateForDock(WScreen *scr, char *command, char
*wm_instance,
- char *wm_class, int tile);
+WAppIcon *wAppIconCreateForDock(WScreen *scr, char *command, char *wm_instance,
+ char *wm_class, int tile);
void wAppIconDestroy(WAppIcon *aicon);
void wAppIconPaint(WAppIcon *aicon);
@@ -84,7 +84,5 @@ void wApplicationSaveIconPathFor(char *iconPath, char
*wm_instance,
char *wm_class);
void wApplicationExtractDirPackIcon(WScreen *scr,char *path, char *wm_instance,
char *wm_class);
-
-Bool wAppIconChangeImage(WAppIcon *icon, char *file);
-Bool wAppIconSave(WAppIcon *aicon);
+void wAppIconSave(WAppIcon *aicon);
#endif
--
1.7.10
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 09cd23b3abfb5519e8964c3720f8a75a80f90486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Mon, 18 Jun 2012 10:18:50 +0200
Subject: [PATCH 02/12] wAppIconSave is now void
The Bool value is not used, therefore the function don't need return
nothing.
wAppIconChangeImage is removed from appicon.h, because is not implemented.
wAppIconCreateForDock is "code clean" at appicon.h.
---
src/appicon.c | 9 +++++----
src/appicon.h | 8 +++-----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/appicon.c b/src/appicon.c
index c2707a8..d776ce4 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -396,20 +396,21 @@ void wAppIconPaint(WAppIcon * aicon)
0, 0, wPreferences.icon_size, wPreferences.icon_size);
}
-Bool wAppIconSave(WAppIcon *aicon)
+void wAppIconSave(WAppIcon *aicon)
{
char *path;
- if (!aicon->docked || aicon->attracted) return True;
+ if (!aicon->docked || aicon->attracted)
+ return;
path = wIconStore(aicon->icon);
if (!path)
- return False;
+ return;
wApplicationSaveIconPathFor(path, aicon->wm_instance, aicon->wm_class);
wfree(path);
- return True;
+ return;
}
#define canBeDocked(wwin) ((wwin) && ((wwin)->wm_class||(wwin)->wm_instance))
diff --git a/src/appicon.h b/src/appicon.h
index b9e9636..1f0eb7c 100644
--- a/src/appicon.h
+++ b/src/appicon.h
@@ -70,8 +70,8 @@ typedef struct WAppIcon {
} WAppIcon;
WAppIcon *wAppIconCreate(WWindow *leader_win);
-WAppIcon * wAppIconCreateForDock(WScreen *scr, char *command, char *wm_instance,
- char *wm_class, int tile);
+WAppIcon *wAppIconCreateForDock(WScreen *scr, char *command, char *wm_instance,
+ char *wm_class, int tile);
void wAppIconDestroy(WAppIcon *aicon);
void wAppIconPaint(WAppIcon *aicon);
@@ -84,7 +84,5 @@ void wApplicationSaveIconPathFor(char *iconPath, char *wm_instance,
char *wm_class);
void wApplicationExtractDirPackIcon(WScreen *scr,char *path, char *wm_instance,
char *wm_class);
-
-Bool wAppIconChangeImage(WAppIcon *icon, char *file);
-Bool wAppIconSave(WAppIcon *aicon);
+void wAppIconSave(WAppIcon *aicon);
#endif
--
1.7.10
