>From ea0ea3176d9550b1e4372ad045555f9e3ba0d7a7 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 11:54:18 +0200
Subject: [PATCH 08/12] Do static icon functions
The functions wApplicationSaveIconPathFor() and wApplicationExtractDirPackIcon()
are now used only in appicon.c and can be static.
---
src/appicon.c | 5 +++--
src/appicon.h | 4 ----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/appicon.c b/src/appicon.c
index f513c52..47051c7 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -66,11 +66,12 @@ extern WDDomain *WDWindowAttributes;
void appIconMouseDown(WObjDescriptor * desc, XEvent * event);
static void iconDblClick(WObjDescriptor * desc, XEvent * event);
static void iconExpose(WObjDescriptor * desc, XEvent * event);
+static void wApplicationSaveIconPathFor(char *iconPath, char *wm_instance,
char *wm_class);
/* This function is used if the application is a .app. It checks if it has an
icon in it
* like for example /usr/local/GNUstep/Applications/WPrefs.app/WPrefs.tiff
*/
-void wApplicationExtractDirPackIcon(WScreen * scr, char *path, char
*wm_instance, char *wm_class)
+static void wApplicationExtractDirPackIcon(WScreen * scr, char *path, char
*wm_instance, char *wm_class)
{
char *iconPath = NULL;
char *tmp = NULL;
@@ -890,7 +891,7 @@ void appIconMouseDown(WObjDescriptor * desc, XEvent * event)
}
/* This function save the application icon and store the path in the
Dictionary */
-void wApplicationSaveIconPathFor(char *iconPath, char *wm_instance, char
*wm_class)
+static void wApplicationSaveIconPathFor(char *iconPath, char *wm_instance,
char *wm_class)
{
WMPropList *dict = WDWindowAttributes->dictionary;
WMPropList *adict, *key, *iconk;
diff --git a/src/appicon.h b/src/appicon.h
index 0785295..e401696 100644
--- a/src/appicon.h
+++ b/src/appicon.h
@@ -81,9 +81,5 @@ void makeAppIconFor(WApplication * wapp);
void removeAppIconFor(WApplication * wapp);
void save_app_icon(WApplication *wapp);
void paint_app_icon(WApplication *wapp);
-void wApplicationSaveIconPathFor(char *iconPath, char *wm_instance,
- char *wm_class);
-void wApplicationExtractDirPackIcon(WScreen *scr,char *path, char *wm_instance,
- char *wm_class);
void wAppIconSave(WAppIcon *aicon);
#endif
--
1.7.10
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From ea0ea3176d9550b1e4372ad045555f9e3ba0d7a7 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 11:54:18 +0200
Subject: [PATCH 08/12] Do static icon functions
The functions wApplicationSaveIconPathFor() and wApplicationExtractDirPackIcon()
are now used only in appicon.c and can be static.
---
src/appicon.c | 5 +++--
src/appicon.h | 4 ----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/appicon.c b/src/appicon.c
index f513c52..47051c7 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -66,11 +66,12 @@ extern WDDomain *WDWindowAttributes;
void appIconMouseDown(WObjDescriptor * desc, XEvent * event);
static void iconDblClick(WObjDescriptor * desc, XEvent * event);
static void iconExpose(WObjDescriptor * desc, XEvent * event);
+static void wApplicationSaveIconPathFor(char *iconPath, char *wm_instance, char *wm_class);
/* This function is used if the application is a .app. It checks if it has an icon in it
* like for example /usr/local/GNUstep/Applications/WPrefs.app/WPrefs.tiff
*/
-void wApplicationExtractDirPackIcon(WScreen * scr, char *path, char *wm_instance, char *wm_class)
+static void wApplicationExtractDirPackIcon(WScreen * scr, char *path, char *wm_instance, char *wm_class)
{
char *iconPath = NULL;
char *tmp = NULL;
@@ -890,7 +891,7 @@ void appIconMouseDown(WObjDescriptor * desc, XEvent * event)
}
/* This function save the application icon and store the path in the Dictionary */
-void wApplicationSaveIconPathFor(char *iconPath, char *wm_instance, char *wm_class)
+static void wApplicationSaveIconPathFor(char *iconPath, char *wm_instance, char *wm_class)
{
WMPropList *dict = WDWindowAttributes->dictionary;
WMPropList *adict, *key, *iconk;
diff --git a/src/appicon.h b/src/appicon.h
index 0785295..e401696 100644
--- a/src/appicon.h
+++ b/src/appicon.h
@@ -81,9 +81,5 @@ void makeAppIconFor(WApplication * wapp);
void removeAppIconFor(WApplication * wapp);
void save_app_icon(WApplication *wapp);
void paint_app_icon(WApplication *wapp);
-void wApplicationSaveIconPathFor(char *iconPath, char *wm_instance,
- char *wm_class);
-void wApplicationExtractDirPackIcon(WScreen *scr,char *path, char *wm_instance,
- char *wm_class);
void wAppIconSave(WAppIcon *aicon);
#endif
--
1.7.10
