]> git.datanom.net - lensdb.git/commitdiff
Completed import and export
authorMichael Rasmussen <mir@datanom.net>
Mon, 11 Nov 2024 20:42:58 +0000 (21:42 +0100)
committerMichael Rasmussen <mir@datanom.net>
Mon, 11 Nov 2024 20:42:58 +0000 (21:42 +0100)
Signed-off-by: Michael Rasmussen <mir@datanom.net>
src/csv.c
src/gui.c
src/gui.h
src/main.c
src/sqlite-storage.c

index 38407544206c9db912c32641f79f03c59703e762..b48eafc45dc55081f8d20b26b92189c5412cebdd 100644 (file)
--- a/src/csv.c
+++ b/src/csv.c
@@ -174,7 +174,6 @@ static Record* read_next_line(CsvParser* parser, CvsError** error) {
        while (fgets(buffer, MAX_ROW, parser->csv_file)) {
                if (strlen(buffer) == MAX_ROW - 1) {
                        // more to read
        while (fgets(buffer, MAX_ROW, parser->csv_file)) {
                if (strlen(buffer) == MAX_ROW - 1) {
                        // more to read
-                       //fprintf(stderr, "bufffer: %s\n", buffer);
                        block++;
                        if (block > 1) {
                                gchar* tmp = g_strdup_printf("%s%s", line, buffer);
                        block++;
                        if (block > 1) {
                                gchar* tmp = g_strdup_printf("%s%s", line, buffer);
index 0bcef13b74cadda92d0f16fa32a946dfc208bf22..22a499866625c4bb5cd41e79b22820a62df2f20b 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -67,18 +67,37 @@ static void clean(gpointer data) {
  * GTK_MESSAGE_ERROR
  * GTK_MESSAGE_OTHER
  */
  * GTK_MESSAGE_ERROR
  * GTK_MESSAGE_OTHER
  */
-void show_err_msg(GtkMessageType type, const gchar* msg) {
+bool show_message(GtkMessageType type, const gchar* msg) {
+       GtkWidget* dialog = NULL;
+       bool response = true;
        GtkWidget* window = GTK_WIDGET(gtk_builder_get_object(builder, "main_window"));
        
        GtkWidget* window = GTK_WIDGET(gtk_builder_get_object(builder, "main_window"));
        
-       GtkWidget* dialog = gtk_message_dialog_new(
-               GTK_WINDOW(window),
-               GTK_DIALOG_DESTROY_WITH_PARENT,
-               type,
-               GTK_BUTTONS_OK,
-               msg);
-               
-       gtk_dialog_run(GTK_DIALOG(dialog));
+       if (GTK_MESSAGE_QUESTION != type) {
+               dialog = gtk_message_dialog_new(
+                       GTK_WINDOW(window),
+                       GTK_DIALOG_DESTROY_WITH_PARENT,
+                       type,
+                       GTK_BUTTONS_OK,
+                       msg
+               );
+                       
+               gtk_dialog_run(GTK_DIALOG(dialog));
+       } else {
+               dialog = gtk_message_dialog_new(
+                       GTK_WINDOW(window),
+                       GTK_DIALOG_DESTROY_WITH_PARENT,
+                       type,
+                       GTK_BUTTONS_YES_NO,
+                       msg
+               );
+                       
+               if (GTK_RESPONSE_YES != gtk_dialog_run(GTK_DIALOG(dialog))) {
+                       response = false;
+               }
+       }
        gtk_widget_destroy(dialog);
        gtk_widget_destroy(dialog);
+       
+       return response;
 }
 
 static void hide_input_dialog() {
 }
 
 static void hide_input_dialog() {
@@ -361,6 +380,7 @@ static void add_row(gint maker, Row* row) {
        GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook"));
        GtkWidget* scrolled_window = NULL;
        Maker* maker_info = get_maker(maker);
        GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook"));
        GtkWidget* scrolled_window = NULL;
        Maker* maker_info = get_maker(maker);
+       //fprintf(stdout, "%lu - %s - %d\n", maker_info->id, maker_info->maker_name, maker_info->page);
        if (maker_info->page >= 0)
                scrolled_window = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), maker_info->page);
        if (scrolled_window == NULL) {
        if (maker_info->page >= 0)
                scrolled_window = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), maker_info->page);
        if (scrolled_window == NULL) {
@@ -368,16 +388,17 @@ static void add_row(gint maker, Row* row) {
                GtkWidget* tab_label = gtk_label_new(maker_info->maker_name);
                scrolled_window = add_tab();
                treeview = gtk_bin_get_child(GTK_BIN(scrolled_window));
                GtkWidget* tab_label = gtk_label_new(maker_info->maker_name);
                scrolled_window = add_tab();
                treeview = gtk_bin_get_child(GTK_BIN(scrolled_window));
-               maker_info->page = gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label, maker);
+               maker_info->page = gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label, -1);
                if (maker_info->page < 0) {
                        /* Huston whe have a problem */
                        gchar* err = g_strdup_printf("%s: Could not create tab\n", maker_info->maker_name);
                        fprintf(stderr, err);
                if (maker_info->page < 0) {
                        /* Huston whe have a problem */
                        gchar* err = g_strdup_printf("%s: Could not create tab\n", maker_info->maker_name);
                        fprintf(stderr, err);
-                       show_err_msg(GTK_MESSAGE_ERROR, err);
+                       show_message(GTK_MESSAGE_ERROR, err);
                        g_free(err);
                } else {
                        update_maker(maker_info);
                }
                        g_free(err);
                } else {
                        update_maker(maker_info);
                }
+               //fprintf(stdout, "%lu - %s - %d - %p\n", maker_info->id, maker_info->maker_name, maker_info->page, scrolled_window);
                maker_free(maker_info);
        } else {
                treeview = gtk_bin_get_child(GTK_BIN(scrolled_window));
                maker_free(maker_info);
        } else {
                treeview = gtk_bin_get_child(GTK_BIN(scrolled_window));
@@ -506,7 +527,7 @@ G_MODULE_EXPORT void add_maker_clicked_cb(GtkWidget* self, gpointer data) {
                                // Huston whe have a problem
                                gchar* err = g_strdup_printf("%s: Could not create tab\n", maker);
                                fprintf(stderr, err);
                                // Huston whe have a problem
                                gchar* err = g_strdup_printf("%s: Could not create tab\n", maker);
                                fprintf(stderr, err);
-                               show_err_msg(GTK_MESSAGE_ERROR, err);
+                               show_message(GTK_MESSAGE_ERROR, err);
                                g_free(err);
                        } else {
                                //gint id = get_maker_id(maker);
                                g_free(err);
                        } else {
                                //gint id = get_maker_id(maker);
@@ -519,7 +540,7 @@ G_MODULE_EXPORT void add_maker_clicked_cb(GtkWidget* self, gpointer data) {
                        // Huston whe have a problem
                        gchar* err = g_strdup_printf("%s: Could not add Maker '%s'\n", error, maker);
                        fprintf(stderr, err);
                        // Huston whe have a problem
                        gchar* err = g_strdup_printf("%s: Could not add Maker '%s'\n", error, maker);
                        fprintf(stderr, err);
-                       show_err_msg(GTK_MESSAGE_ERROR, err);
+                       show_message(GTK_MESSAGE_ERROR, err);
                        g_free(err);
                }
                g_free(error);
                        g_free(err);
                }
                g_free(error);
@@ -564,7 +585,7 @@ G_MODULE_EXPORT void del_maker_clicked_cb(GtkWidget* self, gpointer data) {
                        // Huston whe have a problem
                        gchar* err = g_strdup_printf("%s: Could not remove Maker '%s'\n", error, label);
                        fprintf(stderr, err);
                        // Huston whe have a problem
                        gchar* err = g_strdup_printf("%s: Could not remove Maker '%s'\n", error, label);
                        fprintf(stderr, err);
-                       show_err_msg(GTK_MESSAGE_ERROR, err);
+                       show_message(GTK_MESSAGE_ERROR, err);
                        g_free(err);
                }
                g_free(error);
                        g_free(err);
                }
                g_free(error);
@@ -616,16 +637,6 @@ G_MODULE_EXPORT void search_ok_clicked_cb(GtkWidget* self, gpointer data) {
        
        GSList* rows = get_lens_by_search(row);
        row_free(row, NULL);
        
        GSList* rows = get_lens_by_search(row);
        row_free(row, NULL);
-
-/*
-       for (GSList* elem = rows; elem; elem = elem->next) {
-               Row* row = elem->data;
-               Maker* maker = get_maker(row->maker);
-               fprintf(stderr, "[maker: %s, id: %lu, sn: %s, data: %s, notes: %s]\n", 
-                       maker->maker_name, row->id, row->sn, row->data, row->notes);
-               maker_free(maker);
-       }
-*/
        
        create_search_result_dialog(rows);
        
        
        create_search_result_dialog(rows);
        
@@ -686,7 +697,7 @@ G_MODULE_EXPORT void input_ok_clicked_cb(GtkWidget* self, gpointer data) {
        if (add_lens(row)) {
                gchar* err = g_strdup_printf("Add failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes);
                fprintf(stderr, err);
        if (add_lens(row)) {
                gchar* err = g_strdup_printf("Add failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes);
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
        } else {
                GtkWidget* entry_id = GTK_WIDGET(gtk_builder_get_object(builder, "entry_input_id"));
                g_free(err);
        } else {
                GtkWidget* entry_id = GTK_WIDGET(gtk_builder_get_object(builder, "entry_input_id"));
@@ -739,7 +750,6 @@ G_MODULE_EXPORT void input_scan_clicked_cb(GtkWidget* self, gpointer data) {
                 * 2. Change tab if maker is is not current tab
                 * 3. Update input_label to the current tab
                 */
                 * 2. Change tab if maker is is not current tab
                 * 3. Update input_label to the current tab
                 */
-               //GtkWidget* input_dialog = GTK_WIDGET(gtk_builder_get_object(builder, "input_dialog"));
                GtkWidget* header = GTK_WIDGET(gtk_builder_get_object(builder, "label_input_header"));
                Maker* maker = NULL;
                gchar* dialog_label = NULL;
                GtkWidget* header = GTK_WIDGET(gtk_builder_get_object(builder, "label_input_header"));
                Maker* maker = NULL;
                gchar* dialog_label = NULL;
@@ -783,24 +793,6 @@ G_MODULE_EXPORT void input_scan_clicked_cb(GtkWidget* self, gpointer data) {
 
        g_free(path);
        row_free(row, NULL);
 
        g_free(path);
        row_free(row, NULL);
-/*
-       if (add_lens(row)) {
-               gchar* err = g_strdup_printf("Add failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes);
-               fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
-               g_free(err);
-       } else {
-               GtkWidget* entry_id = GTK_WIDGET(gtk_builder_get_object(builder, "entry_input_id"));
-               gtk_entry_set_text(GTK_ENTRY(entry_id), g_strdup_printf("%lu", row->id));
-       
-               add_row(get_maker_id(label), row);
-       }               
-       
-       row_free(row, NULL);
-       cur_view = NULL;
-       
-       hide_input_dialog();
-*/
 }
 
 G_MODULE_EXPORT void input_delete_clicked_cb(GtkWidget* self, gpointer data) {
 }
 
 G_MODULE_EXPORT void input_delete_clicked_cb(GtkWidget* self, gpointer data) {
@@ -818,7 +810,7 @@ G_MODULE_EXPORT void input_delete_clicked_cb(GtkWidget* self, gpointer data) {
                if (delete_lens(row)) {
                        gchar* err = g_strdup_printf("Delete failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes);
                        fprintf(stderr, err);
                if (delete_lens(row)) {
                        gchar* err = g_strdup_printf("Delete failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes);
                        fprintf(stderr, err);
-                       show_err_msg(GTK_MESSAGE_ERROR, err);
+                       show_message(GTK_MESSAGE_ERROR, err);
                        g_free(err);
                }
                GtkListStore* store = GTK_LIST_STORE(gtk_tree_view_get_model(cur_view));
                        g_free(err);
                }
                GtkListStore* store = GTK_LIST_STORE(gtk_tree_view_get_model(cur_view));
@@ -859,7 +851,7 @@ G_MODULE_EXPORT void input_update_clicked_cb(GtkWidget* self, gpointer data) {
                if (update_lens(row)) {
                        gchar* err = g_strdup_printf("Update failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes);
                        fprintf(stderr, err);
                if (update_lens(row)) {
                        gchar* err = g_strdup_printf("Update failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes);
                        fprintf(stderr, err);
-                       show_err_msg(GTK_MESSAGE_ERROR, err);
+                       show_message(GTK_MESSAGE_ERROR, err);
                        g_free(err);
                }
                GtkListStore* store = GTK_LIST_STORE(gtk_tree_view_get_model(cur_view));
                        g_free(err);
                }
                GtkListStore* store = GTK_LIST_STORE(gtk_tree_view_get_model(cur_view));
@@ -915,8 +907,6 @@ static gchar* get_filename(FileAction fileAction, const gchar* title) {
                        action = GTK_FILE_CHOOSER_ACTION_SAVE;
                        break;
                case FILE_OPEN:
                        action = GTK_FILE_CHOOSER_ACTION_SAVE;
                        break;
                case FILE_OPEN:
-                       if (nameHint == NULL)
-                               nameHint = g_strdup("Untitled document.csv");
                        action = GTK_FILE_CHOOSER_ACTION_OPEN;
                        break;
        }
                        action = GTK_FILE_CHOOSER_ACTION_OPEN;
                        break;
        }
@@ -940,14 +930,34 @@ static gchar* get_filename(FileAction fileAction, const gchar* title) {
                                                                                         GTK_RESPONSE_ACCEPT,
                                                                                         NULL);
        }
                                                                                         GTK_RESPONSE_ACCEPT,
                                                                                         NULL);
        }
-       GtkFileFilter* filter = gtk_file_filter_new();
-       gtk_file_filter_add_pattern(filter, "*.csv");
 
        chooser = GTK_FILE_CHOOSER(dialog);
 
        chooser = GTK_FILE_CHOOSER(dialog);
-       gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
-       gtk_file_chooser_set_filter(chooser, filter);
+
+       GtkFileFilter* filter_csv = gtk_file_filter_new();
+       gtk_file_filter_add_mime_type(filter_csv, "text/csv");
+       gtk_file_filter_add_mime_type(filter_csv, "application/csv");
+       gtk_file_filter_add_mime_type(filter_csv, "application/x-csv");
+       gtk_file_filter_add_mime_type(filter_csv, "application/vnd.ms-excel");
+       gtk_file_filter_add_mime_type(filter_csv, "text/x-csv");
+       gtk_file_filter_add_mime_type(filter_csv, "text/comma-separated-values");
+       gtk_file_filter_add_mime_type(filter_csv, "text/x-comma-separated-values");
+       gtk_file_filter_add_mime_type(filter_csv, "text/tab-separated-values");
+       gtk_file_filter_add_pattern(filter_csv, "*.csv");
+       gtk_file_filter_set_name(filter_csv, "CSV files");
+       gtk_file_chooser_add_filter(chooser, filter_csv);
+       GtkFileFilter* filter_plain = gtk_file_filter_new();
+       gtk_file_filter_add_mime_type(filter_plain, "text/plain");
+       gtk_file_filter_set_name(filter_plain, "Plain text");
+       gtk_file_chooser_add_filter(chooser, filter_plain);
        
        
-       gtk_file_chooser_set_current_name(chooser, (nameHint));
+       if (FILE_OPEN != fileAction) {
+               gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
+               GtkFileFilter* filter_all = gtk_file_filter_new();
+               gtk_file_filter_add_pattern(filter_all, "*");
+               gtk_file_filter_set_name(filter_all, "All files");
+               gtk_file_chooser_add_filter(chooser, filter_all);
+               gtk_file_chooser_set_current_name(chooser, nameHint);
+       }
 
        if (current_dir != NULL)
                gtk_file_chooser_set_current_folder(chooser, current_dir);
 
        if (current_dir != NULL)
                gtk_file_chooser_set_current_folder(chooser, current_dir);
@@ -993,10 +1003,68 @@ G_MODULE_EXPORT void onSaveAs(GtkWidget* self, gpointer data) {
 }
 
 G_MODULE_EXPORT void onOpen(GtkWidget* self, gpointer data) {
 }
 
 G_MODULE_EXPORT void onOpen(GtkWidget* self, gpointer data) {
+       CvsError* err = NULL;
+       gchar* cvsErr = NULL;
+       bool replace = false;
+       GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook"));
+
        gchar* filename = get_filename(FILE_OPEN, "Open File");
        gchar* filename = get_filename(FILE_OPEN, "Open File");
-       fprintf(stdout, "(onOpen) file: %s\n", filename);
-       
-       g_free(filename);
+       if (filename) {
+               Instructions instructions = {
+                       .file = filename,
+                       .first_line_header = true,
+                       .write = false,
+                       .overwrite = false
+               };
+               CsvParser* parser = csv_parser_new(&instructions, &err);
+               if (!parser) {
+                       fprintf(stderr, "[Line: %zu - %s]\n", err->line, err->message);
+                       csv_error_clear(&err);
+               } else {
+                       if ((replace = show_message(GTK_MESSAGE_QUESTION, "Should file content replace current?")) == true) {
+                               for (gint i = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)); i > 0; i--) {
+                                       GtkWidget* window = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), i-1);
+                                       GtkWidget* treeview = gtk_bin_get_child(GTK_BIN(window));
+                                       GtkTreeModel* model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
+                                       GtkListStore* store = GTK_LIST_STORE(model);
+                                       gtk_list_store_clear(store);
+                                       gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), i-1);
+                               }
+                               GSList* makers = get_makers();
+                               for (GSList* elem = makers; elem; elem = elem->next) {
+                                       Maker* maker = get_maker(get_maker_id(elem->data));
+                                       delete_maker(maker->maker_name, &cvsErr);
+                                       maker_free(maker);
+                               }
+                               g_slist_foreach(makers, (GFunc)g_free, NULL);
+                               g_slist_free(makers);
+                       }
+                       Record* r = NULL;
+                       while ((r = csv_parser_next_line(parser, &err)) != NULL) {
+                               if (err) {
+                                       fprintf(stderr, "[Line: %zu - %s]\n", err->line, err->message);
+                                       csv_error_clear(&err);
+                               }
+                               gint id;
+                               if ((id = get_maker_id(r->maker)) == -1) {
+                                       id = add_maker(r->maker, &cvsErr);
+                               }
+                               Row* row = row_new();
+                               row->maker = id;
+                               row->sn = g_strdup(r->sn);
+                               row->data = g_strdup(r->data);
+                               row->notes = g_strdup(r->notes);
+                               csv_record_free(r);
+                               add_lens(row);
+                               add_row(row->maker, row);
+                               row_free(row, NULL);
+                       }
+                       csv_parser_free(parser);
+                       if (replace)
+                               initialize_notebook();
+               }
+               g_free(filename);
+       }
 }
 
 G_MODULE_EXPORT void onNew(GtkWidget* self, gpointer data) {
 }
 
 G_MODULE_EXPORT void onNew(GtkWidget* self, gpointer data) {
index a73fbf69b5eb87995860ce74ab3a25253bbf3860..cc944b8dd4293e8d6ec2a4e1f5dacf9a6abd2517 100644 (file)
--- a/src/gui.h
+++ b/src/gui.h
@@ -30,6 +30,7 @@
 
 #include <gtk/gtk.h>
 #include <glib.h>
 
 #include <gtk/gtk.h>
 #include <glib.h>
+#include <stdbool.h>
 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 
@@ -53,7 +54,7 @@ enum {
 
 
 gboolean init_gui();
 
 
 gboolean init_gui();
-void show_err_msg(GtkMessageType type, const gchar* msg);
+bool show_message(GtkMessageType type, const gchar* msg);
 
 G_END_DECLS
 
 
 G_END_DECLS
 
index a875abba25ad96ec23584f84cfab13b02c723592..468ed1726145e0de2c52a2f14b81523508ca70ed 100644 (file)
 
 gint main(gint argc, gchar** argv) {
        gint status = 0;
 
 gint main(gint argc, gchar** argv) {
        gint status = 0;
-/*
-       CvsError* err = NULL;
-       CsvParser* parser = csv_parser_new("/tmp/test.csv", false, true, &err);
-       if (parser) {
-               Record* r = csv_parser_next_line(parser, &err);
-               if (err) {
-                       fprintf(stderr, "[Line: %zu - %s]\n", err->line, err->message);
-                       csv_error_clear(&err);
-               }
-               while (r != NULL) {
-                       csv_record_print(r);
-                       csv_record_free(r);
-                       r = csv_parser_next_line(parser, &err);
-                       if (err) {
-                               fprintf(stderr, "[Line: %zu - %s]\n", err->line, err->message);
-                               csv_error_clear(&err);
-                       }
-               }
-               csv_parser_free(parser);
-       } else {
-               fprintf(stderr, "[Line: %zu - %s]\n", err->line, err->message);
-               csv_error_clear(&err);
-       }
-*/
-       //gchar* path = g_path_get_dirname(argv[0]);
-       gchar* path = g_build_filename(g_get_user_config_dir(), PACKAGE, NULL); //g_strconcat(g_get_home_dir(), "/.local/share/", PACKAGE, NULL);
+       gchar* path = g_build_filename(g_get_user_config_dir(), PACKAGE, NULL);
        if (!g_file_test(path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
                if (g_mkdir(path, 0766)) {
                        fprintf(stderr, "%s: Failed to create dir for database\n", path);
        if (!g_file_test(path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
                if (g_mkdir(path, 0766)) {
                        fprintf(stderr, "%s: Failed to create dir for database\n", path);
@@ -74,24 +49,12 @@ gint main(gint argc, gchar** argv) {
                fprintf(stderr, "%s: Failed to open DB\n", path);
        } else {
                gtk_init(&argc, &argv);
                fprintf(stderr, "%s: Failed to open DB\n", path);
        } else {
                gtk_init(&argc, &argv);
-/*
-               parser = csv_parser_new("/tmp/test.csv", true, true, &err);
-               if (parser) {
-                       dump_storage(parser);
-               } else {
-                       fprintf(stderr, "[Line: %zu - %s]\n", err->line, err->message);
-                       csv_error_clear(&err);
-               }
-               g_free(path);
-               close_storage();
-               return EXIT_SUCCESS;
-*/
                if (init_gui()) {
                        g_free(path);
                        close_storage();
                        gchar* err = g_strdup_printf("Failed initializing GUI\n");
                        fprintf(stderr, err);
                if (init_gui()) {
                        g_free(path);
                        close_storage();
                        gchar* err = g_strdup_printf("Failed initializing GUI\n");
                        fprintf(stderr, err);
-                       show_err_msg(GTK_MESSAGE_ERROR, err);
+                       show_message(GTK_MESSAGE_ERROR, err);
                        g_free(err);
                        return EXIT_FAILURE;
                }
                        g_free(err);
                        return EXIT_FAILURE;
                }
index cb910bb568ad27d893016a372c859f05c3d1e0f9..8957fd3f7310acf02e98a9b78f7b11864d3acd6f 100644 (file)
@@ -67,7 +67,7 @@ gint init_storage(const gchar* path) {
        if (rc) {
                gchar* err = g_strdup_printf("Failed to open DB: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc) {
                gchar* err = g_strdup_printf("Failed to open DB: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                return 1;
        }
                g_free(err);
                return 1;
        }
@@ -77,7 +77,7 @@ gint init_storage(const gchar* path) {
                if (rc != SQLITE_OK) {
                        gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg);
                        fprintf(stderr, err);
                if (rc != SQLITE_OK) {
                        gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg);
                        fprintf(stderr, err);
-                       show_err_msg(GTK_MESSAGE_ERROR, err);
+                       show_message(GTK_MESSAGE_ERROR, err);
                        g_free(err);
                        sqlite3_free(ErrMsg);
                        ErrMsg = NULL;
                        g_free(err);
                        sqlite3_free(ErrMsg);
                        ErrMsg = NULL;
@@ -86,7 +86,7 @@ gint init_storage(const gchar* path) {
                if (rc != SQLITE_OK) {
                        gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg);
                        fprintf(stderr, err);
                if (rc != SQLITE_OK) {
                        gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg);
                        fprintf(stderr, err);
-                       show_err_msg(GTK_MESSAGE_ERROR, err);
+                       show_message(GTK_MESSAGE_ERROR, err);
                        g_free(err);
                        sqlite3_free(ErrMsg);
                        ErrMsg = NULL;
                        g_free(err);
                        sqlite3_free(ErrMsg);
                        ErrMsg = NULL;
@@ -95,7 +95,7 @@ gint init_storage(const gchar* path) {
                if (rc != SQLITE_OK) {
                        gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg);
                        fprintf(stderr, err);
                if (rc != SQLITE_OK) {
                        gchar* err = g_strdup_printf("SQL error: %s\n", ErrMsg);
                        fprintf(stderr, err);
-                       show_err_msg(GTK_MESSAGE_ERROR, err);
+                       show_message(GTK_MESSAGE_ERROR, err);
                        g_free(err);
                        sqlite3_free(ErrMsg);
                }
                        g_free(err);
                        sqlite3_free(ErrMsg);
                }
@@ -113,7 +113,7 @@ gint add_lens(Row* row) {
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
         sqlite3_finalize(stmt);
         return status;
                g_free(err);
         sqlite3_finalize(stmt);
         return status;
@@ -123,7 +123,7 @@ gint add_lens(Row* row) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
@@ -133,7 +133,7 @@ gint add_lens(Row* row) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
@@ -143,7 +143,7 @@ gint add_lens(Row* row) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
@@ -153,7 +153,7 @@ gint add_lens(Row* row) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
@@ -163,7 +163,7 @@ gint add_lens(Row* row) {
     if (rc != SQLITE_ROW) {
                gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc != SQLITE_ROW) {
                gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
     } else {
                row->id = sqlite3_column_int64(stmt, 0);
                g_free(err);
     } else {
                row->id = sqlite3_column_int64(stmt, 0);
@@ -184,7 +184,7 @@ gint update_lens(const Row* row) {
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
         return status;
                g_free(err);
                sqlite3_finalize(stmt);
         return status;
@@ -194,7 +194,7 @@ gint update_lens(const Row* row) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
@@ -204,7 +204,7 @@ gint update_lens(const Row* row) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
@@ -214,7 +214,7 @@ gint update_lens(const Row* row) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
@@ -224,7 +224,7 @@ gint update_lens(const Row* row) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
@@ -234,7 +234,7 @@ gint update_lens(const Row* row) {
     if (rc != SQLITE_DONE) {
                gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc != SQLITE_DONE) {
                gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
     } else {
                status = 0;
                g_free(err);
     } else {
                status = 0;
@@ -254,7 +254,7 @@ gint delete_lens(const Row* row) {
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
         return status;
                g_free(err);
                sqlite3_finalize(stmt);
         return status;
@@ -264,7 +264,7 @@ gint delete_lens(const Row* row) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
                g_free(err);
                sqlite3_finalize(stmt);
                return status;
@@ -274,7 +274,7 @@ gint delete_lens(const Row* row) {
     if (rc != SQLITE_DONE) {
                gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc != SQLITE_DONE) {
                gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
     } else {
                status = 0;
                g_free(err);
     } else {
                status = 0;
@@ -288,47 +288,47 @@ gint delete_lens(const Row* row) {
 gint add_maker(const gchar* maker, gchar** error) {
        gint rc;
        sqlite3_stmt* stmt;
 gint add_maker(const gchar* maker, gchar** error) {
        gint rc;
        sqlite3_stmt* stmt;
-       gint status = -1;
+       gint id = -1;
        
        rc = sqlite3_prepare_v2(db, "insert into lensmaker (maker) values (?1) returning id", -1, &stmt, 0);
        if (rc != SQLITE_OK) {
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        
        rc = sqlite3_prepare_v2(db, "insert into lensmaker (maker) values (?1) returning id", -1, &stmt, 0);
        if (rc != SQLITE_OK) {
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
         sqlite3_finalize(stmt);
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
         sqlite3_finalize(stmt);
-        return status;
+        return id;
     }  
     
     rc = sqlite3_bind_text(stmt, 1, maker, -1, NULL);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     }  
     
     rc = sqlite3_bind_text(stmt, 1, maker, -1, NULL);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
                sqlite3_finalize(stmt);
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
                sqlite3_finalize(stmt);
-               return status;
+               return id;
        }
        
        rc = sqlite3_step(stmt);
     if (rc != SQLITE_ROW) {
                gchar* err = g_strdup_printf("Couldn't insert maker: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        }
        
        rc = sqlite3_step(stmt);
     if (rc != SQLITE_ROW) {
                gchar* err = g_strdup_printf("Couldn't insert maker: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
     } else {
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
     } else {
-               status = sqlite3_column_int64(stmt, 0);
+               id = sqlite3_column_int64(stmt, 0);
        }
 
     sqlite3_finalize(stmt);
 
        }
 
     sqlite3_finalize(stmt);
 
-       return status;
+       return id;
 }
 
 Maker* get_maker(gint id) {
 }
 
 Maker* get_maker(gint id) {
@@ -340,7 +340,7 @@ Maker* get_maker(gint id) {
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
         sqlite3_finalize(stmt);
         return NULL;
                g_free(err);
         sqlite3_finalize(stmt);
         return NULL;
@@ -350,7 +350,7 @@ Maker* get_maker(gint id) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return NULL;
                g_free(err);
                sqlite3_finalize(stmt);
                return NULL;
@@ -376,7 +376,7 @@ void update_maker(const Maker* maker) {
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
         sqlite3_finalize(stmt);
         return;
                g_free(err);
         sqlite3_finalize(stmt);
         return;
@@ -386,7 +386,7 @@ void update_maker(const Maker* maker) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return;
                g_free(err);
                sqlite3_finalize(stmt);
                return;
@@ -396,7 +396,7 @@ void update_maker(const Maker* maker) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return;
                g_free(err);
                sqlite3_finalize(stmt);
                return;
@@ -407,7 +407,7 @@ void update_maker(const Maker* maker) {
     if (rc != SQLITE_DONE) {
                gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc != SQLITE_DONE) {
                gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
     }
                g_free(err);
                sqlite3_finalize(stmt);
     }
@@ -432,7 +432,7 @@ gint delete_maker(const gchar* maker, gchar** error) {
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
@@ -445,7 +445,7 @@ gint delete_maker(const gchar* maker, gchar** error) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
@@ -459,7 +459,7 @@ gint delete_maker(const gchar* maker, gchar** error) {
     if (rc != SQLITE_DONE) {
                gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc != SQLITE_DONE) {
                gchar* err = g_strdup_printf("Step failure: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
                g_free(err);
                if (error)
                        *error = g_strdup(sqlite3_errmsg(db));
@@ -482,7 +482,7 @@ GSList* get_makers() {
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Failed to fetch data: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Failed to fetch data: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
         return NULL;
                g_free(err);
                sqlite3_finalize(stmt);
         return NULL;
@@ -507,7 +507,7 @@ gint get_maker_id(const gchar* maker) {
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
         sqlite3_finalize(stmt);
         return -1;
                g_free(err);
         sqlite3_finalize(stmt);
         return -1;
@@ -517,7 +517,7 @@ gint get_maker_id(const gchar* maker) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return -1;
                g_free(err);
                sqlite3_finalize(stmt);
                return -1;
@@ -541,7 +541,7 @@ GSList* get_lens_by_maker(gint id) {
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
         sqlite3_finalize(stmt);
         return NULL;
                g_free(err);
         sqlite3_finalize(stmt);
         return NULL;
@@ -551,7 +551,7 @@ GSList* get_lens_by_maker(gint id) {
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
     if (rc) {
                gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
                sqlite3_finalize(stmt);
                return NULL;
                g_free(err);
                sqlite3_finalize(stmt);
                return NULL;
@@ -601,7 +601,7 @@ GSList* get_lens_by_search(const Row* row) {
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
         sqlite3_finalize(stmt);
         return NULL;
                g_free(err);
         sqlite3_finalize(stmt);
         return NULL;
@@ -612,7 +612,7 @@ GSList* get_lens_by_search(const Row* row) {
                if (rc) {
                        gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                        fprintf(stderr, err);
                if (rc) {
                        gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                        fprintf(stderr, err);
-                       show_err_msg(GTK_MESSAGE_ERROR, err);
+                       show_message(GTK_MESSAGE_ERROR, err);
                        g_free(err);
                        sqlite3_finalize(stmt);
                        return NULL;
                        g_free(err);
                        sqlite3_finalize(stmt);
                        return NULL;
@@ -624,7 +624,7 @@ GSList* get_lens_by_search(const Row* row) {
                if (rc) {
                        gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                        fprintf(stderr, err);
                if (rc) {
                        gchar* err = g_strdup_printf("Couldn't bind to prepared sql stmt: %s\n", sqlite3_errmsg(db));
                        fprintf(stderr, err);
-                       show_err_msg(GTK_MESSAGE_ERROR, err);
+                       show_message(GTK_MESSAGE_ERROR, err);
                        g_free(err);
                        sqlite3_finalize(stmt);
                        return NULL;
                        g_free(err);
                        sqlite3_finalize(stmt);
                        return NULL;
@@ -674,7 +674,7 @@ void dump_storage(CsvParser* parser) {
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
        if (rc != SQLITE_OK) {   
                gchar* err = g_strdup_printf("Couldn't prepare sql statement: %s\n", sqlite3_errmsg(db));
                fprintf(stderr, err);
-               show_err_msg(GTK_MESSAGE_ERROR, err);
+               show_message(GTK_MESSAGE_ERROR, err);
                g_free(err);
         sqlite3_finalize(stmt);
         return;
                g_free(err);
         sqlite3_finalize(stmt);
         return;
@@ -691,7 +691,7 @@ void dump_storage(CsvParser* parser) {
        if (err) {
                gchar* msg = g_strdup_printf("%zu: %s\n", err->line, err->message);
                fprintf(stderr, msg);
        if (err) {
                gchar* msg = g_strdup_printf("%zu: %s\n", err->line, err->message);
                fprintf(stderr, msg);
-               show_err_msg(GTK_MESSAGE_ERROR, msg);
+               show_message(GTK_MESSAGE_ERROR, msg);
                g_free(msg);
                csv_error_clear(&err);
                sqlite3_finalize(stmt);
                g_free(msg);
                csv_error_clear(&err);
                sqlite3_finalize(stmt);
@@ -710,7 +710,7 @@ void dump_storage(CsvParser* parser) {
                if (err) {
                        gchar* msg = g_strdup_printf("%zu: %s\n", err->line, err->message);
                        fprintf(stderr, msg);
                if (err) {
                        gchar* msg = g_strdup_printf("%zu: %s\n", err->line, err->message);
                        fprintf(stderr, msg);
-                       show_err_msg(GTK_MESSAGE_ERROR, msg);
+                       show_message(GTK_MESSAGE_ERROR, msg);
                        g_free(msg);
                        csv_error_clear(&err);
                        sqlite3_finalize(stmt);
                        g_free(msg);
                        csv_error_clear(&err);
                        sqlite3_finalize(stmt);
This page took 0.39996 seconds and 5 git commands to generate.