diff --git a/DESIGN b/DESIGN deleted file mode 100644 index b90d9b25..00000000 --- a/DESIGN +++ /dev/null @@ -1,183 +0,0 @@ -Responsibilities are generally seperated into modules. - -profanity.c -=========== - -Contains initialisation, main loop, and shutdown functions. - -Initialisation is loading preferences, initialising any libraries/files/data -structures used. - -The main loop is where the work is done. It will keep checking for a new -character on the input, if there is one deals with it, if not, goes around the -loop again. - -If the character was a newline, the input line is processed, the result of -processing input will either continue (TRUE) or stop (FALSE, if the input -was "/quit"). - -Shutting down just involves clearing up resources. - -title_bar.c, windows.c, status_bar.c, input_win.c -================================================= - -These represent the different windows in Ncurses. - - +----------------------------------------------+ - | TITLE_BAR | - +----------------------------------------------+ - | | - | | - | WINDOWS | - | | - | | - +----------------------------------------------+ - | STATUS_BAR | - +----------------------------------------------+ - | INPUT_WIN | - +----------------------------------------------+ - -The interface to the UI is all through ui.h, all UI modules share this -header: - - - ui.h - | - | - -------------------------------------------------- - | | | | - title_bar.c windows.c status_bar.c inp_win.c - - - -So any calls to the UI are through ui.h - -title_bar.c and status_bar.c are relatively trivial. - -windows.c ---------- - -Contains a list of prof_win structs called _wins, which consist of: - - from: A string, the name of the recipient for this chat window - win: An ncurses pad containing the chat contents - y_pos: The current position in the chat window - paged: Whether or not the pad has been paged (i.e not showing the end) - -The console is _wins[0], and has a special 'from' value of "_cons". - -This module contains things like a pointer to the console window, the index -of the current window being displayed, a dirty flag that indicates the current -windows should be updated next time around the loop. - -inp_win.c ---------- - -Doesn't do much more than handle each character with inp_get_char(). Deals -with all special chars for editing the input, HOME, PAGE UP, UP, DOWN etc. - -command.c -========= - -When the main input loop gets a '\n', process_input() is called with the -line of input. - -This is where each command/message is handled. - -jabber.c -======== - -All interaction with libstrophe is done here. Contains a references to the -libstrophe objects: connection, context etc. - -Functions ending 'handler' are callback handlers registered with libstrophe, -e.g. for incomming messages. - -contact.c -========= - -PContact represents a contact with: - - name: The contacts JID, e.g. somecontact@server.org - show: "Online", "Away" etc - status: "I'm not here right now", "At lunch" etc - -It's an opaque pointer so all access to a PContact is encapsulated in this -module. - -contact_list.c -============== - -Currently has two purposes. - -First, stores a live list of online contacts. "Live" meaning jabber.c will -call contact_list_add() and contact_list_remove() as it gets presence -notifications from the server. - -Secondly it is used for autocompleting contact names when typing them, hence -it stores the contact in a PAutocomplete, described later. - -history.c -========= - -Stores a history of all input and allows navigating through it, bash style. - -Uses PHistory object, described later. - -preferences.c -============= - -Deals with loading and setting preferences saved in ~/.profanity. - -Also allows autocomplete of previous JIDs the user has logged in with -(stored in ~/.profanity) by storing them in a PAutocomplete. - -common.c -======== - -Functions written for compatibility with older versions of GLib. - -util.c -====== - -Some util functions, should probably move to common.c. - -log.c -===== - -Stores a reference to the log file, and provides functions for writing to it. - -Library like modules -==================== - -prof_history.c and prof_autocomplete.c implement a generic way to deal with -command history and command autocompletion respectively. - -The rest of Profanity uses them indirectly, via history.c for example, -and they know nothing about Profanity (no includes to profanity modules). - -These modules use opaque pointers so all access must be through functions -exposed in their headers. - -The idea is that these modules could be included in other applications. - -The "prof_" prefix is just because they were created whilst developing -Profanity. - -prof_autocomplete.c -------------------- - -Two types of PAutocomplete can be created. - -p_autocomplete_new() creates a PAutocomplete that can store strings, the -simple case. - -p_obj_autocomplete_new() creates a PAutocomplete of arbitrary data -structures. This function must be passed function pointers of the following -types: - - PStrFunc: A function that will get a string out of the data structure - PCopyFunc: A function that will make a copy the data structure, allocating - memory for it. - PEqualDeepFunc: A function to compare two structures by comparing all members. - GDestroyNotify: A function that will free memory for the data structure. diff --git a/docs/profanity.1 b/docs/profanity.1 index 629312e3..f2a85314 100644 --- a/docs/profanity.1 +++ b/docs/profanity.1 @@ -1,4 +1,4 @@ -.TH Profanity 1 "July 2013" "Profanity XMPP client" +.TH Profanity 1 "March 2014" "Profanity XMPP client" .SH NAME Profanity \- a simple console based XMPP chat client. .SH SYNOPSIS @@ -59,7 +59,7 @@ or with a Github account by logging issues on the issue tracker at: .PP .SH LICENSE -Copyright (C) 2012, 2013 James Booth . +Copyright (C) 2012 - 2014 James Booth . License GPLv3+: GNU GPL version 3 or later This is free software; you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -67,19 +67,4 @@ There is NO WARRANTY, to the extent permitted by law. .B Profanity was written by James Booth .B -with contributions from: -.br -.PP -Backalor -.br -Colin Bradley -.br -Dmitry Podgorny -.br -Dolan O'Toole -.br -Kieran Thandi -.br -Sam Whited -.br -Florent Peterschmitt +with many contributions from others, see the full list at: diff --git a/src/chat_session.c b/src/chat_session.c index 2cb3091b..b684fa84 100644 --- a/src/chat_session.c +++ b/src/chat_session.c @@ -1,7 +1,7 @@ /* * chat_session.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/chat_session.h b/src/chat_session.h index 300fa60c..662d61bb 100644 --- a/src/chat_session.h +++ b/src/chat_session.h @@ -1,7 +1,7 @@ /* * chat_session.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/command/command.c b/src/command/command.c index c5679905..13b91f3b 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -1,7 +1,7 @@ /* * command.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/command/command.h b/src/command/command.h index 28a8504e..e562d59b 100644 --- a/src/command/command.h +++ b/src/command/command.h @@ -1,7 +1,7 @@ /* * command.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/command/commands.c b/src/command/commands.c index de1c01ca..04563118 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -1,7 +1,7 @@ /* * commands.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/command/commands.h b/src/command/commands.h index 6a096be8..d96211bb 100644 --- a/src/command/commands.h +++ b/src/command/commands.h @@ -1,7 +1,7 @@ /* * commands.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/command/history.c b/src/command/history.c index d6f90820..9f421b42 100644 --- a/src/command/history.c +++ b/src/command/history.c @@ -1,7 +1,7 @@ /* * history.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/command/history.h b/src/command/history.h index 3027f627..929e1366 100644 --- a/src/command/history.h +++ b/src/command/history.h @@ -1,7 +1,7 @@ /* * history.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/common.c b/src/common.c index 9568dd39..a57b71ed 100644 --- a/src/common.c +++ b/src/common.c @@ -1,7 +1,7 @@ /* * common.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/common.h b/src/common.h index 1559c12a..1fefad06 100644 --- a/src/common.h +++ b/src/common.h @@ -1,7 +1,7 @@ /* * common.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/config/account.c b/src/config/account.c index b56cf6a4..a7437ad3 100644 --- a/src/config/account.c +++ b/src/config/account.c @@ -1,7 +1,7 @@ /* * account.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/config/account.h b/src/config/account.h index c77ce86d..6050b861 100644 --- a/src/config/account.h +++ b/src/config/account.h @@ -1,7 +1,7 @@ /* * account.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/config/accounts.c b/src/config/accounts.c index 1ae8b215..4b1ddb1e 100644 --- a/src/config/accounts.c +++ b/src/config/accounts.c @@ -1,7 +1,7 @@ /* * accounts.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/config/accounts.h b/src/config/accounts.h index 2010ff78..335eba9d 100644 --- a/src/config/accounts.h +++ b/src/config/accounts.h @@ -1,7 +1,7 @@ /* * accounts.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/config/preferences.c b/src/config/preferences.c index 8feb2ed0..23122795 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -1,7 +1,7 @@ /* * preferences.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/config/preferences.h b/src/config/preferences.h index 1afaad5d..17f798f1 100644 --- a/src/config/preferences.h +++ b/src/config/preferences.h @@ -1,7 +1,7 @@ /* * preferences.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/config/theme.c b/src/config/theme.c index 9c06014b..361bb5cb 100644 --- a/src/config/theme.c +++ b/src/config/theme.c @@ -1,7 +1,7 @@ /* * theme.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/config/theme.h b/src/config/theme.h index 568d5baf..5572b03f 100644 --- a/src/config/theme.h +++ b/src/config/theme.h @@ -1,7 +1,7 @@ /* * theme.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/contact.c b/src/contact.c index f2f74349..52942bec 100644 --- a/src/contact.c +++ b/src/contact.c @@ -1,7 +1,7 @@ /* * contact.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/contact.h b/src/contact.h index b096c8d9..c53b8708 100644 --- a/src/contact.h +++ b/src/contact.h @@ -1,7 +1,7 @@ /* * contact.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/jid.c b/src/jid.c index 6840b64b..03bf5144 100644 --- a/src/jid.c +++ b/src/jid.c @@ -1,7 +1,7 @@ /* * jid.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 -2014 James Booth * * This file is part of Profanity. * diff --git a/src/jid.h b/src/jid.h index dfca5af8..2fb447fe 100644 --- a/src/jid.h +++ b/src/jid.h @@ -1,7 +1,7 @@ /* * jid.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/log.c b/src/log.c index c92b164c..68ba476c 100644 --- a/src/log.c +++ b/src/log.c @@ -1,7 +1,7 @@ /* * log.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/log.h b/src/log.h index 3d0b3bae..fcb1a9f2 100644 --- a/src/log.h +++ b/src/log.h @@ -1,7 +1,7 @@ /* * log.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/main.c b/src/main.c index 20662ea6..f886a008 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,7 @@ /* * main.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * @@ -100,7 +100,7 @@ main(int argc, char **argv) g_print("Profanity, version %s\n", PROF_PACKAGE_VERSION); } - g_print("Copyright (C) 2012, 2013 James Booth <%s>.\n", PROF_PACKAGE_BUGREPORT); + g_print("Copyright (C) 2012 - 2014 James Booth <%s>.\n", PROF_PACKAGE_BUGREPORT); g_print("License GPLv3+: GNU GPL version 3 or later \n"); g_print("\n"); g_print("This is free software; you are free to change and redistribute it.\n"); diff --git a/src/muc.c b/src/muc.c index cb8dd346..eaca6b0b 100644 --- a/src/muc.c +++ b/src/muc.c @@ -1,7 +1,7 @@ /* * muc.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/muc.h b/src/muc.h index 7c378dd3..e28e048a 100644 --- a/src/muc.h +++ b/src/muc.h @@ -1,7 +1,7 @@ /* * muc.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/otr/otr.c b/src/otr/otr.c index 64194cfc..efd8b38c 100644 --- a/src/otr/otr.c +++ b/src/otr/otr.c @@ -1,7 +1,7 @@ /* * otr.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/otr/otr.h b/src/otr/otr.h index 6318f425..5239c033 100644 --- a/src/otr/otr.h +++ b/src/otr/otr.h @@ -1,7 +1,7 @@ /* * otr.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/otr/otrlib.h b/src/otr/otrlib.h index 160a9e73..0986c59b 100644 --- a/src/otr/otrlib.h +++ b/src/otr/otrlib.h @@ -1,7 +1,7 @@ /* * otrlib.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/otr/otrlibv3.c b/src/otr/otrlibv3.c index 3336093d..633d07b8 100644 --- a/src/otr/otrlibv3.c +++ b/src/otr/otrlibv3.c @@ -1,7 +1,7 @@ /* * otrlibv3.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/otr/otrlibv4.c b/src/otr/otrlibv4.c index 5c670355..80013af7 100644 --- a/src/otr/otrlibv4.c +++ b/src/otr/otrlibv4.c @@ -1,7 +1,7 @@ /* * otrlibv4.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/profanity.c b/src/profanity.c index 9ada5aed..6e10cd13 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -1,7 +1,7 @@ /* * profanity.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/profanity.h b/src/profanity.h index 939ac563..fb9a49ab 100644 --- a/src/profanity.h +++ b/src/profanity.h @@ -1,7 +1,7 @@ /* * profanity.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/resource.c b/src/resource.c index 86ba7e18..b0ad28b7 100644 --- a/src/resource.c +++ b/src/resource.c @@ -1,7 +1,7 @@ /* * resource.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/resource.h b/src/resource.h index 1db5dc0f..d34a9001 100644 --- a/src/resource.h +++ b/src/resource.h @@ -1,7 +1,7 @@ /* * resource.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/roster_list.c b/src/roster_list.c index 1341320f..dac76342 100644 --- a/src/roster_list.c +++ b/src/roster_list.c @@ -1,7 +1,7 @@ /* * roster_list.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/roster_list.h b/src/roster_list.h index 58490609..b627f252 100644 --- a/src/roster_list.h +++ b/src/roster_list.h @@ -1,7 +1,7 @@ /* * roster_list.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/server_events.c b/src/server_events.c index bd28b840..2f85f1d4 100644 --- a/src/server_events.c +++ b/src/server_events.c @@ -1,7 +1,7 @@ /* * server_events.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/server_events.h b/src/server_events.h index 95a502ba..15de8f07 100644 --- a/src/server_events.h +++ b/src/server_events.h @@ -1,7 +1,7 @@ /* * server_events.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/tools/autocomplete.c b/src/tools/autocomplete.c index 974ed570..aa96fcc6 100644 --- a/src/tools/autocomplete.c +++ b/src/tools/autocomplete.c @@ -1,7 +1,7 @@ /* * autocomplete.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/tools/autocomplete.h b/src/tools/autocomplete.h index 57c6015a..3736ef5f 100644 --- a/src/tools/autocomplete.h +++ b/src/tools/autocomplete.h @@ -1,7 +1,7 @@ /* * autocomplete.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/tools/history.c b/src/tools/history.c index b80a9555..ed935ece 100644 --- a/src/tools/history.c +++ b/src/tools/history.c @@ -1,7 +1,7 @@ /* * history.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/tools/history.h b/src/tools/history.h index 4258f7a7..bd4fb888 100644 --- a/src/tools/history.h +++ b/src/tools/history.h @@ -1,7 +1,7 @@ /* * history.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/tools/parser.c b/src/tools/parser.c index 1ec539df..4e746557 100644 --- a/src/tools/parser.c +++ b/src/tools/parser.c @@ -1,7 +1,7 @@ /* * parser.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/tools/parser.h b/src/tools/parser.h index 6f00cc90..c82199d4 100644 --- a/src/tools/parser.h +++ b/src/tools/parser.h @@ -1,7 +1,7 @@ /* * parser.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/tools/tinyurl.c b/src/tools/tinyurl.c index 87fafc47..3445d10e 100644 --- a/src/tools/tinyurl.c +++ b/src/tools/tinyurl.c @@ -1,7 +1,7 @@ /* * tinyurl.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/tools/tinyurl.h b/src/tools/tinyurl.h index 58070839..f8bc0caa 100644 --- a/src/tools/tinyurl.h +++ b/src/tools/tinyurl.h @@ -1,7 +1,7 @@ /* * tinyurl.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/ui/console.c b/src/ui/console.c index 52878631..f2ee2c71 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -1,7 +1,7 @@ /* * console.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * @@ -180,7 +180,7 @@ _cons_about(void) } win_print_time(console, '-'); - wprintw(console->win, "Copyright (C) 2012, 2013 James Booth <%s>.\n", PROF_PACKAGE_BUGREPORT); + wprintw(console->win, "Copyright (C) 2012 - 2014 James Booth <%s>.\n", PROF_PACKAGE_BUGREPORT); win_print_time(console, '-'); wprintw(console->win, "License GPLv3+: GNU GPL version 3 or later \n"); win_print_time(console, '-'); diff --git a/src/ui/core.c b/src/ui/core.c index 2f9c2dd7..047629ae 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -1,7 +1,7 @@ /* * core.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c index 09abcaa7..5820defa 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -1,7 +1,7 @@ /* * inputwin.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/ui/notifier.c b/src/ui/notifier.c index 52a9659c..2912d243 100644 --- a/src/ui/notifier.c +++ b/src/ui/notifier.c @@ -1,7 +1,7 @@ /* * notifier.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c index 9fa978d2..947dfa65 100644 --- a/src/ui/statusbar.c +++ b/src/ui/statusbar.c @@ -1,7 +1,7 @@ /* * statusbar.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c index c29a9c35..9f55b4b2 100644 --- a/src/ui/titlebar.c +++ b/src/ui/titlebar.c @@ -1,7 +1,7 @@ /* * titlebar.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/ui/ui.h b/src/ui/ui.h index 5587b5d5..669664ce 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -1,7 +1,7 @@ /* * ui.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/ui/window.c b/src/ui/window.c index 080d51b1..723631a7 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -1,7 +1,7 @@ /* * window.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/ui/window.h b/src/ui/window.h index 9cec6011..e34da02d 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -1,7 +1,7 @@ /* * window.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/ui/windows.c b/src/ui/windows.c index a27336d8..09639374 100644 --- a/src/ui/windows.c +++ b/src/ui/windows.c @@ -1,7 +1,7 @@ /* * windows.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/ui/windows.h b/src/ui/windows.h index 92372244..cddcde02 100644 --- a/src/ui/windows.h +++ b/src/ui/windows.h @@ -1,7 +1,7 @@ /* * windows.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c index a5fd45e3..e86afdfd 100644 --- a/src/xmpp/bookmark.c +++ b/src/xmpp/bookmark.c @@ -1,3 +1,24 @@ +/* + * bookmark.c + * + * Copyright (C) 2012 - 2014 James Booth + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see . + * + */ #include #include diff --git a/src/xmpp/bookmark.h b/src/xmpp/bookmark.h index 8b5418b0..f57e1527 100644 --- a/src/xmpp/bookmark.h +++ b/src/xmpp/bookmark.h @@ -1,3 +1,24 @@ +/* + * bookmark.h + * + * Copyright (C) 2012 - 2014 James Booth + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see . + * + */ #ifndef XMPP_BOOKMARK_H #define XMPP_BOOKMARK_H diff --git a/src/xmpp/capabilities.c b/src/xmpp/capabilities.c index d5d1c06f..64b01858 100644 --- a/src/xmpp/capabilities.c +++ b/src/xmpp/capabilities.c @@ -1,7 +1,7 @@ /* * capabilities.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/capabilities.h b/src/xmpp/capabilities.h index 45d97e0f..ef20b6f9 100644 --- a/src/xmpp/capabilities.h +++ b/src/xmpp/capabilities.h @@ -1,7 +1,7 @@ /* * capabilities.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index e4239ff1..d3c6d978 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -1,7 +1,7 @@ /* * connection.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/connection.h b/src/xmpp/connection.h index bf7d145e..72fc1821 100644 --- a/src/xmpp/connection.h +++ b/src/xmpp/connection.h @@ -1,7 +1,7 @@ /* * connection.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 82c7b0a6..35c1b654 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -1,7 +1,7 @@ /* * iq.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/iq.h b/src/xmpp/iq.h index 64844228..bf677219 100644 --- a/src/xmpp/iq.h +++ b/src/xmpp/iq.h @@ -1,7 +1,7 @@ /* * iq.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/message.c b/src/xmpp/message.c index 65be9b8c..499f3a61 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -1,7 +1,7 @@ /* * message.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/message.h b/src/xmpp/message.h index 3bfa60ef..80b6dafb 100644 --- a/src/xmpp/message.h +++ b/src/xmpp/message.h @@ -1,7 +1,7 @@ /* * message.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index 74fff27a..46467b2e 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -1,7 +1,7 @@ /* * presence.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/presence.h b/src/xmpp/presence.h index fb13a699..037fb2fd 100644 --- a/src/xmpp/presence.h +++ b/src/xmpp/presence.h @@ -1,7 +1,7 @@ /* * presence.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c index d979eb79..e991a7f3 100644 --- a/src/xmpp/roster.c +++ b/src/xmpp/roster.c @@ -1,7 +1,7 @@ /* * roster.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/roster.h b/src/xmpp/roster.h index 5fde0a2b..834a0623 100644 --- a/src/xmpp/roster.h +++ b/src/xmpp/roster.h @@ -1,7 +1,7 @@ /* * roster.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c index 65c329a5..692d310e 100644 --- a/src/xmpp/stanza.c +++ b/src/xmpp/stanza.c @@ -1,7 +1,7 @@ /* * stanza.c * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/stanza.h b/src/xmpp/stanza.h index 28f12a32..e7a08139 100644 --- a/src/xmpp/stanza.h +++ b/src/xmpp/stanza.h @@ -1,7 +1,7 @@ /* * stanza.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index c8feb68e..2f2481fb 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -1,7 +1,7 @@ /* * xmpp.h * - * Copyright (C) 2012, 2013 James Booth + * Copyright (C) 2012 - 2014 James Booth * * This file is part of Profanity. * diff --git a/tests/config/mock_accounts.c b/tests/config/mock_accounts.c index 3a7139e3..34f8624f 100644 --- a/tests/config/mock_accounts.c +++ b/tests/config/mock_accounts.c @@ -1,25 +1,3 @@ -/* - * mock_accounts.c - * - * Copyright (C) 2012, 2013 James Booth - * - * This file is part of Profanity. - * - * Profanity is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Profanity is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY {} without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Profanity. If not, see . - * - */ - #include #include #include diff --git a/tests/config/mock_accounts.h b/tests/config/mock_accounts.h index ee36f5ed..32c715f1 100644 --- a/tests/config/mock_accounts.h +++ b/tests/config/mock_accounts.h @@ -1,25 +1,3 @@ -/* - * mock_accounts.h - * - * Copyright (C) 2012, 2013 James Booth - * - * This file is part of Profanity. - * - * Profanity is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Profanity is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY {} without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Profanity. If not, see . - * - */ - #ifndef MOCK_ACCOUNTS_H #define MOCK_ACCOUNTS_H diff --git a/tests/ui/mock_ui.c b/tests/ui/mock_ui.c index b325870a..5cf48cb9 100644 --- a/tests/ui/mock_ui.c +++ b/tests/ui/mock_ui.c @@ -1,25 +1,3 @@ -/* - * mock_ui.c - * - * Copyright (C) 2012, 2013 James Booth - * - * This file is part of Profanity. - * - * Profanity is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Profanity is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY {} without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Profanity. If not, see . - * - */ - #include #include #include