Merge branch 'master' into newfile
This commit is contained in:
		
						commit
						247ea6977f
					
				| @ -61,7 +61,7 @@ static gboolean mainWindow_list_entry_visible(GtkTreeModel *model, | ||||
| 	gboolean search_matched = 0; | ||||
| 
 | ||||
| 	GDateTime *datetime; | ||||
| 	guint time; | ||||
| 	gint64 time; | ||||
| 
 | ||||
| 	if (mainWindow->filterSettings.hide_all) | ||||
| 		return FALSE; | ||||
| @ -134,8 +134,8 @@ static gint mainWindow_sort_date_compare_func(GtkTreeModel *model, | ||||
| { | ||||
| 	GDateTime *datetime1; | ||||
| 	GDateTime *datetime2; | ||||
| 	guint time1; | ||||
| 	guint time2; | ||||
| 	gint64 time1; | ||||
| 	gint64 time2; | ||||
| 
 | ||||
| 	gtk_tree_model_get(model, a, COL_TIMESTAMP, &datetime1, -1); | ||||
| 	gtk_tree_model_get(model, b, COL_TIMESTAMP, &datetime2, -1); | ||||
| @ -886,14 +886,17 @@ void mainWindow_checkDate(GtkWidget *widget, gint event, gpointer user_data) | ||||
| { | ||||
| 	struct mainWindow *mainWindow = (struct mainWindow *)user_data; | ||||
| 	GDateTime *datetime; | ||||
| 	gchar *temp; | ||||
| 
 | ||||
| 	datetime = mdiary_get_date_from_string((char *)gtk_entry_get_text(GTK_ENTRY(widget))); | ||||
| 	if (!datetime) { | ||||
| 		datetime = g_date_time_new_from_unix_local(widget == mainWindow->dateStart | ||||
| 							   ? mainWindow->filterSettings.time_start | ||||
| 							   : mainWindow->filterSettings.time_end); | ||||
| 		temp = g_date_time_format(datetime, "%Y-%m-%d"); | ||||
| 		gtk_entry_set_text(GTK_ENTRY(widget), | ||||
| 				   g_date_time_format(datetime, "%Y-%m-%d")); | ||||
| 				   temp); | ||||
| 		g_free(temp); | ||||
| 	} | ||||
| 	g_date_time_unref(datetime); | ||||
| } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user