From 84f8bf4d7762cd9fbd09f649b4234177802f937f Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Thu, 9 Aug 2012 22:28:43 -0400 Subject: Backout commits Accidentally pushed a bunch of stuff to master that wasn't ready yet when making the FreeBSD Makefile changes. Sorry marco for the merges in the logs. This should revert everything back to how it was at d397399c349d36f611a5aac6fa53528d2fe2eaea. --- xombrero.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'xombrero.h') diff --git a/xombrero.h b/xombrero.h index 20efb34..d5da4d9 100644 --- a/xombrero.h +++ b/xombrero.h @@ -48,8 +48,6 @@ u_int32_t arc4random_uniform(u_int32_t); #include #include #include -#include -#define LOGIN_NAME_MAX MAXLOGNAME #elif defined(__OpenBSD__) #include #include @@ -926,8 +924,6 @@ extern SoupSession *session; extern GtkNotebook *notebook; extern GtkListStore *completion_model; extern uint64_t blocked_cookies; -extern GtkWidget *main_window; -extern SoupSession *session; extern void (*_soup_cookie_jar_add_cookie)(SoupCookieJar *, SoupCookie *); -- cgit 1.4.1-2-gfad0 d> about summary refs log tree commit diff stats
blob: ffe0c12c042bc784f7abb76a7162bd71e854c0ed (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
[colours]
bkgnd=default
titlebar=blue
statusbar=blue
titlebar.text=bold_white
titlebar.brackets=bold_cyan
statusbar.text=bold_white
statusbar.brackets=bold_cyan
statusbar.active=bold_cyan
statusbar.new=bold_white
main.text=bold_white
main.text.me=bold_white
main.text.them=bold_white
input.text=bold_white
main.time=bold_white
main.splash=bold_cyan
subscribed=bold_green
unsubscribed=bold_red
online=bold_green
away=bold_cyan
chat=bold_green
dnd=bold_red
xa=bold_cyan
offline=bold_red
typing=bold_yellow
gone=bold_red
error=bold_red
incoming=bold_yellow
roominfo=bold_yellow
roommention=bold_yellow
me=bold_yellow
them=bold_green
titlebar.unencrypted=bold_red
titlebar.encrypted=bold_white
titlebar.untrusted=bold_yellow
titlebar.trusted=bold_white
titlebar.online=bold_white
titlebar.offline=bold_white
titlebar.away=bold_white
titlebar.xa=bold_white
titlebar.dnd=bold_white
titlebar.chat=bold_white
otr.started.trusted=bold_green
otr.started.untrusted=bold_yellow
otr.ended=bold_red
otr.trusted=bold_green
otr.untrusted=bold_yellow
roster.header=bold_yellow
occupants.header=bold_yellow