diff --git a/configure.ac b/configure.ac
index e16c005..36595a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_PROG_CC
dnl Check for vala.
dnl You should change the version shown here manually to match with yours.
-AM_PROG_VALAC([0.20.0])
+AM_PROG_VALAC([0.24])
dnl Internationalization
IT_PROG_INTLTOOL([0.35.0])
@@ -29,7 +29,7 @@ AM_XGETTEXT_OPTION([-k_ -kQ_:1g -kN_ -kC_:1c,2 -kNC_:1c,2])
AC_MSG_CHECKING([whether to build with debug information...])
AC_ARG_ENABLE([debug],
[AS_HELP_STRING([--enable-debug],
- [Enable debug data generation (def=no)])],
+ [Enable debug data generation (default = no)])],
[ENABLE_DEBUG="$enableval"],
[ENABLE_DEBUG=no])
AC_MSG_RESULT([$ENABLE_DEBUG])
@@ -45,7 +45,7 @@ fi
AC_MSG_CHECKING([whether C warnings will be shown...])
AC_ARG_ENABLE([c-warnings],
[AS_HELP_STRING([--enable-c-warnings],
- [Enable C warnings to be shown [default = no]])],
+ [Enable C warnings to be shown (default = no)])],
[C_WARNINGS="$enableval"],
[C_WARNINGS=no])
AC_MSG_RESULT([$C_WARNINGS])
@@ -61,30 +61,23 @@ AC_SUBST([VALAFLAGS])
LT_INIT
-dnl Path to the directory of the unsinstalled hedera project.
AC_ARG_VAR([UNINSTALLED_DIR], [the directory of the uninstalled hedera project])
: ${UNINSTALLED_DIR=''}
PKG_PROG_PKG_CONFIG
if test $UNINSTALLED_DIR; then
- PKG_CHECK_MODULES(ACCOUNT, [gtk+-3.0])
+ VALA_CHECK_MODULES(ACCOUNT, [gtk+-3.0])
ACCOUNT_CFLAGS+=-I$UNINSTALLED_DIR
ACCOUNT_LIBS+=$UNINSTALLED_DIR/build/main/libhedera.la
-
- VALA_CHECK_PACKAGES([gtk+-3.0])
- VALAFLAGS+='--pkg gtk+-3.0 \
- --pkg gvn --pkg sql --pkg db --pkg vn \
- --vapidir $(UNINSTALLED_DIR)/build/vapi '
+ VALAFLAGS+="$ACCOUNT_VALAFLAGS --pkg gvn --pkg sql --pkg db --pkg vn --vapidir $UNINSTALLED_DIR/build/vapi "
AC_SUBST(account_libdir, $libdir/hedera/module)
AC_SUBST(account_datadir, $datadir/hedera/module)
AC_SUBST(querydir, $account_datadir/sql)
else
- PKG_CHECK_MODULES(ACCOUNT, [hedera])
-
- VALA_CHECK_PACKAGES([hedera])
- VALAFLAGS+='--pkg hedera '
+ VALA_CHECK_MODULES(ACCOUNT, [hedera])
+ VALAFLAGS+=$ACCOUNT_VALAFLAGS
PKG_CHECK_VAR([account_libdir], [hedera], [modulelibdir])
PKG_CHECK_VAR([account_datadir], [hedera], [moduledatadir])
@@ -96,3 +89,4 @@ AC_OUTPUT([
src/Makefile
data/Makefile
po/Makefile.in])
+
diff --git a/data/Makefile.am b/data/Makefile.am
index 8683a25..494eb53 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,7 @@
account_data_DATA = \
+ account-menu.glade\
account.xml \
- account.ui \
users.glade \
email.glade
diff --git a/data/account-menu.glade b/data/account-menu.glade
new file mode 100644
index 0000000..f84aa18
--- /dev/null
+++ b/data/account-menu.glade
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/data/account.ui b/data/account.ui
deleted file mode 100644
index 6eb9fa5..0000000
--- a/data/account.ui
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
diff --git a/data/account.xml b/data/account.xml
index dbd0845..c3df325 100644
--- a/data/account.xml
+++ b/data/account.xml
@@ -8,13 +8,11 @@
translatable="yes"
name="users"
icon="x-office-address-book"
- action-name="open-users"
- accel="F2">Users
+ action-name="open-users">Users
+ action-name="open-email">E-Mail
diff --git a/data/email.glade b/data/email.glade
index c4d7bcf..eca3850 100644
--- a/data/email.glade
+++ b/data/email.glade
@@ -1,7 +1,25 @@
+
-
-
+
+
+
-
diff --git a/data/users.glade b/data/users.glade
index ee86f63..95c28eb 100644
--- a/data/users.glade
+++ b/data/users.glade
@@ -1,13 +1,72 @@
+
-
-
+
+
+
-
-
-
@@ -525,15 +347,13 @@ FROM `user` u
1
1
- 1
- 1
@@ -547,8 +367,6 @@ FROM `user` u
1
0
- 1
- 1
@@ -562,8 +380,6 @@ FROM `user` u
0
0
- 1
- 1
@@ -576,8 +392,6 @@ FROM `user` u
0
1
- 1
- 1
@@ -590,8 +404,6 @@ FROM `user` u
1
2
- 1
- 1
@@ -604,8 +416,6 @@ FROM `user` u
1
3
- 1
- 1
@@ -618,8 +428,6 @@ FROM `user` u
0
2
- 1
- 1
@@ -632,8 +440,6 @@ FROM `user` u
0
3
- 1
- 1
@@ -647,7 +453,6 @@ FROM `user` u
@@ -717,8 +522,6 @@ FROM `user` u
@@ -771,8 +574,6 @@ FROM `user` u
0
0
- 1
- 1
@@ -785,8 +586,6 @@ FROM `user` u
0
1
- 1
- 1
@@ -799,8 +598,6 @@ FROM `user` u
0
2
- 1
- 1
@@ -814,8 +611,6 @@ FROM `user` u
1
0
- 1
- 1
@@ -828,8 +623,6 @@ FROM `user` u
1
1
- 1
- 1
@@ -842,8 +635,6 @@ FROM `user` u
1
2
- 1
- 1
@@ -857,9 +648,8 @@ FROM `user` u
False
@@ -892,4 +682,152 @@ FROM `user` u
+
diff --git a/debian/changelog b/debian/changelog
index 5aecfc0..65bc968 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-account (1.0-3) UNRELEASED; urgency=low
+hedera-account (1.0-5) UNRELEASED; urgency=low
* Initial Release.
diff --git a/debian/control b/debian/control
index 3cbd171..9189f54 100644
--- a/debian/control
+++ b/debian/control
@@ -11,3 +11,4 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, hedera
Description: Verdnatura management module
Verdnatura management module for Hedera. Includes:
* User account control panel.
+ * E-mail alias editor.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8cabe3a..3e803a3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,7 @@
src/account.vala
[type: gettext/glade]data/account.xml
+data/account-menu.glade
src/users.vala
data/users.glade
diff --git a/po/es.po b/po/es.po
index d960405..d2996ce 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-20 16:14+0100\n"
+"POT-Creation-Date: 2014-04-15 16:33+0200\n"
"PO-Revision-Date: 2013-09-24 12:09+0200\n"
"Last-Translator: Alejandro T. Colombini \n"
"Language-Team: none\n"
@@ -34,15 +34,23 @@ msgstr "Usuarios"
msgid "E-Mail"
msgstr "E-Mail"
-#: ../src/users.vala:87
+#: ../src/users.vala:32
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../src/users.vala:33
+msgid "Apply"
+msgstr "Aplicar"
+
+#: ../src/users.vala:70
msgid "The password can't be empty."
msgstr "La contraseña no puede estar vacía."
-#: ../src/users.vala:89
+#: ../src/users.vala:72
msgid "Passwords do not match."
msgstr "Las contraseñas no coinciden."
-#: ../src/users.vala:115
+#: ../src/users.vala:98
msgid "The password is too weak."
msgstr "La contraseña es demasiado débil."
diff --git a/src/Makefile.am b/src/Makefile.am
index ee1da0d..c5b2139 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,3 +28,4 @@ libaccount_la_VALAFLAGS = $(VALAFLAGS)
uninstall-local:
rm -f $(DESTDIR)$(libdir)/hedera/module/libaccount.so
+
diff --git a/src/users.vala b/src/users.vala
index 68a9843..823d4c3 100644
--- a/src/users.vala
+++ b/src/users.vala
@@ -25,12 +25,12 @@ public class Vn.Users : Vn.Form
public override void open (Gtk.Builder builder)
{
+ user_id = get ("user-id") as Gvn.Param;
password_entry = get ("password-entry") as Gtk.Entry;
repeat_password = get ("repeat-password") as Gtk.Entry;
-
password_dialog = get ("password-dialog") as Gtk.Dialog;
- password_dialog.add_button (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
- password_dialog.add_button (Gtk.Stock.APPLY, Gtk.ResponseType.ACCEPT);
+ password_dialog.add_button (_("Cancel"), Gtk.ResponseType.CANCEL);
+ password_dialog.add_button (_("Apply"), Gtk.ResponseType.ACCEPT);
}
public void reset_dialog (string? error)
@@ -64,19 +64,20 @@ public class Vn.Users : Vn.Form
{
if (response_id == Gtk.ResponseType.ACCEPT)
{
- string password = password_entry.text;
+ string pass = password_entry.text;
- if (password == "")
+ if (pass == "")
reset_dialog (_("The password can't be empty."));
- else if (password != repeat_password.text)
+ else if (pass != repeat_password.text)
reset_dialog (_("Passwords do not match."));
else
{
- var query = new Sql.String ("SELECT user_set_password (#p, #p)");
- query.add_param (user_id);
- query.add_value (typeof (string), password);
+ var batch = new Sql.Batch ();
+ batch.add_from_param ("user", user_id);
+ batch.add_from_value ("pass", typeof (string), pass);
- conn.query_with_stmt_async (query, on_password_changed);
+ string query = "SELECT user_set_password (#user, #pass)";
+ conn.query_async (query, batch, on_password_changed);
}
}
else
@@ -88,7 +89,7 @@ public class Vn.Users : Vn.Form
{
GLib.Value val;
- try
+ try
{
request.fetch_value (out val);