Mercurial > pidgin.yaz
comparison pidgin/gtkdialogs.c @ 23149:28a60a010efc
propagate from branch 'im.pidgin.pidgin.custom_smiley' (head 5438cf91ac36226aeafda8e41bb181f9d6474fac)
to branch 'im.pidgin.pidgin.next.minor' (head 800a222c489dd626af89e2738c25823b5c3efdb9)
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Tue, 13 May 2008 02:26:34 +0000 |
parents | 0bd86dae2734 |
children | da78bd517831 |
comparison
equal
deleted
inserted
replaced
23147:66057702ae5d | 23149:28a60a010efc |
---|---|
100 {"Felipe 'shx' Contreras", NULL, NULL}, | 100 {"Felipe 'shx' Contreras", NULL, NULL}, |
101 {"Dennis 'EvilDennisR' Ristuccia", N_("Senior Contributor/QA"), NULL}, | 101 {"Dennis 'EvilDennisR' Ristuccia", N_("Senior Contributor/QA"), NULL}, |
102 {"Peter 'Fmoo' Ruibal", NULL, NULL}, | 102 {"Peter 'Fmoo' Ruibal", NULL, NULL}, |
103 {"Elliott 'QuLogic' Sales de Andrade", NULL, NULL}, | 103 {"Elliott 'QuLogic' Sales de Andrade", NULL, NULL}, |
104 {"Gabriel 'Nix' Schulhof", NULL, NULL}, | 104 {"Gabriel 'Nix' Schulhof", NULL, NULL}, |
105 {"Jorge 'Masca' VillaseƱor", NULL, NULL}, | |
105 {NULL, NULL, NULL} | 106 {NULL, NULL, NULL} |
106 }; | 107 }; |
107 | 108 |
108 /* Order: Alphabetical by Last Name */ | 109 /* Order: Alphabetical by Last Name */ |
109 static const struct developer retired_developers[] = { | 110 static const struct developer retired_developers[] = { |
626 g_string_append(str, " <b>Mono:</b> Disabled<br/>"); | 627 g_string_append(str, " <b>Mono:</b> Disabled<br/>"); |
627 #endif | 628 #endif |
628 #endif | 629 #endif |
629 | 630 |
630 #ifndef _WIN32 | 631 #ifndef _WIN32 |
631 #ifdef HAVE_LIBNM | 632 #ifdef HAVE_NETWORKMANAGER |
632 g_string_append(str, " <b>NetworkManager:</b> Enabled<br/>"); | 633 g_string_append(str, " <b>NetworkManager:</b> Enabled<br/>"); |
633 #else | 634 #else |
634 g_string_append(str, " <b>NetworkManager:</b> Disabled<br/>"); | 635 g_string_append(str, " <b>NetworkManager:</b> Disabled<br/>"); |
635 #endif | 636 #endif |
636 #endif | 637 #endif |