--- tvtime-1.0.2/src/station.c.alt	2009-08-09 17:51:35 +0400

+++ tvtime-1.0.2/src/station.c	2009-08-09 17:52:47 +0400

@@ -363,7 +363,7 @@ station_mgr_t *station_new( const char *

     if( !mgr ) return 0;

     strncpy( mgr->stationrc, getenv( "HOME" ), 235 );

-    strncat( mgr->stationrc, "/.tvtime/stationlist.xml", 255 );

+    strncat( mgr->stationrc, "/.config/tvtime/stationlist.xml", 255 );

     mgr->verbose = verbose;

     mgr->first = 0;

     mgr->current = 0;

@@ -1031,7 +1031,7 @@ int station_writeconfig( station_mgr_t *

     if( !rp ) return 0;

     strncpy( filename, getenv( "HOME" ), 235 );

-    strncat( filename, "/.tvtime/stationlist.xml", 255 );

+    strncat( filename, "/.config/tvtime/stationlist.xml", 255 );

     doc = xmlParseFile( filename );

     if( !doc ) {

--- tvtime-1.0.2/src/tvtimeconf.c.alt	2009-08-09 17:51:44 +0400

+++ tvtime-1.0.2/src/tvtimeconf.c	2009-08-09 17:53:49 +0400

@@ -845,7 +845,7 @@ config_t *config_new( void )

     ct->buttonmapmenu[ 5 ] = TVTIME_MENU_DOWN;

     /* Make the ~/.tvtime directory every time on startup, to be safe. */

-    if( asprintf( &temp_dirname, "%s/.tvtime", getenv( "HOME" ) ) < 0 ) {

+    if( asprintf( &temp_dirname, "%s/.config/tvtime", getenv( "HOME" ) ) < 0 ) {

         /* FIXME: Clean up ?? */

         return 0;

     }

@@ -861,7 +861,7 @@ config_t *config_new( void )

     free( base );

     /* Then read in local settings. */

-    asprintf( &base, "%s/.tvtime/tvtime.xml", getenv( "HOME" ) );

+    asprintf( &base, "%s/.config/tvtime/tvtime.xml", getenv( "HOME" ) );

     ct->config_filename = strdup( base );

     if( file_is_openable_for_read( base ) ) {

         lfprintf( stderr, _("Reading configuration from %s\n"), base );

--- tvtime-1.0.2/src/utils.c.alt	2009-08-09 17:51:55 +0400

+++ tvtime-1.0.2/src/utils.c	2009-08-09 17:54:33 +0400

@@ -204,7 +204,7 @@ char *get_tvtime_fifo_filename( uid_t ui

     /* If we can't use our /tmp directory, put the fifo in $HOME. */

     if( !mkdir_and_force_owner( fifodir, uid, getgid() ) ) {

-        if( asprintf( &fifo, "%s/.tvtime/tvtimefifo-%s",

+        if( asprintf( &fifo, "%s/.config/tvtime/tvtimefifo-%s",

                       getenv( "HOME" ), hostname ) < 0 ) {

             fifo = 0;

         }