diff options
| author | Berke Viktor <bviktor@hexchat.org> | 2012-10-13 06:17:27 +0200 |
|---|---|---|
| committer | Berke Viktor <bviktor@hexchat.org> | 2012-10-13 06:17:27 +0200 |
| commit | 902063d932a37e8bcc47df1fdad173a44595ad39 (patch) | |
| tree | 18df10f4128272e9eccbad4c77a9e60a96b87df1 | |
| parent | d20daad4177b315efad95c7e2303f36270929eb8 (diff) | |
Get rid of some hardcoding
| -rw-r--r-- | src/common/outbound.c | 2 | ||||
| -rw-r--r-- | src/common/servlist.c | 2 | ||||
| -rw-r--r-- | src/common/servlist.h | 3 | ||||
| -rw-r--r-- | src/fe-gtk/servlistgui.c | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/common/outbound.c b/src/common/outbound.c index 9ec0d04d..d5dbdc49 100644 --- a/src/common/outbound.c +++ b/src/common/outbound.c @@ -273,7 +273,7 @@ cmd_addserver (struct session *sess, char *tbuf, char *word[], char *word_eol[]) if (!network) { network = servlist_net_add (word[2], "", TRUE); - network->encoding = strdup ("IRC (Latin/Unicode Hybrid)"); + network->encoding = strdup (IRC_DEFAULT_CHARSET); } /* if we had the network already, check if the given server already exists */ else if (servlist_server_find (network, word_eol[3], NULL)) diff --git a/src/common/servlist.c b/src/common/servlist.c index 43d01858..4581343f 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -970,7 +970,7 @@ servlist_load_defaults (void) if (def[i].network) { net = servlist_net_add (def[i].network, def[i].host, FALSE); - net->encoding = strdup ("IRC (Latin/Unicode Hybrid)"); + net->encoding = strdup (IRC_DEFAULT_CHARSET); if (def[i].channel) net->autojoin = strdup (def[i].channel); if (def[i].charset) diff --git a/src/common/servlist.h b/src/common/servlist.h index 9b7734f4..855c3b09 100644 --- a/src/common/servlist.h +++ b/src/common/servlist.h @@ -35,6 +35,9 @@ extern GSList *network_list; #define FLAG_FAVORITE 64 #define FLAG_COUNT 7 +/* DEFAULT_CHARSET is already defined in wingdi.h */ +#define IRC_DEFAULT_CHARSET "IRC (Latin/Unicode Hybrid)" + void servlist_init (void); int servlist_save (void); int servlist_cycle (server *serv); diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index d54ee077..8de93e8d 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -92,7 +92,7 @@ static GtkWidget *servlist_open_edit (GtkWidget *parent, ircnet *net); static const char *pages[]= { "UTF-8 (Unicode)", - "IRC (Latin/Unicode Hybrid)", + IRC_DEFAULT_CHARSET, "ISO-8859-15 (Western Europe)", "ISO-8859-2 (Central Europe)", "ISO-8859-7 (Greek)", @@ -279,7 +279,7 @@ servlist_addnet_cb (GtkWidget *item, GtkTreeView *treeview) ircnet *net; net = servlist_net_add (_("New Network"), "", TRUE); - net->encoding = strdup ("IRC (Latin/Unicode Hybrid)"); + net->encoding = strdup (IRC_DEFAULT_CHARSET); servlist_server_add (net, "newserver/6667"); store = (GtkListStore *)gtk_tree_view_get_model (treeview); |