Aggiunte le librerie necessarie.

diff --git a/.anjuta/default.profile b/.anjuta/default.profile
index 054294fcbb68d97966d266d4438b7068a4353018..cf999f6f53c54f5872e4c195afb9456873a0ff64 100644 (file)
--- a/.anjuta/default.profile
+++ b/.anjuta/default.profile
@@ -1,5 +1,15 @@
 <?xml version="1.0"?>
 <anjuta>
+    <plugin name="Terminal" mandatory="no">
+        <require group="Anjuta Plugin"
+                 attribute="Location"
+                 value="anjuta-terminal:TerminalPlugin"/>
+    </plugin>
+    <plugin name="API Help" mandatory="no">
+        <require group="Anjuta Plugin"
+                 attribute="Location"
+                 value="anjuta-devhelp:AnjutaDevhelp"/>
+    </plugin>
     <plugin name="Git" mandatory="no">
         <require group="Anjuta Plugin"
                  attribute="Location"

diff --git a/.anjuta/session/anjuta.session b/.anjuta/session/anjuta.session
index e7d89dcaf9e61854bd328bcf5cc0e6dea0f93ab7..6eb8263483599a4228593d101a51910eaf3d76e6 100644 (file)
--- a/.anjuta/session/anjuta.session
+++ b/.anjuta/session/anjuta.session
@@ -2,16 +2,16 @@
 Maximized=1
 Geometry=1024x687+0+24
 
+[Project Manager]
+Shortcut=messi//src//messi
+Expand=messi%%%messi
+
 [File Loader]
-Files=../../src/main.c#19%%%../../configure.ac#6
+Files=../../src/main.c#2%%%../../src/commons.h#66%%%../../configure.ac#30%%%../../src/commons.c#21
 
 [Document Manager]
 bookmarks=<?xml version="1.0" encoding="UTF-8"?>\n<bookmarks/>\n
 
-[Project Manager]
-Shortcut=messi//src//messi
-Expand=messi
-
 [Execution]
 Run in terminal=2
 Working directories=../../../messi

diff --git a/.anjuta/session/dock-layout.xml b/.anjuta/session/dock-layout.xml
index 85247fcaf1103f7bf76f5ee087f35c5ec75d4e80..9989967d490fd759497fb011cd5312639f813867 100644 (file)
--- a/.anjuta/session/dock-layout.xml
+++ b/.anjuta/session/dock-layout.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0"?>
-<dock-layout>
-       
-<layout name="__default__"><dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0"><paned orientation="horizontal" locked="no" position="266"><notebook orientation="vertical" locked="no" page="0"><item name="AnjutaFileManager" orientation="vertical" locked="no"/><item name="AnjutaProjectManager" orientation="vertical" locked="no"/><item name="AnjutaSymbolDB" orientation="vertical" locked="no"/></notebook><item name="AnjutaDocumentManager" orientation="vertical" locked="no"/></paned></dock></layout></dock-layout>
+<dock-layout><layout name="__default__"><dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0"><paned orientation="horizontal" locked="no" position="277"><notebook orientation="vertical" locked="no" page="0"><item name="AnjutaFileManager" orientation="vertical" locked="no"/><item name="AnjutaProjectManager" orientation="vertical" locked="no"/><item name="AnjutaSymbolDB" orientation="vertical" locked="no"/><item name="AnjutaDevhelpIndex" orientation="vertical" locked="no"/></notebook><notebook orientation="vertical" locked="no" page="0"><item name="AnjutaDocumentManager" orientation="vertical" locked="no"/><item name="AnjutaDevhelpDisplay" orientation="vertical" locked="no"/><item name="AnjutaTerminal" orientation="vertical" locked="no"/></notebook></paned></dock></layout></dock-layout>

diff --git a/.anjuta_sym_db.db b/.anjuta_sym_db.db
index 80bd4c91bc55c02b946d42d629e26c8941108ae0..c8c1ba921b26ec541169bce0a2106d985fca2b6d 100644 (file)
Binary files a/.anjuta_sym_db.db and b/.anjuta_sym_db.db differ

diff --git a/autogen.sh b/autogen.sh
index 68983f8ec30fb9f2a834d154a0b1bffdd87b8ec1..f6026b6ae88abfca7a57a197bfcc48a1e9c3b8bc 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="opengov"
+PKG_NAME="messi"
 
 (test -f $srcdir/configure.ac \
   && test -d $srcdir/src \

diff --git a/configure.ac b/configure.ac
index 1822f631a05ce3e0764e18cadc5713926e431e02..81452206e5808182f3094b9d0a40662c87ca22f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,15 @@ AC_PROG_CC
 
 # Checks for libraries.
 PKG_CHECK_MODULES([MESSI], [gtk+-2.0 >= 2.12.0
-                          libgtkform >= 0.1.0])
+                          libgtkform >= 0.4.0
+                          libgtkformui >= 0.4.0
+                          libaute >= 0.0.2
+                          libautoz >= 0.0.1
+                          libautozgui >= 0.0.1
+                          libsolipa >= 0.3.1
+                          liborganigramma >= 0.0.1
+                          libzakaudit >= 0.0.2
+                          libreptool >= 0.2.2])
 
 AC_SUBST(MESSI_CFLAGS)
 AC_SUBST(MESSI_LIBS)

diff --git a/data/messi/form/Makefile.am b/data/messi/form/Makefile.am
index e4a6cf1141eedb20f3139b838573a002215ec3fc..8d770f479248a420e1cf3c29e049c110d1aee7a6 100644 (file)
--- a/data/messi/form/Makefile.am
+++ b/data/messi/form/Makefile.am
@@ -1,4 +1,4 @@
-formdir = $(datadir)/messi/form
+formdir = $(datadir)/$(PACKAGE)/form
 
 form_DATA = 
 

diff --git a/data/messi/gui/Makefile.am b/data/messi/gui/Makefile.am
index ca67b3d707317a5be282a2e0ddf5dc29820df9dc..1ecdc0548b748a558af36d133926d9a28941bf9e 100644 (file)
--- a/data/messi/gui/Makefile.am
+++ b/data/messi/gui/Makefile.am
@@ -1,4 +1,4 @@
-guidir = $(datadir)/messi/gui
+guidir = $(datadir)/$(PACKAGE)/gui
 
 gui_DATA = messi.gui
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 222a59a37085cce04a7491385fc6c7d4c9e3af1b..c44443c2ec1caca3528ce42dc7c93fedae83ba31 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-guidir = $(datadir)/messi/gui
-formdir = $(datadir)/messi/form
+guidir = $(datadir)/$(PACKAGE)/gui
+formdir = $(datadir)/$(PACKAGE)/form
 
 AM_CPPFLAGS = $(MESSI_CFLAGS) \
               -DGUIDIR=\""$(guidir)"\" \
@@ -8,7 +8,17 @@ AM_CPPFLAGS = $(MESSI_CFLAGS) \
 LIBS = $(MESSI_LIBS) \
        -export-dynamic
 
+if PLATFORM_WIN32
+AM_CPPFLAGS += -I/programmi/PostgreSQL/8.4/include
+LIBS += -L/programmi/PostgreSQL/8.4/lib -lpq
+else
+AM_CPPFLAGS += -I`pg_config --includedir`
+LIBS += -L`pg_config --libdir` -lpq
+endif
+
 bin_PROGRAMS = messi
 
 messi_SOURCES = \
+              commons.c \
+              commons.h \
               main.c

diff --git a/src/commons.c b/src/commons.c
new file mode 100644 (file)
index 0000000..aa97a6e
--- /dev/null
+++ b/src/commons.c
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2013 Andrea Zagli <azagli@libero.it>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#include "commons.h"
+

diff --git a/src/commons.h b/src/commons.h
new file mode 100644 (file)
index 0000000..b5b6114
--- /dev/null
+++ b/src/commons.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2013 Andrea Zagli <azagli@libero.it>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+       #include <config.h>
+#endif
+
+#ifndef __COMMONS_H__
+#define __COMMONS_H__
+
+#include <libpq-fe.h>
+
+#include <gtk/gtk.h>
+
+#include <libgdaex/libgdaex.h>
+#include <libautoz/autoz.h>
+#include <libautoz/role_interface.h>
+#include <libsolipa/libsolipa.h>
+
+#include <libterritorio/commons.h>
+#include <liborganigramma/commons.h>
+#include <libautozgui/commons.h>
+
+typedef struct
+       {
+               gchar *guidir;
+               gchar *formdir;
+
+               GtkBuilder *gtkbuilder;
+
+               GdaEx *gdaex;
+               GdaEx *gdaex_autozgui;
+
+               PGconn *pgcon;
+
+               const gchar *guifile;
+
+               const gchar *utente;
+               Autoz *autoz;
+               AutozIRole *role_utente;
+
+               Solipa *solipa;
+
+               TerritorioCommons *territorio_commons;
+               OrganigrammaCommons *organigramma_commons;
+               AutozGuiCommons *autozgui_commons;
+
+               guint pr_cod_prat;
+       } Commons;
+
+
+#endif /* __COMMONS_H__ */

diff --git a/src/main.c b/src/main.c
index 126f024c55e87694c4b23c4c6afeca31dc6c4db1..0a24a919e8b271d6ad8555c88d49981559aff6aa 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-2013 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by