From 0611badf297999cd6d4a9d0009bab84b8dce96f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20T=2E=20Colombini=20G=C3=B3mez?=
 <atcolombini@gmail.com>
Date: Thu, 19 Dec 2013 15:47:57 +0100
Subject: [PATCH] =?UTF-8?q?Ahora=20se=20puede=20compilar=20y=20ejecutar=20?=
 =?UTF-8?q?con=20la=20librer=C3=ADa=20hedera=20desinstalada?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configure.ac     | 46 +++++++++++++++++++++++++++++++++++++---------
 data/users.glade | 38 +++++---------------------------------
 src/Makefile.am  |  6 ++----
 3 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/configure.ac b/configure.ac
index 242a22f..aea1f7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
 AM_XGETTEXT_OPTION([-k_ -kQ_:1g -kN_ -kC_:1c,2 -kNC_:1c,2])
 
-dnl Check for debug mode.
 AC_MSG_CHECKING([whether to build with debug information...])
 AC_ARG_ENABLE([debug],
 	[AS_HELP_STRING([--enable-debug],
@@ -43,11 +42,10 @@ else
 	VALAFLAGS=
 fi
 
-dnl Check if the C warnings must be shown
 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 (def=no)])],
+		[Enable C warnings to be shown [default = no]])],
 	[C_WARNINGS="$enableval"],
 	[C_WARNINGS=no])
 AC_MSG_RESULT([$C_WARNINGS])
@@ -63,13 +61,43 @@ AC_SUBST([VALAFLAGS])
 
 LT_INIT
 
-PKG_CHECK_VAR([account_libdir], [hedera], [modulelibdir])
-PKG_CHECK_VAR([account_datadir], [hedera], [moduledatadir])
-PKG_CHECK_VAR([querydir], [hedera], [modulequerydir])
+AC_ARG_VAR([UNINSTALLED_DIR], [the directory of the uninstalled hedera project])
+dnl This requires the user to specify the UNINSTALLED_DIR variable, with the 
+dnl path to the directory of the unsinstalled hedera project.
+AC_MSG_CHECKING([use uninstalled Hedera])
+AC_ARG_ENABLE([uninstalled],
+	[AS_HELP_STRING([--enable-uninstalled],
+		[Enable the use of uninstalled Hedera located in the UNINSTALLED_DIR
+		directory, which must be defined [default = no]])],
+	[UNINSTALLED="$enableval"],
+	[UNINSTALLED=no])
+AC_MSG_RESULT([$UNINSTALLED])
 
-PKG_CHECK_MODULES(ACCOUNT, [hedera ])
-# Check if vala bindigns are installed and usable
-VALA_CHECK_PACKAGES([hedera ])
+PKG_PROG_PKG_CONFIG
+
+if test x"$UNINSTALLED" = x"yes"; then
+	PKG_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 '
+
+	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 '
+
+	PKG_CHECK_VAR([account_libdir], [hedera], [modulelibdir])
+	PKG_CHECK_VAR([account_datadir], [hedera], [moduledatadir])
+	PKG_CHECK_VAR([querydir], [hedera], [modulequerydir])
+fi
 
 AC_OUTPUT([
 	Makefile
diff --git a/data/users.glade b/data/users.glade
index e381212..6dea5ac 100644
--- a/data/users.glade
+++ b/data/users.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires vn 0.0 -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="VnBatch" id="iterators">
     <child>
       <object class="VnIterator" id="account">
@@ -252,7 +252,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="use_stock">True</property>
-                    <signal name="clicked" handler="vn_user_account_on_set_password_clicked" swapped="no"/>
+                    <signal name="clicked" handler="vn_users_on_set_password_clicked" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -525,7 +525,7 @@
             <property name="can_focus">False</property>
             <property name="border_width">15</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">20</property>
+            <property name="spacing">58</property>
             <child>
               <object class="GtkGrid" id="grid4">
                 <property name="visible">True</property>
@@ -577,20 +577,6 @@
                     <property name="height">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="label18">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Call group:</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="VnEntry" id="entry4">
                     <property name="width_request">170</property>
@@ -634,20 +620,6 @@
                     <property name="height">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="VnSpin" id="spin3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="iterator">sip</property>
-                    <property name="column_name">callgroup</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -704,7 +676,7 @@ FROM `user` u
     </child>
     <child>
       <object class="DbModel" id="sip-model">
-        <property name="sql">SELECT user_id, extension, secret, callerid, callgroup
+        <property name="sql">SELECT user_id, extension, secret, callerid
 FROM account_sip
 WHERE #p</property>
       </object>
@@ -751,7 +723,7 @@ WHERE #p</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <signal name="delete-event" handler="gtk_true" swapped="no"/>
-    <signal name="response" handler="vn_user_account_on_dialog_response" swapped="no"/>
+    <signal name="response" handler="vn_users_on_dialog_response" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox2">
         <property name="can_focus">False</property>
diff --git a/src/Makefile.am b/src/Makefile.am
index db5d1c9..24f5c4d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,12 +21,10 @@ libaccount_la_CPPFLAGS = \
 	$(ACCOUNT_CFLAGS)
 
 libaccount_la_CFLAGS = $(CFLAGS)
+libaccount_la_VALAFLAGS = $(VALAFLAGS)
 
 #account_querydir = $(querydir)/account
-#account_query_DATA = $(top_srcdir)/sql/account/queries.sql 
-
-libaccount_la_VALAFLAGS = --pkg hedera \
-	$(VALAFLAGS)
+#account_query_DATA = $(top_srcdir)/sql/account/queries.sql
 
 uninstall-local:
 	rm -f $(DESTDIR)$(libdir)/hedera/module/libaccount.so