comparison: ui/common/properties.c
ui/common/properties.c
- branch
- newapi
- changeset 378
- d41b1ffc5f77
- parent 254
- 13997c76859b
- child 379
- 958bae372271
equal
deleted
inserted
replaced
| 377:3a60db9ebb5d | 378:d41b1ffc5f77 |
|---|---|
| 30 #include <stdlib.h> | 30 #include <stdlib.h> |
| 31 #include <string.h> | 31 #include <string.h> |
| 32 #include <sys/stat.h> | 32 #include <sys/stat.h> |
| 33 #include <errno.h> | 33 #include <errno.h> |
| 34 | 34 |
| 35 #include "../ui/toolkit.h" | |
| 36 | |
| 37 | |
| 35 #include "properties.h" | 38 #include "properties.h" |
| 36 #include <cx/string.h> | 39 #include <cx/string.h> |
| 37 #include <cx/buffer.h> | 40 #include <cx/buffer.h> |
| 38 | 41 |
| 39 #include "ucx_properties.h" | 42 #include "ucx_properties.h" |
| 46 static char *locales_dir; | 49 static char *locales_dir; |
| 47 static char *pixmaps_dir; | 50 static char *pixmaps_dir; |
| 48 | 51 |
| 49 #endif | 52 #endif |
| 50 | 53 |
| 51 char* ui_getappdir() { | 54 |
| 55 char* ui_getappdir(void) { | |
| 52 if(ui_appname() == NULL) { | 56 if(ui_appname() == NULL) { |
| 53 return NULL; | 57 return NULL; |
| 54 } | 58 } |
| 55 | 59 |
| 56 return ui_configfile(NULL); | 60 return ui_configfile(NULL); |
| 57 } | 61 } |
| 58 | 62 |
| 59 char* ui_configfile(char *name) { | 63 char* ui_configfile(char *name) { |
| 60 const char *appname = ui_appname(); | 64 const char *appname = ui_appname(); |
| 294 if(!language) { | 298 if(!language) { |
| 295 return NULL; | 299 return NULL; |
| 296 } | 300 } |
| 297 return cxMapGet(language, name); | 301 return cxMapGet(language, name); |
| 298 } | 302 } |
| 299 |
