Initial import.

diff --git a/configure.ac b/configure.ac
index 39d3acffbc298f4b709a4fe7de65e3843e069453..b3cb8bc2cba8aab3ba57f971cb1b3f2bba0fa017 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,6 @@ AC_CONFIG_FILES([
        src/Makefile
        data/Makefile
        data/audit-gui/Makefile
-       data/audit-gui/form/Makefile
        data/audit-gui/gui/Makefile
 ])
 AC_OUTPUT

diff --git a/src/commons.h b/src/commons.h
index bbd47b877d27d13d75b03c279a2fdf99a1940cf3..cc395df7ffe3b3f5477213b777194cfa80cdf79a 100644 (file)
--- a/src/commons.h
+++ b/src/commons.h
@@ -29,14 +29,12 @@
 
 typedef struct
        {
-               gchar *guidir;
-               gchar *formdir;
+               const gchar *guidir;
+               const gchar *guifile;
 
                GtkBuilder *gtkbuilder;
 
                GdaConnection *gdacon;
-
-               const gchar *guifile;
        } Commons;
 
 #endif /* __COMMONS_H__ */

diff --git a/src/main.c b/src/main.c
index 35e4d31baa1e47948effce16d60e698da5deef46..8c1efe5d297941c19beb66b2afd4e21be187bf8e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -22,7 +22,6 @@
 
 #include <gtk/gtk.h>
 
-#include <libaute.h>
 #include <libgda/libgda.h>
 #include <libgda-ui/libgda-ui.h>
 
@@ -30,8 +29,6 @@
 
 static Commons *commons;
 
-static GKeyFile *config;
-
 static GtkWidget *w;
 static GtkWidget *vbx_body;
 static GtkWidget *vbx_body_child;
@@ -107,23 +104,16 @@ main (int argc, char *argv[])
        if (p != NULL
            && g_ascii_strcasecmp (p + 1, "src") == 0)
                {
-                       /*
-                       *p = '\0';
-                       commons->guidir = g_build_filename (moddir, "data", PACKAGE, "gui", NULL);
-                       commons->formdir = g_build_filename (moddir, "data", PACKAGE, "form", NULL);*/
                        commons->guidir = g_strdup (GUIDIR);
-                       commons->formdir = g_strdup (FORMDIR);
                }
        else
                {
                        commons->guidir = g_build_filename (moddir, "share", PACKAGE, "gui", NULL);
-                       commons->formdir = g_build_filename (moddir, "share", PACKAGE, "form", NULL);
                }
 
 #else
 
        commons->guidir = g_strdup (GUIDIR);
-       commons->formdir = g_strdup (FORMDIR);
 
 #endif