Merge remote-tracking branch 'backalor/master'

Conflicts:
	src/command.c
	src/preferences.c
	src/preferences.h
	src/windows.c
This commit is contained in:
James Booth
2013-01-22 01:33:32 +00:00
4 changed files with 53 additions and 1 deletions

View File

@@ -70,6 +70,8 @@ gchar * prefs_get_theme(void);
void prefs_set_theme(gchar *value);
gboolean prefs_get_mouse(void);
void prefs_set_mouse(gboolean value);
void prefs_set_statuses(gboolean value);
gboolean prefs_get_statuses(void);
void prefs_set_notify_message(gboolean value);
gboolean prefs_get_notify_message(void);