From ae12703ae9122e623ee5596c27d2a6e659e424b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20T=2E=20Colombini=20G=C3=B3mez?= Date: Tue, 28 Oct 2014 13:15:20 +0100 Subject: [PATCH] =?UTF-8?q?Vala,=20Documentaci=C3=B3n,=20VnForm,=20debian?= =?UTF-8?q?=20=09-=20Arreglados=20algunos=20bugs=20del=20binding=20de=20Va?= =?UTF-8?q?la=20=09-=20A=C3=B1adidos=20DbRow=20y=20DbResult=20a=20la=20doc?= =?UTF-8?q?umentaci=C3=B3n=20=09-=20Cambios=20en=20la=20configuraci=C3=B3n?= =?UTF-8?q?=20del=20paquete=20de=20Debian=20para=20a=C3=B1adir=20el=20plug?= =?UTF-8?q?in=20de=20SQLite=20a=20la=20instalaci=C3=B3n=20correctamente=20?= =?UTF-8?q?=09-=20Ahora=20VnForm=20comprueba=20que=20la=20interfaz=20gr?= =?UTF-8?q?=C3=A1fica=20sea=20la=20esperada=20(y=20avisa=20en=20caso=20con?= =?UTF-8?q?trario)=20=09-=20Aumentado=20el=20n=C3=BAmero=20de=20versi?= =?UTF-8?q?=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/db-conn.c | 1 + db/db-result.c | 2 ++ db/db-row.c | 2 +- db/db-row.h | 2 +- debian/changelog | 2 +- debian/control | 4 +-- debian/libhedera1.install | 1 + docs/reference/hedera/hedera-docs.sgml | 7 +++--- module/data/consulter.glade | 35 +++----------------------- module/src/vn-shelves.c | 2 +- vapi/Db-1.0.metadata | 2 -- vn/vn-form.c | 10 +++++++- vn/vn-grid.c | 3 +-- 13 files changed, 27 insertions(+), 46 deletions(-) diff --git a/db/db-conn.c b/db/db-conn.c index a44c741..b3e8085 100644 --- a/db/db-conn.c +++ b/db/db-conn.c @@ -612,6 +612,7 @@ DbRequest * db_conn_query_with_stmt (DbConn * obj, SqlStmt * stmt, SqlBatch * ba * db_conn_query_async: * @obj: the #DbConn * @sql: the SQL statement + * @batch: (allow-none): * @callback: * @user_data: * @notify: diff --git a/db/db-result.c b/db/db-result.c index 44aca24..5b5eee5 100644 --- a/db/db-result.c +++ b/db/db-result.c @@ -22,6 +22,8 @@ * @Short_description: * @Title: DbResult * @See_also: #DbResultSet + * + * #DbResult contains the result of a query. **/ G_DEFINE_BOXED_TYPE (DbResult, db_result, db_result_copy, db_result_free); diff --git a/db/db-row.c b/db/db-row.c index 3ae722f..f367d22 100644 --- a/db/db-row.c +++ b/db/db-row.c @@ -23,7 +23,7 @@ * @Title: DbRow * @See_also: #DbModel * - * #DbRow represents a row in a #DbModel. + * #DbRow represents a row in a #DbModel. It holds an array of #GValues **/ G_DEFINE_BOXED_TYPE (DbRow, db_row, db_row_copy, db_row_free); diff --git a/db/db-row.h b/db/db-row.h index f63dc8a..9572406 100644 --- a/db/db-row.h +++ b/db/db-row.h @@ -26,7 +26,7 @@ typedef struct _DbRow DbRow; /** * DbRow: - * @value: a #GValue + * @value:(array): a #GValue array * @position: the position of the row in the DbModel * @len: the number of fields * diff --git a/debian/changelog b/debian/changelog index fd1164e..d82f2c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libhedera (1.0-14) stable; urgency=low +libhedera (1.0-15) stable; urgency=low * Initial Release. diff --git a/debian/control b/debian/control index f2c2037..f57c134 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,11 @@ Priority: extra Maintainer: Alejandro T. Colombini Gómez Build-Depends: debhelper (>= 8.0.0), autotools-dev, libgtk-3-dev, gtk-doc-tools, valac, libgirepository1.0-dev, libgladeui-dev, libgdome2-dev, - libpq-dev, libmysqlclient-dev, ragel + libpq-dev, libmysqlclient-dev, libsqlite3-dev, ragel Standards-Version: 3.9.3 Section: libs Homepage: http://www.verdnatura.es -Vcs-Svn: svn://www.verdnatura.es/hedera/trunk +Vcs-Git: git://www.verdnatura.es/var/git/hedera Package: libhedera1 Section: libs diff --git a/debian/libhedera1.install b/debian/libhedera1.install index 960b117..7294ec3 100644 --- a/debian/libhedera1.install +++ b/debian/libhedera1.install @@ -4,6 +4,7 @@ usr/lib/x86_64-linux-gnu/hedera/libsql.so.* usr/lib/x86_64-linux-gnu/hedera/libdb.so.* usr/lib/x86_64-linux-gnu/hedera/plugin/pg/libdbpg.so usr/lib/x86_64-linux-gnu/hedera/plugin/mysql/libdbmysql.so +usr/lib/x86_64-linux-gnu/hedera/plugin/sqlite/libdbsqlite.so usr/lib/x86_64-linux-gnu/hedera/libvn.so.* usr/lib/x86_64-linux-gnu/hedera/libvnfield.so.* usr/lib/x86_64-linux-gnu/hedera/libvncolumn.so.* diff --git a/docs/reference/hedera/hedera-docs.sgml b/docs/reference/hedera/hedera-docs.sgml index a3c46ce..af8fb3c 100644 --- a/docs/reference/hedera/hedera-docs.sgml +++ b/docs/reference/hedera/hedera-docs.sgml @@ -99,10 +99,11 @@ - - - + + + + diff --git a/module/data/consulter.glade b/module/data/consulter.glade index 41bba2f..3c59b01 100644 --- a/module/data/consulter.glade +++ b/module/data/consulter.glade @@ -4,33 +4,6 @@ - - - - Send - Send - Send the current query - system-run - - - - - - - Clean - Clean - Clean the messages - edit-clear - - - - - - - _Consulter - - - @@ -71,7 +44,7 @@ True True Type or select a query - + @@ -90,12 +63,11 @@ Send - True - send True True True True + True @@ -106,12 +78,11 @@ Clean - True - clean True True True True + True diff --git a/module/src/vn-shelves.c b/module/src/vn-shelves.c index 5423171..b83d6c1 100644 --- a/module/src/vn-shelves.c +++ b/module/src/vn-shelves.c @@ -316,7 +316,7 @@ vn_shelves_show_message (VnShelves * self, const gchar * message) ,GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT ,GTK_MESSAGE_INFO ,GTK_BUTTONS_CLOSE - ,message + ,"%s", message ); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog)); diff --git a/vapi/Db-1.0.metadata b/vapi/Db-1.0.metadata index dab26ff..ae0f737 100644 --- a/vapi/Db-1.0.metadata +++ b/vapi/Db-1.0.metadata @@ -14,5 +14,3 @@ Plugin.render.object#parameter type="GLib.Object" Iter struct Iter.*#method skip - -Row struct diff --git a/vn/vn-form.c b/vn/vn-form.c index 2b1c401..3fe5f6b 100644 --- a/vn/vn-form.c +++ b/vn/vn-form.c @@ -42,6 +42,7 @@ void vn_form_open (VnForm * obj) if (gtk_builder_add_from_file (obj->builder, file, &err)) { + gpointer main_widget = NULL; const GList * m; VnSet * models = VN_SET (gtk_builder_get_object (obj->builder, "models")); @@ -52,7 +53,14 @@ void vn_form_open (VnForm * obj) gtk_builder_connect_signals (obj->builder, obj); VN_FORM_GET_CLASS (obj)->open (obj); - gtk_container_add (GTK_CONTAINER (obj), vn_form_get (obj, "main")); + main_widget = vn_form_get (obj, "main"); + + if (main_widget && GTK_IS_WIDGET (main_widget)) + gtk_container_add (GTK_CONTAINER (obj), main_widget); + else + g_warning ("VnForm: form UI files must have a toplevel widget " + "with id 'main', but %s does not.", file); + gtk_widget_show_all (GTK_WIDGET (obj)); // Loading menu diff --git a/vn/vn-grid.c b/vn/vn-grid.c index 904fcfd..f20f05c 100644 --- a/vn/vn-grid.c +++ b/vn/vn-grid.c @@ -582,8 +582,7 @@ static void vn_grid_finalize (VnGrid * self) GList * n; for (n = self->params; n; n = n->next) - g_object_weak_unref (n->data, - (GWeakNotify) vn_grid_unref_param, self); + g_object_weak_unref (n->data, (GWeakNotify) vn_grid_unref_param, self); g_list_free (self->params);