diff options
| author | Timo Sirainen <cras@irssi.org> | 2002-04-10 02:53:06 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2002-04-10 02:53:06 +0000 |
| commit | bd00ff54c2bf569de50ff2df433bf90f279321a3 (patch) | |
| tree | 3b3fcba93d018c7264ef5961842c410fcf0b10c9 /src/fe-common | |
| parent | ec168a40096427e381c00e0ea04360d71abcf4d6 (diff) | |
| download | irssi-bd00ff54c2bf569de50ff2df433bf90f279321a3.zip | |
Fixed one error and several warnings with GLIB 2.0
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2663 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/core/completion.c | 3 | ||||
| -rw-r--r-- | src/fe-common/core/keyboard.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c index f10fbb6d..33287b73 100644 --- a/src/fe-common/core/completion.c +++ b/src/fe-common/core/completion.c @@ -267,7 +267,8 @@ GList *filename_complete(const char *path, const char *default_path) GList *list; DIR *dirp; struct dirent *dp; - char *realpath, *dir, *basename, *name; + const char *basename; + char *realpath, *dir, *name; int len; g_return_val_if_fail(path != NULL, NULL); diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c index 3c0efade..f6cffecb 100644 --- a/src/fe-common/core/keyboard.c +++ b/src/fe-common/core/keyboard.c @@ -563,8 +563,11 @@ int key_pressed(KEYBOARD_REC *keyboard, const char *key) g_strconcat(keyboard->key_state, "-", key, NULL); g_free_and_null(keyboard->key_state); +#if GLIB_MAJOR_VERSION == 2 +# define GSearchFunc GCompareFunc +#endif rec = g_tree_search(key_states, - (GSearchFunc) key_states_search, + (GCompareFunc) key_states_search, combo); if (rec == NULL) { /* unknown key combo, eat the invalid key |