chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
copyright dates
[disorder]
/
disobedience
/
disobedience.c
diff --git
a/disobedience/disobedience.c
b/disobedience/disobedience.c
index dc8c27ed5f76cd85cb22f2776ee7521102cae645..9ee7b3352c2bfefa19a1f04c01d5f62a6dc5f56e 100644
(file)
--- a/
disobedience/disobedience.c
+++ b/
disobedience/disobedience.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2006 Richard Kettlewell
+ * Copyright (C) 2006
, 2007
Richard Kettlewell
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-58,15
+58,6
@@
int volume_l, volume_r; /* volume */
double goesupto = 10; /* volume upper bound */
int choosealpha; /* break up choose by letter */
double goesupto = 10; /* volume upper bound */
int choosealpha; /* break up choose by letter */
-static const GMemVTable glib_memvtable = {
- xmalloc,
- xrealloc,
- xfree,
- 0, /* calloc */
- 0, /* try_malloc */
- 0 /* try_realloc */
-};
-
static const disorder_eclient_log_callbacks gdisorder_log_callbacks = {
log_connected,
log_completed,
static const disorder_eclient_log_callbacks gdisorder_log_callbacks = {
log_connected,
log_completed,
@@
-330,8
+321,7
@@
int main(int argc, char **argv) {
mem_init(1);
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
mem_init(1);
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
- /* GLib sucks - not const-correct */
- g_mem_set_vtable((GMemVTable *)&glib_memvtable);
+ /* Causes GTK+ to 0-fill lots of things, which helps the garbage collector. */
gtk_init(&argc, &argv);
gtk_rc_parse_string(style);
while((n = getopt_long(argc, argv, "hVc:dtH", options, 0)) >= 0) {
gtk_init(&argc, &argv);
gtk_rc_parse_string(style);
while((n = getopt_long(argc, argv, "hVc:dtH", options, 0)) >= 0) {
@@
-376,4
+366,3
@@
fill-column:79
indent-tabs-mode:nil
End:
*/
indent-tabs-mode:nil
End:
*/
-/* arch-tag:dJmEdDzrCQktkNJWAmdQAQ */