diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/iconmgr.c | 2 | ||||
| -rw-r--r-- | src/iconmgr.h | 6 | ||||
| -rw-r--r-- | src/list.c | 6 | ||||
| -rw-r--r-- | src/list.h | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 092d8ce..ba9c7b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,7 +30,7 @@ dist_rc_DATA = system.twmrc AM_CPPFLAGS = \ -DXVENDORNAME=\"The\ X.Org\ Foundation\" \ -DXORG_RELEASE=\"Release\ $(VERSION)\" \ - -DSYSTEM_INIT_FILE=\"${datadir}/X11/twm/system.twmrc\" + -DSYSTEM_INIT_FILE=\"${rcdir}/system.twmrc\" AM_CFLAGS = $(TWM_CFLAGS) twm_LDADD = $(TWM_LIBS) diff --git a/src/iconmgr.c b/src/iconmgr.c index d9c4e76..ca7b307 100644 --- a/src/iconmgr.c +++ b/src/iconmgr.c @@ -61,7 +61,7 @@ CreateIconManagers(void) char str[100]; char str1[100]; Pixel background; - char *icon_name; + const char *icon_name; if (Scr->NoIconManagers) return; diff --git a/src/iconmgr.h b/src/iconmgr.h index 8d7c66f..6157fa3 100644 --- a/src/iconmgr.h +++ b/src/iconmgr.h @@ -62,9 +62,9 @@ typedef struct IconMgr TwmWindow *twm_win; /* back pointer to the new parent */ struct ScreenInfo *scr; /* the screen this thing is on */ Window w; /* this icon manager window */ - char *geometry; /* geometry string */ - char *name; - char *icon_name; + const char *geometry; /* geometry string */ + const char *name; + const char *icon_name; int x, y, width, height; int columns, cur_rows, cur_columns; int count; @@ -117,7 +117,7 @@ AddToList(name_list **list_head, char *name, char *ptr) * \param class a pointer to the class to look for */ char * -LookInList(name_list *list_head, char *name, XClassHint *class) +LookInList(name_list *list_head, const char *name, XClassHint *class) { name_list *nptr; @@ -142,7 +142,7 @@ LookInList(name_list *list_head, char *name, XClassHint *class) } char * -LookInNameList(name_list *list_head, char *name) +LookInNameList(name_list *list_head, const char *name) { return (LookInList(list_head, name, NULL)); } @@ -158,7 +158,7 @@ LookInNameList(name_list *list_head, char *name) * \param class a pointer to the class to look for * \param[out] ptr fill in the list value if the name was found */ -int GetColorFromList(name_list *list_head, char *name, XClassHint *class, +int GetColorFromList(name_list *list_head, const char *name, XClassHint *class, Pixel *ptr) { int save; @@ -70,11 +70,11 @@ typedef struct name_list_struct name_list; extern void AddToList ( name_list **list_head, char *name, char *ptr ); extern void FreeList ( name_list **list ); -extern int GetColorFromList ( name_list *list_head, char *name, +extern int GetColorFromList ( name_list *list_head, const char *name, XClassHint *class, Pixel *ptr ); -extern char * LookInList ( name_list *list_head, char *name, +extern char * LookInList ( name_list *list_head, const char *name, XClassHint *class ); -extern char * LookInNameList ( name_list *list_head, char *name ); +extern char * LookInNameList ( name_list *list_head, const char *name ); #endif /* _LIST_ */ |