mirror of
https://github.com/irssi/irssi.git
synced 2026-08-10 04:13:32 +02:00
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
This commit is contained in:
parent
ec168a4009
commit
bd00ff54c2
7 changed files with 23 additions and 16 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue