1.1 --- a/gmyth/src/gmyth_backendinfo.c	Wed Nov 21 13:10:19 2007 +0000
     1.2 +++ b/gmyth/src/gmyth_backendinfo.c	Wed Nov 21 15:06:32 2007 +0000
     1.3 @@ -155,6 +155,7 @@
     1.4      GMythBackendInfo *backend_info;
     1.5      GMythURI       *uri;
     1.6      gchar         **path_parts;
     1.7 +    gchar          *db;
     1.8  
     1.9      backend_info = GMYTH_BACKEND_INFO(g_object_new(GMYTH_BACKEND_INFO_TYPE, NULL));
    1.10      uri = gmyth_uri_new_with_value (uri_str);
    1.11 @@ -168,12 +169,16 @@
    1.12       * gets the path info to database name, from the URI, and removes the
    1.13       * trash chars 
    1.14       */
    1.15 -    gmyth_backend_info_set_db_name(backend_info, path_parts != NULL &&
    1.16 -                                   strlen(path_parts[0]) > 0 ?
    1.17 -                                   g_strstrip(g_strdelimit
    1.18 -                                              (path_parts[0], "/?",
    1.19 -                                               ' ')) :
    1.20 -                                   gmyth_uri_get_path(uri));
    1.21 +    if ((path_parts != NULL) && (strlen (path_parts[0]) > 0))
    1.22 +    {
    1.23 +        db =  path_parts[0]+2;
    1.24 +    }
    1.25 +    else
    1.26 +    {
    1.27 +        db = gmyth_uri_get_path(uri);
    1.28 +    }
    1.29 +
    1.30 +    gmyth_backend_info_set_db_name(backend_info, db);
    1.31  
    1.32      gmyth_backend_info_set_port(backend_info, gmyth_uri_get_port(uri));
    1.33  

     2.1 --- a/gmyth/src/gmyth_uri.c	Wed Nov 21 13:10:19 2007 +0000
     2.2 +++ b/gmyth/src/gmyth_uri.c	Wed Nov 21 15:06:32 2007 +0000
     2.3 @@ -472,7 +472,7 @@
     2.4      g_return_val_if_fail(uri->uri != NULL, FALSE);
     2.5      g_return_val_if_fail(uri->uri->str != NULL, FALSE);
     2.6  
     2.7 -    if ((strstr(uri->uri->str, "channel") == NULL) ||
     2.8 +    if ((strstr(uri->uri->str, "channel=") == NULL) &&
     2.9          (strstr(uri->uri->str, "livetv") == NULL))
    2.10          ret = FALSE;
    2.11