Sat, 03 Oct 2020 05:58:21 -0500
PurpleMessage cleanups from hell
Clean up libpurple/message.[ch] and remove the messages hash table as its current implementation will not fit our future needs
add a content-type property to PurpleMessage
Convert message timestamps from time_t to GDateTime and set default values
Make purple_message_new_outgoing take a parameter for the author.
Testing Done:
messages sent on bonjour, irc privmsg, irc chat, `/me` is broken i think unrelated.
Reviewed at https://reviews.imfreedom.org/r/124/
|
38831
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
1 | /* |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
2 | * pidgin |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
3 | * |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
4 | * Pidgin is the legal property of its developers, whose names are too numerous |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
5 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
6 | * source distribution. |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
7 | * |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
8 | * This program is free software; you can redistribute it and/or modify |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
9 | * it under the terms of the GNU General Public License as published by |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
10 | * the Free Software Foundation; either version 2 of the License, or |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
11 | * (at your option) any later version. |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
12 | * |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
13 | * This program is distributed in the hope that it will be useful, |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
16 | * GNU General Public License for more details. |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
17 | * |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
18 | * You should have received a copy of the GNU General Public License |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
19 | * along with this program; if not, write to the Free Software |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
21 | * |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
22 | */ |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
23 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
24 | #include "purple.h" |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
25 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
26 | #include <glib.h> |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
27 | #include <glib/gprintf.h> |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
28 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
29 | #include <signal.h> |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
30 | #include <string.h> |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
31 | #ifdef _WIN32 |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
32 | # include <conio.h> |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
33 | #else |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
34 | # include <unistd.h> |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
35 | #endif |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
36 | |
|
38832
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
37 | #include "test_ui.h" |
|
38831
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
38 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
39 | /*** Conversation uiops ***/ |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
40 | static void |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
41 | test_write_conv(PurpleConversation *conv, PurpleMessage *msg) |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
42 | { |
|
40541
9ceb8d25d4d9
PurpleMessage cleanups from hell
Gary Kramlich <grim@reaperworld.com>
parents:
38834
diff
changeset
|
43 | gchar *timestamp = purple_message_format_timestamp(msg, "(%H:%M:%S)"); |
|
38831
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
44 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
45 | printf("(%s) %s %s: %s\n", |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
46 | purple_conversation_get_name(conv), |
|
40541
9ceb8d25d4d9
PurpleMessage cleanups from hell
Gary Kramlich <grim@reaperworld.com>
parents:
38834
diff
changeset
|
47 | timestamp, |
|
38831
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
48 | purple_message_get_author_alias(msg), |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
49 | purple_message_get_contents(msg)); |
|
40541
9ceb8d25d4d9
PurpleMessage cleanups from hell
Gary Kramlich <grim@reaperworld.com>
parents:
38834
diff
changeset
|
50 | |
|
9ceb8d25d4d9
PurpleMessage cleanups from hell
Gary Kramlich <grim@reaperworld.com>
parents:
38834
diff
changeset
|
51 | g_free(timestamp); |
|
38831
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
52 | } |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
53 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
54 | static PurpleConversationUiOps test_conv_uiops = { |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
55 | .write_conv = test_write_conv |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
56 | }; |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
57 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
58 | static void |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
59 | test_ui_init(void) |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
60 | { |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
61 | purple_conversations_set_ui_ops(&test_conv_uiops); |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
62 | } |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
63 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
64 | static PurpleCoreUiOps test_core_uiops = { |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
65 | .ui_init = test_ui_init |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
66 | }; |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
67 | |
|
38832
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
68 | void |
|
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
69 | test_ui_purple_init(void) { |
|
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
70 | #ifndef _WIN32 |
|
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
71 | /* libpurple's built-in DNS resolution forks processes to perform |
|
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
72 | * blocking lookups without blocking the main process. It does not |
|
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
73 | * handle SIGCHLD itself, so if the UI does not you quickly get an army |
|
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
74 | * of zombie subprocesses marching around. |
|
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
75 | */ |
|
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
76 | signal(SIGCHLD, SIG_IGN); |
|
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
77 | #endif |
|
7ad7854d8e60
Create a very basic ui for testing
Gary Kramlich <grim@reaperworld.com>
parents:
38831
diff
changeset
|
78 | |
|
38834
e4144efa975e
Clean up a bunch of the cruft I accidentally created
Gary Kramlich <grim@reaperworld.com>
parents:
38832
diff
changeset
|
79 | /* set the magic PURPLE_PLUGINS_SKIP environment variable */ |
|
e4144efa975e
Clean up a bunch of the cruft I accidentally created
Gary Kramlich <grim@reaperworld.com>
parents:
38832
diff
changeset
|
80 | g_setenv("PURPLE_PLUGINS_SKIP", "1", TRUE); |
|
e4144efa975e
Clean up a bunch of the cruft I accidentally created
Gary Kramlich <grim@reaperworld.com>
parents:
38832
diff
changeset
|
81 | |
|
38831
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
82 | /* Set a custom user directory (optional) */ |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
83 | purple_util_set_user_dir(TEST_DATA_DIR); |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
84 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
85 | /* We do not want any debugging for now to keep the noise to a minimum. */ |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
86 | purple_debug_set_enabled(FALSE); |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
87 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
88 | /* Set the core-uiops, which is used to |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
89 | * - initialize the ui specific preferences. |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
90 | * - initialize the debug ui. |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
91 | * - initialize the ui components for all the modules. |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
92 | * - uninitialize the ui components for all the modules when the core terminates. |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
93 | */ |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
94 | purple_core_set_ui_ops(&test_core_uiops); |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
95 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
96 | /* Now that all the essential stuff has been set, let's try to init the core. It's |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
97 | * necessary to provide a non-NULL name for the current ui to the core. This name |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
98 | * is used by stuff that depends on this ui, for example the ui-specific plugins. */ |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
99 | if (!purple_core_init("test-ui")) { |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
100 | /* Initializing the core failed. Terminate. */ |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
101 | fprintf(stderr, |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
102 | "libpurple initialization failed. Dumping core.\n" |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
103 | "Please report this!\n"); |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
104 | abort(); |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
105 | } |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
106 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
107 | /* Set path to search for plugins. The core (libpurple) takes care of loading the |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
108 | * core-plugins, which includes the in-tree protocols. So it is not essential to add |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
109 | * any path here, but it might be desired, especially for ui-specific plugins. */ |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
110 | purple_plugins_add_search_path(TEST_DATA_DIR); |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
111 | purple_plugins_refresh(); |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
112 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
113 | /* Load the preferences. */ |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
114 | purple_prefs_load(); |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
115 | |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
116 | /* Load the desired plugins. The client should save the list of loaded plugins in |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
117 | * the preferences using purple_plugins_save_loaded(PLUGIN_SAVE_PREF) */ |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
118 | purple_plugins_load_saved(TEST_DATA_DIR); |
|
d260f3b61831
The start of a ui for unit testing
Gary Kramlich <grim@reaperworld.com>
parents:
diff
changeset
|
119 | } |