[telegnome] Order default channels by country name, not country code

[Colin Watson <cjwatson src gnome org>]

commit f62174968af377bd0ff916d96ae770e3d4e9cfa6
Author: Colin Watson <cjwatson debian org>
Date:   Sat Jan 30 21:30:53 2016 +0000

    Order default channels by country name, not country code
    
    * src/gui.c (tg_gui_reload_channels): Move "Ceefax, United Kingdom"
    after "MTV1, Hungary".

 ChangeLog |    7 +++++++
 src/gui.c |   20 ++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index adb73a4..9a8ec22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2016-01-30  Colin Watson  <cjwatson debian org>
 
+       Order default channels by country name, not country code
+
+       * src/gui.c (tg_gui_reload_channels): Move "Ceefax, United Kingdom"
+       after "MTV1, Hungary".
+
+2016-01-30  Colin Watson  <cjwatson debian org>
+
        Add missing call to gdk_pixbuf_loader_close
 
        * src/http.c (tg_http_get_image): Call gdk_pixbuf_loader_close
diff --git a/src/gui.c b/src/gui.c
index d6b0e82..fec1149 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -276,16 +276,6 @@ tg_gui_reload_channels(void)
        g_object_get(channel, "uuid", &children[i++], NULL);
        channel = tg_channel_new(
            NULL,
-           "name", "Ceefax, United Kingdom",
-           "description", "UK teletext (BBC)",
-           "page-url", "http://www.ceefax.tv/cgi-bin/gfx.cgi?page=%03d_0&font=big&channel=bbc1";,
-           "subpage-url", "http://www.ceefax.tv/cgi-bin/gfx.cgi?page=%03d_%d&font=big&channel=bbc1";,
-           "country", "gb",
-           NULL);
-       gui->channels = g_slist_append(gui->channels, (gpointer)channel);
-       g_object_get(channel, "uuid", &children[i++], NULL);
-       channel = tg_channel_new(
-           NULL,
            "name", "MTV1, Hungary",
            "description", "Hungarian teletext",
            "page-url", "http://www.teletext.hu/mtv1/images/%03d-01.gif";,
@@ -294,6 +284,16 @@ tg_gui_reload_channels(void)
            NULL);
        gui->channels = g_slist_append(gui->channels, (gpointer)channel);
        g_object_get(channel, "uuid", &children[i++], NULL);
+       channel = tg_channel_new(
+           NULL,
+           "name", "Ceefax, United Kingdom",
+           "description", "UK teletext (BBC)",
+           "page-url", "http://www.ceefax.tv/cgi-bin/gfx.cgi?page=%03d_0&font=big&channel=bbc1";,
+           "subpage-url", "http://www.ceefax.tv/cgi-bin/gfx.cgi?page=%03d_%d&font=big&channel=bbc1";,
+           "country", "gb",
+           NULL);
+       gui->channels = g_slist_append(gui->channels, (gpointer)channel);
+       g_object_get(channel, "uuid", &children[i++], NULL);
        g_settings_set_strv(gui->settings, "channel-children",
                            (const gchar **) children);
        g_strfreev(children);