From 4670c0f5fab44df9e34327cf4c990abaa39be358 Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Sun, 31 Jan 2010 19:50:48 +0100 Subject: [PATCH] Fix compiler warnings for callbacks.c --- src/ui/callbacks.c | 183 +++++++++++++++++++++++++---------------------------- 1 file changed, 85 insertions(+), 98 deletions(-) diff --git a/src/ui/callbacks.c b/src/ui/callbacks.c index 56f3ae6..927cb1a 100644 --- a/src/ui/callbacks.c +++ b/src/ui/callbacks.c @@ -25,6 +25,8 @@ #include #include +#include + /* * strlen needed from string.h */ @@ -315,8 +317,8 @@ void saveDataToNode(MainView * mainview, nodeData *selnode) textdata=g_string_free(gstr, FALSE); /*fprintf(stderr, "*%s*\n", textdata);*/ -/* snprintf(tq, sizeof(tq), "UPDATE %s SET bodytype=%d, bodyblob=NULL, body=?, flags=%d WHERE nodeid=%d", datatable_tmpname, selnode->typ, selnode->flags, selnode->sql3id);*/ - snprintf(tq, sizeof(tq), "UPDATE %s SET bodytype=%d, bodyblob=?, body=NULL, flags=%d WHERE nodeid=%d", datatable_tmpname, selnode->typ, selnode->flags, selnode->sql3id); +/* g_snprintf(tq, sizeof(tq), "UPDATE %s SET bodytype=%d, bodyblob=NULL, body=?, flags=%d WHERE nodeid=%d", datatable_tmpname, selnode->typ, selnode->flags, selnode->sql3id);*/ + g_snprintf(tq, sizeof(tq), "UPDATE %s SET bodytype=%d, bodyblob=?, body=NULL, flags=%d WHERE nodeid=%d", datatable_tmpname, selnode->typ, selnode->flags, selnode->sql3id); } else if (selnode->typ == NODE_SKETCH) { @@ -346,13 +348,13 @@ void saveDataToNode(MainView * mainview, nodeData *selnode) gdk_pixbuf_unref(pixbuf2); } } - snprintf(tq, sizeof(tq), "UPDATE %s SET bodytype=%d, body=NULL, bodyblob=?, flags=%d WHERE nodeid=%d", datatable_tmpname, selnode->typ, selnode->flags, selnode->sql3id); + g_snprintf(tq, sizeof(tq), "UPDATE %s SET bodytype=%d, body=NULL, bodyblob=?, flags=%d WHERE nodeid=%d", datatable_tmpname, selnode->typ, selnode->flags, selnode->sql3id); fprintf(stderr, "datalen:%d\n", datalen); if (skpix && G_IS_OBJECT(skpix)) g_object_unref(skpix); } else if (selnode->typ == NODE_CHECKLIST) { - snprintf(tq, sizeof(tq), "UPDATE %s SET bodytype=%d, body=NULL, bodyblob=NULL, flags=%d WHERE nodeid=%d", datatable_tmpname, selnode->typ, selnode->flags, selnode->sql3id); + g_snprintf(tq, sizeof(tq), "UPDATE %s SET bodytype=%d, body=NULL, bodyblob=NULL, flags=%d WHERE nodeid=%d", datatable_tmpname, selnode->typ, selnode->flags, selnode->sql3id); } /*fprintf(stderr, "query is *%s*\n", tq); */ @@ -403,7 +405,7 @@ void saveDataToNode(MainView * mainview, nodeData *selnode) GtkTreeModel *model=gtk_tree_view_get_model(GTK_TREE_VIEW(mainview->listview)); char tq[512]; - snprintf(tq, sizeof(tq), "DELETE FROM %s WHERE nodeid=%d", checklisttable_tmpname, selnode->sql3id); + g_snprintf(tq, sizeof(tq), "DELETE FROM %s WHERE nodeid=%d", checklisttable_tmpname, selnode->sql3id); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); GtkTreeIter iter; @@ -432,7 +434,7 @@ void saveDataToNode(MainView * mainview, nodeData *selnode) if (styletoset_weight==PANGO_WEIGHT_BOLD) style|=CHECKSTYLE_BOLD; if (styletoset_strike) style|=CHECKSTYLE_STRIKE; - snprintf(tq, sizeof(tq), "INSERT INTO %s (nodeid, name, style, color, ord) VALUES(%d, ?, %d, %lu, 0)", checklisttable_tmpname, selnode->sql3id, style, col); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s (nodeid, name, style, color, ord) VALUES(%d, ?, %d, %lu, 0)", checklisttable_tmpname, selnode->sql3id, style, col); sqlite3_stmt *stmt = NULL; const char *dum; int rc = sqlite3_prepare(mainview->db, tq, strlen(tq), &stmt, &dum); @@ -590,7 +592,7 @@ void callback_treeview_change(GtkTreeSelection * selection, gpointer data) char tq[512]; - snprintf(tq, sizeof(tq), "SELECT bodytype, body, bodyblob, flags FROM %s WHERE nodeid=%d", datatable_tmpname, nd->sql3id); + g_snprintf(tq, sizeof(tq), "SELECT bodytype, body, bodyblob, flags FROM %s WHERE nodeid=%d", datatable_tmpname, nd->sql3id); sqlite3_stmt *stmt = NULL; const char *dum; int rc = sqlite3_prepare(mainview->db, tq, strlen(tq), &stmt, &dum); @@ -756,7 +758,7 @@ void callback_treeview_change(GtkTreeSelection * selection, gpointer data) gtk_tree_view_set_model(GTK_TREE_VIEW(mainview->listview), NULL); gtk_list_store_clear(GTK_LIST_STORE(model)); - snprintf(tq, sizeof(tq), "SELECT name, style, color FROM %s WHERE nodeid=%d ORDER BY ord, idx", checklisttable_tmpname, nd->sql3id); + g_snprintf(tq, sizeof(tq), "SELECT name, style, color FROM %s WHERE nodeid=%d ORDER BY ord, idx", checklisttable_tmpname, nd->sql3id); sqlite3_stmt *stmt2 = NULL; const char *dum; int rc = sqlite3_prepare(mainview->db, tq, strlen(tq), &stmt2, &dum); @@ -792,7 +794,7 @@ void callback_treeview_change(GtkTreeSelection * selection, gpointer data) if (col>0) { char tmp[10]; - snprintf(tmp, sizeof(tmp), "#%02x%02x%02x", ((col & 0xFF0000) >> 16), ((col & 0xFF00) >> 8), (col & 0xFF)); + g_snprintf(tmp, sizeof(tmp), "#%02lx%02lx%02lx", ((col & 0xFF0000) >> 16), ((col & 0xFF00) >> 8), (col & 0xFF)); /* fprintf(stderr, "read color for node is *%s*\n", tmp);*/ gtk_list_store_set(GTK_LIST_STORE(model), &toplevel, CHECKNODE_COLOR, tmp, -1); } @@ -928,10 +930,9 @@ void show_sketch_widget(GtkWidget *widget, gpointer user_data) void new_node_dialog(nodeType typ, MainView * mainview) { - GtkWidget *dialog, *label, *entry, *but_ok, *vbox, *hbox, *al, *cb; + GtkWidget *dialog, *entry, *but_ok, *vbox, *hbox, *al, *cb; GtkWidget *rb1, *rb2, *rb3; - GtkWidget *bb, *im, *lb, *but_sketch, *hb; - gchar* tmp_str; + GtkWidget *hb; gchar datetime_str[200]; time_t t_now; struct tm *tm_now; @@ -974,7 +975,7 @@ void new_node_dialog(nodeType typ, MainView * mainview) nntb->rbt = rb1; /* Sketch toggle button */ - rb2 = hildon_gtk_radio_button_new_from_widget(HILDON_SIZE_FINGER_HEIGHT, GTK_WIDGET(rb1)); + rb2 = hildon_gtk_radio_button_new_from_widget(HILDON_SIZE_FINGER_HEIGHT, GTK_RADIO_BUTTON(rb1)); gtk_button_set_label(GTK_BUTTON(rb2), _("Sketch")); gtk_button_set_image(GTK_BUTTON(rb2), gtk_image_new_from_file(PIXMAPDIR "/sketch.png")); gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(rb2), TRUE, TRUE, 0); @@ -982,7 +983,7 @@ void new_node_dialog(nodeType typ, MainView * mainview) nntb->rbs = rb2; /* Checklist toggle button */ - rb3 = hildon_gtk_radio_button_new_from_widget(HILDON_SIZE_FINGER_HEIGHT, GTK_WIDGET(rb1)); + rb3 = hildon_gtk_radio_button_new_from_widget(HILDON_SIZE_FINGER_HEIGHT, GTK_RADIO_BUTTON(rb1)); gtk_button_set_label(GTK_BUTTON(rb3), _("Checklist")); gtk_button_set_image(GTK_BUTTON(rb3), gtk_image_new_from_file(PIXMAPDIR "/checklist.png")); gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(rb3), TRUE, TRUE, 0); @@ -1116,7 +1117,7 @@ void add_new_node(nodeData * node, MainView * mainview, gboolean ischild) /* * FIXME: ord */ - snprintf(tq, sizeof(tq), "INSERT INTO %s (parent, bodytype, name, nameblob, ord) VALUES (%d, %d, ?, ?, 0);", datatable_tmpname, parentnodeid, node->typ); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s (parent, bodytype, name, nameblob, ord) VALUES (%d, %d, ?, ?, 0);", datatable_tmpname, parentnodeid, node->typ); int rc = sqlite3_prepare(mainview->db, tq, strlen(tq), &stmt, &dum); if (rc) @@ -1215,7 +1216,6 @@ void callback_new_node_real(GtkAction * action, gpointer data) g_free(nntb); gchar *txt = NULL; - GdkPixbuf *pixbuf = NULL; /*if (GTK_WIDGET_VISIBLE(entry)) {*/ @@ -1369,7 +1369,7 @@ void callback_file_rename_node(GtkAction * action, gpointer data) hbox = GTK_WIDGET(gtk_hbox_new(FALSE, 10)); - gtk_container_add(gtk_dialog_get_content_area(GTK_DIALOG(dialog)), hbox); + gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), GTK_WIDGET(hbox)); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0); @@ -1394,7 +1394,7 @@ void callback_rename_node_real (GtkAction *action, gpointer data) entry = g_object_get_data (G_OBJECT(dialog), "e"); /* Checking whether the entry is empty */ - gchar *new_node_name = gtk_entry_get_text (GTK_ENTRY(entry)); + const gchar *new_node_name = gtk_entry_get_text (GTK_ENTRY(entry)); if (strcmp (new_node_name, "") == 0) { hildon_banner_show_information(GTK_WIDGET(mainview->data->main_view), NULL, _("Name can not be empty")); return; @@ -1428,7 +1428,7 @@ void callback_rename_node_real (GtkAction *action, gpointer data) gtk_window_set_title(GTK_WINDOW(mainview->data->node_view), nd->name); do { - snprintf (tq, sizeof(tq), "UPDATE %s SET name=\"%s\" WHERE nodeid=%d", + g_snprintf (tq, sizeof(tq), "UPDATE %s SET name=\"%s\" WHERE nodeid=%d", datatable_tmpname, new_node_name, sql3id); int rc = sqlite3_prepare (mainview->db, tq, strlen(tq), &stmt, &dum); @@ -1645,7 +1645,7 @@ void callback_move_to_top_level_node(GtkAction * action, gpointer data) gint id_node = get_node_id_on_tmp_db(model,&iter); /*we need also update parent id of moved item*/ char tq[512]; - snprintf (tq, sizeof(tq), "UPDATE %s SET parent=%d WHERE nodeid=%d",datatable_tmpname,id_parent ,id_node); + g_snprintf (tq, sizeof(tq), "UPDATE %s SET parent=%d WHERE nodeid=%d",datatable_tmpname,id_parent ,id_node); exec_command_on_db(mainview,tq); /*select new created iter*/ @@ -1687,7 +1687,7 @@ void callback_move_to_bottom_level_node(GtkAction * action, gpointer data) /*we need also update parent id of moved item*/ char tq[512]; - snprintf (tq, sizeof(tq), "UPDATE %s SET parent=%d WHERE nodeid=%d",datatable_tmpname,id_parent ,id_node); + g_snprintf (tq, sizeof(tq), "UPDATE %s SET parent=%d WHERE nodeid=%d",datatable_tmpname,id_parent ,id_node); exec_command_on_db(mainview,tq); GtkTreePath *path = gtk_tree_model_get_path(model, &iter); @@ -1794,7 +1794,7 @@ gboolean foreach_func_update_ord (GtkTreeModel *model,GtkTreePath *path,GtkTreeI /*prepare to execute update command,and exec it*/ char sql_command[512]; - snprintf (sql_command, sizeof(sql_command), "UPDATE %s SET ord=\"%d\" WHERE nodeid=%d",datatable_tmpname, index, node->sql3id); + g_snprintf (sql_command, sizeof(sql_command), "UPDATE %s SET ord=\"%d\" WHERE nodeid=%d",datatable_tmpname, index, node->sql3id); exec_command_on_db(mainview,sql_command); /*we don't want break gtk_tree_model_foreach function,until we call this func on each node - so we return always FALSE*/ @@ -1988,7 +1988,7 @@ void callback_delete_node_real(MainView* mainview) { char tq[512]; - snprintf(tq, sizeof(tq), "SELECT parent FROM %s WHERE nodeid=%d", datatable_tmpname, sql3id); + g_snprintf(tq, sizeof(tq), "SELECT parent FROM %s WHERE nodeid=%d", datatable_tmpname, sql3id); sqlite3_stmt *stmt = NULL; const char *dum; int rc = sqlite3_prepare(mainview->db, tq, strlen(tq), &stmt, &dum); @@ -2014,18 +2014,18 @@ void callback_delete_node_real(MainView* mainview) } sqlite3_finalize(stmt); - snprintf(tq, sizeof(tq), "UPDATE %s SET parent=%d WHERE parent=%d;", datatable_tmpname, sql3parentid, sql3id); + g_snprintf(tq, sizeof(tq), "UPDATE %s SET parent=%d WHERE parent=%d;", datatable_tmpname, sql3parentid, sql3id); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) fprintf(stderr, "ERROR moving nodes up!\n"); else { - snprintf(tq, sizeof(tq), "DELETE FROM %s WHERE nodeid=%d;", datatable_tmpname, sql3id); + g_snprintf(tq, sizeof(tq), "DELETE FROM %s WHERE nodeid=%d;", datatable_tmpname, sql3id); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) fprintf(stderr, "ERROR deleting node!\n"); /* Delete all checklist items that do not have * a node anymore (= orphaned checklist items) */ - snprintf(tq, sizeof(tq), "DELETE FROM %s WHERE nodeid NOT IN (SELECT nodeid FROM %s);", checklisttable_tmpname, datatable_tmpname); + g_snprintf(tq, sizeof(tq), "DELETE FROM %s WHERE nodeid NOT IN (SELECT nodeid FROM %s);", checklisttable_tmpname, datatable_tmpname); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) fprintf(stderr, "ERROR deleting orphaned checklist items!\n"); } @@ -2128,7 +2128,7 @@ void callback_edit_copy(GtkAction * action, gpointer data) GtkTreePath *path = cur->data; if (gtk_tree_model_get_iter(model, &iter, path)) { - gtk_tree_model_get(GTK_LIST_STORE(model), &iter, CHECKNODE_TEXT, &(entries[entries_idx++]), -1); + gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHECKNODE_TEXT, &(entries[entries_idx++]), -1); } gtk_tree_path_free(path); @@ -2287,10 +2287,10 @@ void callback_file_new(GtkAction * action, gpointer data) char tq[512]; - snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", misctable_name, misctable); + g_snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", misctable_name, misctable); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", datatable_name, datatable); + g_snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", datatable_name, datatable); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR creating data table\n"); @@ -2298,7 +2298,7 @@ void callback_file_new(GtkAction * action, gpointer data) break; } - snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", checklisttable_name, checklisttable); + g_snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", checklisttable_name, checklisttable); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR creating checklist table\n"); @@ -2457,8 +2457,7 @@ void callback_about_link(GtkAboutDialog *about, const gchar *link, gpointer data void callback_about(GtkAction * action, gpointer data) { - MainView *mainview=(MainView *)data; - + /*MainView *mainview=(MainView *)data;*/ he_about_dialog_present(NULL /* auto-detect app name */, "maepad", VERSION, @@ -2631,21 +2630,21 @@ void callback_color(GtkAction* action, MainView* mainview) nodeData *nd = getSelectedNode(mainview); if (nd == NULL) return; - HeSimpleColorDialog* dialog = he_simple_color_dialog_new(); + HeSimpleColorDialog* dialog = HE_SIMPLE_COLOR_DIALOG(he_simple_color_dialog_new()); if (mainview->current_color) { he_simple_color_dialog_set_color(dialog, mainview->current_color); } if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { - gtk_widget_destroy(GTK_DIALOG(dialog)); + gtk_widget_destroy(GTK_WIDGET(dialog)); return; } gdk_color_free(mainview->current_color); mainview->current_color = he_simple_color_dialog_get_color(dialog); - gtk_widget_destroy(GTK_DIALOG(dialog)); + gtk_widget_destroy(GTK_WIDGET(dialog)); switch (nd->typ) { case NODE_SKETCH: @@ -2900,7 +2899,7 @@ else if (nd->typ == NODE_CHECKLIST) } g_list_free(l); - gtk_object_set_data(GTK_OBJECT(mainview->listview), "edited", TRUE); + gtk_object_set_data(GTK_OBJECT(mainview->listview), "edited", GINT_TO_POINTER(TRUE)); } } @@ -3260,7 +3259,7 @@ GtkTreeRowReference *read_sqlite3_data(MainView * mainview, unsigned int parenti char q[256]; - snprintf(q, sizeof(q), "SELECT nodeid, bodytype, name, nameblob, lastmodified, flags FROM %s WHERE parent=%d ORDER BY ord", datatable_tmpname, parentid); + g_snprintf(q, sizeof(q), "SELECT nodeid, bodytype, name, nameblob, lastmodified, flags FROM %s WHERE parent=%d ORDER BY ord", datatable_tmpname, parentid); sqlite3_stmt *stmt = NULL; const char *dum; @@ -3436,19 +3435,12 @@ gboolean read_file_to_buffer(MainView * mainview) break; else if (rc == SQLITE_ROW) { - const unsigned char *col_key = sqlite3_column_text(stmt, 0); - const unsigned char *col_val = sqlite3_column_text(stmt, 1); + const gchar* col_key = (const gchar*)sqlite3_column_text(stmt, 0); + const gchar* col_val = (const gchar*)sqlite3_column_text(stmt, 1); /* * fprintf(stderr, "%s=%s\n", col_key, col_val); */ - if (!strcmp(col_key, "leftPanedPos")) - { - gint panedPos = atoi((char *)col_val); - - /*if (panedPos > 0) - gtk_paned_set_position(GTK_PANED(mainview->hpaned), panedPos);*/ - } if (!strcmp(col_key, "selectedNode")) { gint tmp = atoi((char *)col_val); @@ -3544,10 +3536,10 @@ gboolean read_file_to_buffer(MainView * mainview) { if (curDataVersion == 0) { - snprintf(tq, sizeof(tq), "DROP TABLE %s", datatable_backupname); + g_snprintf(tq, sizeof(tq), "DROP TABLE %s", datatable_backupname); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "ALTER TABLE %s RENAME TO %s", datatable_name, datatable_backupname); + g_snprintf(tq, sizeof(tq), "ALTER TABLE %s RENAME TO %s", datatable_name, datatable_backupname); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR backing up table!\n"); @@ -3555,20 +3547,20 @@ gboolean read_file_to_buffer(MainView * mainview) } resback = TRUE; - snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", datatable_name, datatable); + g_snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", datatable_name, datatable); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR creating table!\n"); break; } - snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT nodeid, parent, bodytype, name, body, nameblob, bodyblob, lastmodified, ord, 0 FROM %s", datatable_name, datatable_backupname); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT nodeid, parent, bodytype, name, body, nameblob, bodyblob, lastmodified, ord, 0 FROM %s", datatable_name, datatable_backupname); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR copying data!\n"); break; } - snprintf(tq, sizeof(tq), "DROP TABLE %s", datatable_backupname); + g_snprintf(tq, sizeof(tq), "DROP TABLE %s", datatable_backupname); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); curDataVersion = datatableversion; @@ -3582,9 +3574,9 @@ gboolean read_file_to_buffer(MainView * mainview) if (resback == TRUE) { - snprintf(tq, sizeof(tq), "DROP TABLE %s", datatable_name); + g_snprintf(tq, sizeof(tq), "DROP TABLE %s", datatable_name); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "ALTER TABLE %s RENAME TO %s", datatable_backupname, datatable_name); + g_snprintf(tq, sizeof(tq), "ALTER TABLE %s RENAME TO %s", datatable_backupname, datatable_name); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); } @@ -3596,7 +3588,7 @@ gboolean read_file_to_buffer(MainView * mainview) { if (curChecklistVersion == 0) /*no checklisttable at all*/ { - snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", checklisttable_name, checklisttable); + g_snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", checklisttable_name, checklisttable); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR creating checklist table!\n"); @@ -3617,38 +3609,38 @@ gboolean read_file_to_buffer(MainView * mainview) { char tq[512]; - snprintf(tq, sizeof(tq), "CREATE%s TABLE %s%s", TEMPTABLE_KEYWORD, datatable_tmpname, datatable); + g_snprintf(tq, sizeof(tq), "CREATE%s TABLE %s%s", TEMPTABLE_KEYWORD, datatable_tmpname, datatable); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR creating temp table!\n"); break; } - snprintf(tq, sizeof(tq), "CREATE INDEX %s_index ON %s %s", datatable_tmpname, datatable_tmpname, dataindex); + g_snprintf(tq, sizeof(tq), "CREATE INDEX %s_index ON %s %s", datatable_tmpname, datatable_tmpname, dataindex); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR creating temp index!\n"); break; } - snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", datatable_tmpname, datatable_name); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", datatable_tmpname, datatable_name); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR copying data to temp table!\n"); break; } - snprintf(tq, sizeof(tq), "CREATE%s TABLE %s%s", TEMPTABLE_KEYWORD, checklisttable_tmpname, checklisttable); + g_snprintf(tq, sizeof(tq), "CREATE%s TABLE %s%s", TEMPTABLE_KEYWORD, checklisttable_tmpname, checklisttable); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR creating temp table! (checklist)\n"); break; } - snprintf(tq, sizeof(tq), "CREATE INDEX %s_index ON %s %s", checklisttable_tmpname, checklisttable_tmpname, checklistindex); + g_snprintf(tq, sizeof(tq), "CREATE INDEX %s_index ON %s %s", checklisttable_tmpname, checklisttable_tmpname, checklistindex); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR creating temp index! (checklist)\n"); break; } - snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", checklisttable_tmpname, checklisttable_name); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", checklisttable_tmpname, checklisttable_name); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR copying data to temp table! (checklist)\n"); @@ -3705,32 +3697,27 @@ void write_buffer_to_file(MainView * mainview) char tq[512]; - snprintf(tq, sizeof(tq), "DROP TABLE %s", misctable_name); - sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - - snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", misctable_name, misctable); + g_snprintf(tq, sizeof(tq), "DROP TABLE %s", misctable_name); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - gint panedPos = 0; /*gtk_paned_get_position(GTK_PANED(mainview->hpaned));*/ - - snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('leftPanedPos', '%d');", misctable_name, panedPos); + g_snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", misctable_name, misctable); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); gint nndcc = 1; if (mainview->newnodedialog_createchild == FALSE) nndcc = 0; - snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('newNodeDlgCreateChild', '%d');", misctable_name, nndcc); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('newNodeDlgCreateChild', '%d');", misctable_name, nndcc); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('viewFlags', '%d');", misctable_name, mainview->viewflags); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('viewFlags', '%d');", misctable_name, mainview->viewflags); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); nodeData *node = getSelectedNode(mainview); if (node) { - snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('selectedNode', '%d');", misctable_name, node->sql3id); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('selectedNode', '%d');", misctable_name, node->sql3id); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); } @@ -3743,7 +3730,7 @@ void write_buffer_to_file(MainView * mainview) { bsize=sketchwidget_get_brushsize(mainview->sk); } - snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('brushSize', '%d');", misctable_name, bsize); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('brushSize', '%d');", misctable_name, bsize); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); if (mainview->current_color == NULL) { @@ -3755,18 +3742,18 @@ void write_buffer_to_file(MainView * mainview) ((mainview->current_color->blue) >> 8); /* fprintf(stderr, "BRUSHCOLOR is %d (%d,%d,%d)\n", bcol, col->red, col->green, col->blue);*/ - snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('brushColor', '%lu');", misctable_name, bcol); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('brushColor', '%lu');", misctable_name, bcol); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('dataVersion', '%d');", misctable_name, datatableversion); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('dataVersion', '%d');", misctable_name, datatableversion); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('checklistVersion', '%d');", misctable_name, checklisttableversion); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s VALUES('checklistVersion', '%d');", misctable_name, checklisttableversion); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "DROP TABLE %s", datatable_backupname); + g_snprintf(tq, sizeof(tq), "DROP TABLE %s", datatable_backupname); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", datatable_backupname, datatable); + g_snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", datatable_backupname, datatable); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR creating backup table!\n"); @@ -3775,7 +3762,7 @@ void write_buffer_to_file(MainView * mainview) busy_leave(mainview); return; } - snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", datatable_backupname, datatable_name); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", datatable_backupname, datatable_name); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR backing up table!\n"); @@ -3784,19 +3771,19 @@ void write_buffer_to_file(MainView * mainview) busy_leave(mainview); return; } - snprintf(tq, sizeof(tq), "DELETE FROM %s", datatable_name); + g_snprintf(tq, sizeof(tq), "DELETE FROM %s", datatable_name); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", datatable_name, datatable_tmpname); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", datatable_name, datatable_tmpname); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR saving table!\n"); hildon_banner_show_information(GTK_WIDGET(mainview->data->main_view), NULL, "Error 3"); - snprintf(tq, sizeof(tq), "DELETE FROM %s", datatable_name); + g_snprintf(tq, sizeof(tq), "DELETE FROM %s", datatable_name); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", datatable_name, datatable_backupname); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", datatable_name, datatable_backupname); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR restoring backup! data lost!\n"); @@ -3806,13 +3793,13 @@ void write_buffer_to_file(MainView * mainview) return; } - snprintf(tq, sizeof(tq), "DROP TABLE %s", datatable_backupname); + g_snprintf(tq, sizeof(tq), "DROP TABLE %s", datatable_backupname); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); /*checklist*/ - snprintf(tq, sizeof(tq), "DROP TABLE %s", checklisttable_backupname); + g_snprintf(tq, sizeof(tq), "DROP TABLE %s", checklisttable_backupname); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", checklisttable_backupname, checklisttable); + g_snprintf(tq, sizeof(tq), "CREATE TABLE %s%s", checklisttable_backupname, checklisttable); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR creating backup table! (checklist)\n"); @@ -3822,7 +3809,7 @@ void write_buffer_to_file(MainView * mainview) return; } - snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", checklisttable_backupname, checklisttable_name); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", checklisttable_backupname, checklisttable_name); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR backing up table! (checklist)\n"); @@ -3831,19 +3818,19 @@ void write_buffer_to_file(MainView * mainview) busy_leave(mainview); return; } - snprintf(tq, sizeof(tq), "DELETE FROM %s", checklisttable_name); + g_snprintf(tq, sizeof(tq), "DELETE FROM %s", checklisttable_name); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", checklisttable_name, checklisttable_tmpname); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", checklisttable_name, checklisttable_tmpname); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR saving table! (checklist)\n"); hildon_banner_show_information(GTK_WIDGET(mainview->data->main_view), NULL, "Error 6"); - snprintf(tq, sizeof(tq), "DELETE FROM %s", checklisttable_name); + g_snprintf(tq, sizeof(tq), "DELETE FROM %s", checklisttable_name); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); - snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", checklisttable_name, checklisttable_backupname); + g_snprintf(tq, sizeof(tq), "INSERT INTO %s SELECT * FROM %s", checklisttable_name, checklisttable_backupname); if (sqlite3_exec(mainview->db, tq, NULL, NULL, NULL) != 0) { fprintf(stderr, "ERROR restoring backup! data lost! (checklist)\n"); @@ -3852,7 +3839,7 @@ void write_buffer_to_file(MainView * mainview) return; } - snprintf(tq, sizeof(tq), "DROP TABLE %s", checklisttable_backupname); + g_snprintf(tq, sizeof(tq), "DROP TABLE %s", checklisttable_backupname); sqlite3_exec(mainview->db, tq, NULL, NULL, NULL); mainview->file_edited = FALSE; @@ -3863,7 +3850,7 @@ void write_buffer_to_file(MainView * mainview) void callback_checklist_toggled(GtkCellRendererToggle *cell_renderer, gchar *path, GtkWidget *source) { - gtk_object_set_data(GTK_OBJECT(source), "edited", TRUE); + gtk_object_set_data(GTK_OBJECT(source), "edited", GINT_TO_POINTER(TRUE)); GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(source)); @@ -3883,7 +3870,7 @@ void callback_checklist_toggled(GtkCellRendererToggle *cell_renderer, gchar *pat void callback_checklist_edited(GtkCellRendererToggle *cell_renderer, gchar *arg1, gchar *arg2, GtkWidget *source) { -gtk_object_set_data(GTK_OBJECT(source), "edited", TRUE); +gtk_object_set_data(GTK_OBJECT(source), "edited", GINT_TO_POINTER(TRUE)); GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(source)); @@ -3962,7 +3949,7 @@ void callback_checklist_paste(MainView *mainview) gtk_list_store_set(GTK_LIST_STORE(model), &toplevel, CHECKNODE_CHECKED, FALSE, CHECKNODE_TEXT, entries[i], -1); } - gtk_object_set_data(GTK_OBJECT(mainview->listview), "edited", TRUE); + gtk_object_set_data(GTK_OBJECT(mainview->listview), "edited", GINT_TO_POINTER(TRUE)); g_free(pasted_text); g_strfreev(entries); } @@ -3983,7 +3970,7 @@ if (path) gtk_tree_path_free(path); } -gtk_object_set_data(GTK_OBJECT(mainview->listview), "edited", TRUE); +gtk_object_set_data(GTK_OBJECT(mainview->listview), "edited", GINT_TO_POINTER(TRUE)); } void callback_checklist_delete(GtkAction *action, MainView *mainview) @@ -4043,16 +4030,16 @@ g_list_free(rowrefs); gtk_tree_view_set_model(GTK_TREE_VIEW(mainview->listview), model); g_object_unref(model); -gtk_object_set_data(GTK_OBJECT(mainview->listview), "edited", TRUE); +gtk_object_set_data(GTK_OBJECT(mainview->listview), "edited", GINT_TO_POINTER(TRUE)); } /* Ask the user for confirmation of a specific action */ gboolean show_confirmation(MainView* mainview, gchar* question) { - GtkDialog* dialog = GTK_WIDGET(hildon_note_new_confirmation( - mainview->data->main_view, question)); + GtkDialog* dialog = GTK_DIALOG(hildon_note_new_confirmation( + GTK_WINDOW(mainview->data->main_view), question)); - gint response = gtk_dialog_run(GTK_DIALOG(dialog)); + gint response = gtk_dialog_run(dialog); gtk_widget_destroy(GTK_WIDGET(dialog)); return (response == GTK_RESPONSE_OK); -- 2.11.4.GIT