diff --git a/src/main.c b/src/main.c index 04b4071..050f6b0 100644 --- a/src/main.c +++ b/src/main.c @@ -22,7 +22,7 @@ int main(int argc, char *argv[]) gtk_widget_show(mainWindow->mainWindow); gtk_main(); - mdiary_save_settings(settings_path, settings); // + mdiary_save_settings(settings_path, settings); mdiary_settings_free(settings); g_free(settings_path); diff --git a/src/mainwindow.c b/src/mainwindow.c index f3146b7..cb92863 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -715,7 +715,7 @@ static void mainWindow_show_error(struct mainWindow *mainWindow, gchar *text) GTK_BUTTONS_CLOSE, "Error: %s", text); - gtk_dialog_run(GTK_DIALOG (dialog)); + gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } @@ -779,13 +779,14 @@ void mainWindow_otherWorkspaceClicked(GtkWidget *widget, gpointer user_data) GtkWidget *dialog; gint res; - dialog = gtk_file_chooser_dialog_new("Choose Workspace", GTK_WINDOW(mainWindow->mainWindow), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + dialog = gtk_file_chooser_dialog_new("Choose Workspace", GTK_WINDOW(mainWindow->mainWindow), + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, "Cancel", GTK_RESPONSE_CANCEL, "Select", GTK_RESPONSE_ACCEPT, NULL); gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); - res = gtk_dialog_run (GTK_DIALOG (dialog)); + res = gtk_dialog_run(GTK_DIALOG(dialog)); if (res == GTK_RESPONSE_ACCEPT) { char *directory; @@ -794,7 +795,7 @@ void mainWindow_otherWorkspaceClicked(GtkWidget *widget, gpointer user_data) g_free(directory); } - gtk_widget_destroy (dialog); + gtk_widget_destroy(dialog); } void mainWindow_decrypt_gpg_clicked(GtkWidget *widget, gpointer user_data) diff --git a/src/mdiary.c b/src/mdiary.c index 4850cce..7dfba11 100644 --- a/src/mdiary.c +++ b/src/mdiary.c @@ -97,7 +97,7 @@ GDateTime *mdiary_get_date_from_string_ext(gchar *string, gchar *prefix, gchar * minute = atoi(g_match_info_fetch(match_info, dateFormats->index_minute)); if (year >= 0 && - month >=1 && month <=12 && + month >= 1 && month <= 12 && day >= 1 && day <= 31 && hour >= 0 && hour <= 23 && minute >= 0 && minute <= 59) { @@ -230,9 +230,8 @@ static gchar *mdiary_get_line_from_string(gchar **str_ptr) str = *str_ptr; start = str; - while (*str != '\n' && *str != '\0') { + while (*str != '\n' && *str != '\0') str++; - } *str = '\0'; *str_ptr = ++str; @@ -599,7 +598,8 @@ void mdiary_add_entry_to_store(GtkListStore *entryListStore, * @param data * @return FALSE */ -gboolean mdiary_free_entry_elements(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) { +gboolean mdiary_free_entry_elements(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) +{ gpointer ptr; gtk_tree_model_get(model, iter, COL_TAGLIST, &ptr, -1); diff --git a/src/settings.c b/src/settings.c index 8e031c0..f60f365 100644 --- a/src/settings.c +++ b/src/settings.c @@ -36,9 +36,8 @@ gboolean mdiary_load_settings(gchar *filename, struct mdiary_settings *settings) } dstream = g_data_input_stream_new(G_INPUT_STREAM(stream)); - while (line = g_data_input_stream_read_line(G_DATA_INPUT_STREAM(dstream), NULL, NULL, NULL)) { + while (line = g_data_input_stream_read_line(G_DATA_INPUT_STREAM(dstream), NULL, NULL, NULL)) mdiary_settings_parse_line(line, settings); - } g_input_stream_close(G_INPUT_STREAM(dstream), NULL, NULL); g_input_stream_close(G_INPUT_STREAM(stream), NULL, NULL); @@ -82,7 +81,7 @@ gboolean mdiary_save_settings(gchar *filename, struct mdiary_settings *settings) } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(settings->mainWindow->workspaceListStore), &iter)); } - g_output_stream_close(G_OUTPUT_STREAM(stream),NULL,NULL); + g_output_stream_close(G_OUTPUT_STREAM(stream), NULL, NULL); g_object_unref(stream); g_object_unref(file); } diff --git a/src/settings.h b/src/settings.h index 66e21ed..253f7a1 100644 --- a/src/settings.h +++ b/src/settings.h @@ -15,4 +15,4 @@ gboolean mdiary_save_settings(gchar *filename, struct mdiary_settings *settings) struct mdiary_settings *mdiary_settings_new(struct mainWindow *mainWindow); void mdiary_settings_free(struct mdiary_settings *settings); -#endif // SETTINGS_H +#endif /* SETTINGS_H */