summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher O'Brien <siege@pidgin.im>2005-12-04 05:04:39 +0000
committerChristopher O'Brien <siege@pidgin.im>2005-12-04 05:04:39 +0000
commitd07350058b3727347139cb238ed286b32498b244 (patch)
tree9da780f06d432be2a1092c2e7d544477a88e4340
parente0a290a4e97e61e3579c1d2ecd21d073c9f68caf (diff)
downloadpidgin-d07350058b3727347139cb238ed286b32498b244.tar.gz
[gaim-migrate @ 14616]
forgot a line, and infamy
-rw-r--r--AUTHORS1
-rw-r--r--src/gtkdialogs.c1
-rw-r--r--src/protocols/sametime/sametime.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 526cd87eb4..c07454cac2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,6 +25,7 @@ Etan 'deryni' Reisner - Developer
Stu 'nosnilmot' Tomlinson - Developer
Gary 'grim' Kramlich - Developer
Richard 'rlaager' Laager
+Christopher 'siege' O'Brien - Developer
Crazy Patch Writers:
--------------------
diff --git a/src/gtkdialogs.c b/src/gtkdialogs.c
index 965092ea46..57ca11033f 100644
--- a/src/gtkdialogs.c
+++ b/src/gtkdialogs.c
@@ -66,6 +66,7 @@ static struct developer developers[] = {
{"Christian 'ChipX86' Hammond", N_("developer & webmaster"), NULL},
{"Gary 'grim' Kramlich", N_("developer"), NULL},
{"Richard 'rlaager' Laager", N_("developer"), NULL},
+ {"Christopher 'siege' O'Brien", N_("developer"), "taliesein@users.sf.net"},
{"Etan 'deryni' Reisner", N_("developer"), NULL},
{"Tim 'marv' Ringenbach", N_("developer"), NULL},
{"Luke 'LSchiere' Schierer", N_("support"), "lschiere@users.sf.net"},
diff --git a/src/protocols/sametime/sametime.c b/src/protocols/sametime/sametime.c
index b36cfe0a5d..8a60be6f2c 100644
--- a/src/protocols/sametime/sametime.c
+++ b/src/protocols/sametime/sametime.c
@@ -5797,6 +5797,7 @@ static void mw_plugin_init(GaimPlugin *plugin) {
/* pretend to be Sametime Connect */
opt = gaim_account_option_bool_new(_("Hide Client Identity"),
MW_KEY_FAKE_IT, FALSE);
+ l = g_list_append(l, opt);
mw_prpl_info.protocol_options = l;
l = NULL;