Revision 461 src/inc.c

inc.c (revision 461)
33 33
#include <stdio.h>
34 34
#include <unistd.h>
35 35
#include <string.h>
36
#include <time.h>
37
#include <sys/time.h>
38 36
#include <sys/types.h>
39 37
#include <sys/stat.h>
40 38
#include <sys/wait.h>
......
374 372
	}
375 373

  
376 374
	dialog->dialog = progress;
377
	gettimeofday(&dialog->progress_tv, NULL);
378
	gettimeofday(&dialog->folder_tv, NULL);
375
	g_get_current_time(&dialog->progress_tv);
376
	g_get_current_time(&dialog->folder_tv);
379 377
	dialog->queue_list = NULL;
380 378
	dialog->cur_row = 0;
381 379

  
......
887 885
static void inc_progress_dialog_update_periodic(IncProgressDialog *inc_dialog,
888 886
						IncSession *inc_session)
889 887
{
890
	struct timeval tv_cur;
891
	struct timeval tv_result;
888
	GTimeVal tv_cur;
889
	GTimeVal tv_result;
892 890
	gint msec;
893 891

  
894
	gettimeofday(&tv_cur, NULL);
892
	g_get_current_time(&tv_cur);
895 893

  
896 894
	tv_result.tv_sec = tv_cur.tv_sec - inc_dialog->progress_tv.tv_sec;
897 895
	tv_result.tv_usec = tv_cur.tv_usec - inc_dialog->progress_tv.tv_usec;
898 896
	if (tv_result.tv_usec < 0) {
899 897
		tv_result.tv_sec--;
900
		tv_result.tv_usec += 1000000;
898
		tv_result.tv_usec += G_USEC_PER_SEC;
901 899
	}
902 900

  
903 901
	msec = tv_result.tv_sec * 1000 + tv_result.tv_usec / 1000;
......
911 909
static void inc_update_folderview_periodic(IncProgressDialog *inc_dialog,
912 910
					   IncSession *inc_session)
913 911
{
914
	struct timeval tv_cur;
915
	struct timeval tv_result;
912
	GTimeVal tv_cur;
913
	GTimeVal tv_result;
916 914
	gint msec;
917 915

  
918
	gettimeofday(&tv_cur, NULL);
916
	g_get_current_time(&tv_cur);
919 917

  
920 918
	tv_result.tv_sec = tv_cur.tv_sec - inc_dialog->folder_tv.tv_sec;
921 919
	tv_result.tv_usec = tv_cur.tv_usec - inc_dialog->folder_tv.tv_usec;
922 920
	if (tv_result.tv_usec < 0) {
923 921
		tv_result.tv_sec--;
924
		tv_result.tv_usec += 1000000;
922
		tv_result.tv_usec += G_USEC_PER_SEC;
925 923
	}
926 924

  
927 925
	msec = tv_result.tv_sec * 1000 + tv_result.tv_usec / 1000;

Also available in: Unified diff