aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2015-11-20 00:21:42 +00:00
commit 99facc1e77
5 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/command.c
View File

@ -1482,7 +1482,7 @@ static struct cmd_t command_defs[] =
}, },
{ "/priority", { "/priority",
cmd_priority, parse_args, 1, 1, &cons_priority_setting, cmd_priority, parse_args, 1, 1, NULL,
CMD_TAGS( CMD_TAGS(
CMD_TAG_PRESENCE) CMD_TAG_PRESENCE)
CMD_SYN( CMD_SYN(

6
src/config/preferences.c
View File

@ -280,12 +280,6 @@ prefs_set_inpblock(gint value)
_save_prefs(); _save_prefs();
} }
gint
prefs_get_priority(void)
{
return g_key_file_get_integer(prefs, PREF_GROUP_PRESENCE, "priority", NULL);
}
gint gint
prefs_get_reconnect(void) prefs_get_reconnect(void)
{ {

7
src/ui/console.c
View File

@ -1604,13 +1604,6 @@ cons_autoping_setting(void)
} }
} }
void
cons_priority_setting(void)
{
gint priority = prefs_get_priority();
cons_show("Priority (/priority) : %d", priority);
}
void void
cons_show_connection_prefs(void) cons_show_connection_prefs(void)
{ {

1
src/ui/ui.h
View File

@ -287,7 +287,6 @@ void cons_grlog_setting(void);
void cons_autoaway_setting(void); void cons_autoaway_setting(void);
void cons_reconnect_setting(void); void cons_reconnect_setting(void);
void cons_autoping_setting(void); void cons_autoping_setting(void);
void cons_priority_setting(void);
void cons_autoconnect_setting(void); void cons_autoconnect_setting(void);
void cons_inpblock_setting(void); void cons_inpblock_setting(void);
void cons_show_contact_online(PContact contact, Resource *resource, GDateTime *last_activity); void cons_show_contact_online(PContact contact, Resource *resource, GDateTime *last_activity);

1
tests/unittests/ui/stub_ui.c
View File

@ -430,7 +430,6 @@ void cons_grlog_setting(void) {}
void cons_autoaway_setting(void) {} void cons_autoaway_setting(void) {}
void cons_reconnect_setting(void) {} void cons_reconnect_setting(void) {}
void cons_autoping_setting(void) {} void cons_autoping_setting(void) {}
void cons_priority_setting(void) {}
void cons_autoconnect_setting(void) {} void cons_autoconnect_setting(void) {}
void cons_inpblock_setting(void) {} void cons_inpblock_setting(void) {}