From 81a7bb10085afe60ed484b31f1ced2c43b5e811c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20T=2E=20Colombini=20G=C3=B3mez?=
 <atcolombini@gmail.com>
Date: Wed, 9 Jul 2014 09:28:23 +0200
Subject: [PATCH] =?UTF-8?q?Se=20ha=20modificado=20el=20archivo=20de=20desc?=
 =?UTF-8?q?ripci=C3=B3n=20del=20m=C3=B3dulo=20y=20del=20men=C3=BA=20para?=
 =?UTF-8?q?=20adaptarlo=20al=20comportamiento=20actual=20de=20hedera.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/Makefile.am |  2 +-
 data/account.xml | 14 +++++++-------
 data/email.glade | 12 +++++++++---
 data/users.glade |  2 +-
 debian/changelog |  2 +-
 po/POTFILES.in   |  2 +-
 src/account.vala | 20 +++++++++++++++++++-
 7 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index 494eb53..49e790c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
 
 account_data_DATA = \
-	account-menu.glade\
+	account-menu.xml\
 	account.xml \
 	users.glade \
 	email.glade
diff --git a/data/account.xml b/data/account.xml
index c3df325..11a8c3b 100644
--- a/data/account.xml
+++ b/data/account.xml
@@ -1,18 +1,18 @@
+<!DOCTYPE hedera-module>
 <module>
 	<library translatable="yes" name="account">Accounts</library>
-	<action-group>
-		<action translatable="yes" name="action-menu-account">_Accounts</action>
-	</action-group>
 	<form-group>
 		<form
 			translatable="yes"
 			name="users"
-			icon="x-office-address-book"
-			action-name="open-users">Users</form>
+			icon="x-office-address-book">
+			Users
+		</form>
 		<form
 			translatable="yes"
 			name="email"
-			icon="mail-mark-unread"
-			action-name="open-email">E-Mail</form>
+			icon="mail-mark-unread">
+			E-Mail
+		</form>
 	</form-group>
 </module>
diff --git a/data/email.glade b/data/email.glade
index eca3850..2f5ea67 100644
--- a/data/email.glade
+++ b/data/email.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk+" version="3.12"/>
   <requires lib="vn" version="1.0"/>
   <object class="VnBatch" id="models">
     <child>
@@ -78,6 +78,9 @@
                             <property name="title" translatable="yes">Alias</property>
                             <property name="column_name">alias</property>
                             <property name="editable">True</property>
+                            <child internal-child="cell">
+                              <object class="GtkCellRendererText" id="column-entry-cell1"/>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -94,7 +97,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="iterator">alias</property>
-                    <property name="show_flags">VN_HANDLER_SHOW_SAVE | VN_HANDLER_SHOW_REMOVE | VN_HANDLER_SHOW_ADD</property>
+                    <property name="show_flags">VN_HANDLER_SHOW_REFRESH | VN_HANDLER_SHOW_SAVE | VN_HANDLER_SHOW_REMOVE | VN_HANDLER_SHOW_ADD</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -132,9 +135,12 @@
                           <object class="VnColumnCombo" id="column-child">
                             <property name="sizing">autosize</property>
                             <property name="title" translatable="yes">Children</property>
-                            <property name="model">model-alias</property>
                             <property name="column_name">child</property>
                             <property name="editable">True</property>
+                            <property name="model">model-alias</property>
+                            <child internal-child="cell">
+                              <object class="GtkCellRendererCombo" id="column-combo-cell1"/>
+                            </child>
                           </object>
                         </child>
                       </object>
diff --git a/data/users.glade b/data/users.glade
index 95c28eb..d813a58 100644
--- a/data/users.glade
+++ b/data/users.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk+" version="3.12"/>
   <requires lib="vn" version="1.0"/>
   <object class="VnBatch" id="models">
     <child>
diff --git a/debian/changelog b/debian/changelog
index 65bc968..e13492a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-account (1.0-5) UNRELEASED; urgency=low
+hedera-account (1.0-6) UNRELEASED; urgency=low
 
   * Initial Release.
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3e803a3..e23b32c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 
 src/account.vala
 [type: gettext/glade]data/account.xml
-data/account-menu.glade
+[type: gettext/glade]data/account-menu.xml
 
 src/users.vala
 data/users.glade
diff --git a/src/account.vala b/src/account.vala
index 890ae97..f21e8e9 100644
--- a/src/account.vala
+++ b/src/account.vala
@@ -20,11 +20,29 @@ public class Vn.Management : Vn.Mod
 {
 	public Management ()
 	{
-		
 	}
 
 	// Main routine of the Management Module.
 	public override void activate ()
 	{
 	}
+
+	// Actions
+
+	const GLib.ActionEntry[] actions =
+	{
+		 {"open-form", open_form}
+		,{"test-set-action", test_set_action}
+	};
+
+	void open_form (GLib.SimpleAction a, GLib.Variant? p)
+	{}
+
+	void test_set_action (GLib.SimpleAction a, GLib.Variant? p)
+	{}
+
+	public override unowned GLib.ActionEntry[] get_actions ()
+	{
+		return actions;
+	}
 }