[gevice/gevice_2_0] add support to install apps.gevice.gschema.xml

[Alejandro Valdes Jimenez <avaldes src gnome org>]

commit dd23b236c2a7a04ff1f0f2a5b231c789c42622a1
Author: Alejandro ValdÃs Jimenez <avaldes gnome org>
Date:   Thu Dec 13 23:29:37 2012 -0300

    add support to install apps.gevice.gschema.xml

 ChangeLog             |    6 +++++
 Makefile.am           |    1 +
 configure.ac          |   55 ++++++++++++++++++++++++++++++++++--------------
 data/Makefile.am      |    6 +++++
 src/gevicedatabase.py |    2 +-
 5 files changed, 53 insertions(+), 17 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 840dad7..8374338 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2012-12-13  Alejandro ValdéJimenez  <avaldes gnome org>
+	* Makefile.am: .
+	* configure.ac: add MACRO GLIB_GSETTINGS to install apps.gevice.gschema.xml
+	* data/Makefile.am: add support to install apps.gevice.gschema.xml
+	* src/gevicedatabase.py: .
+
+2012-12-13  Alejandro ValdéJimenez  <avaldes gnome org>
 	* src/gevice.py: Fixed bug #690187
 
 2012-12-13  Alejandro ValdéJimenez  <avaldes gnome org>
diff --git a/Makefile.am b/Makefile.am
index 844e2f5..90a7229 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,3 +45,4 @@ DISTCLEANFILES += \
 		intltool-extract \
 		intltool-merge \
 		intltool-update
+
diff --git a/configure.ac b/configure.ac
index 6673ed3..e5751da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,20 +7,12 @@ AM_MAINTAINER_MODE
 
 AM_PATH_PYTHON
 
-GCONF_REQUIRED=2.0.0
-PKG_CHECK_MODULES(GEVICE,
-	gconf-2.0 >= $GCONF_REQUIRED)
-
-AM_GCONF_SOURCE_2
-AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no])
-if test "$GCONFTOOL" = "no"; then
-        AC_MSG_ERROR([gconftool-2 not found])
-fi
+GLIB_GSETTINGS
 
 dnl check modules for python
 PYTHONC="python"
 
-MODULE_NAME="gconf"
+MODULE_NAME="gettext"
 $PYTHONC -c "import $MODULE_NAME" 2>/dev/null
 if test $? -eq 0
 then
@@ -30,7 +22,7 @@ else
 	exit 1 
 fi
 
-MODULE_NAME="gettext"
+MODULE_NAME="os"
 $PYTHONC -c "import $MODULE_NAME" 2>/dev/null
 if test $? -eq 0
 then
@@ -40,7 +32,7 @@ else
 	exit 1 
 fi
 
-MODULE_NAME="os"
+MODULE_NAME="sys"
 $PYTHONC -c "import $MODULE_NAME" 2>/dev/null
 if test $? -eq 0
 then
@@ -50,7 +42,7 @@ else
 	exit 1 
 fi
 
-MODULE_NAME="sys"
+MODULE_NAME="pygraphviz"
 $PYTHONC -c "import $MODULE_NAME" 2>/dev/null
 if test $? -eq 0
 then
@@ -60,8 +52,8 @@ else
 	exit 1 
 fi
 
-MODULE_NAME="pygraphviz"
-$PYTHONC -c "import $MODULE_NAME" 2>/dev/null
+MODULE_NAME="Gtk"
+$PYTHONC -c "from gi.repository import $MODULE_NAME" 2>/dev/null
 if test $? -eq 0
 then
 	AC_MSG_RESULT(checking for python module: $MODULE_NAME: found)
@@ -70,7 +62,28 @@ else
 	exit 1 
 fi
 
-MODULE_NAME="Gtk"
+MODULE_NAME="Gio"
+$PYTHONC -c "from gi.repository import $MODULE_NAME" 2>/dev/null
+if test $? -eq 0
+then
+	AC_MSG_RESULT(checking for python module: $MODULE_NAME: found)
+else
+	AC_MSG_RESULT(checking for python module: $MODULE_NAME: not found)
+	exit 1 
+fi
+
+MODULE_NAME="Gdk"
+$PYTHONC -c "from gi.repository import $MODULE_NAME" 2>/dev/null
+if test $? -eq 0
+then
+	AC_MSG_RESULT(checking for python module: $MODULE_NAME: found)
+else
+	AC_MSG_RESULT(checking for python module: $MODULE_NAME: not found)
+	exit 1 
+fi
+
+
+MODULE_NAME="GdkPixbuf"
 $PYTHONC -c "from gi.repository import $MODULE_NAME" 2>/dev/null
 if test $? -eq 0
 then
@@ -90,6 +103,16 @@ else
 	exit 1 
 fi
 
+MODULE_NAME="GLib"
+$PYTHONC -c "from gi.repository import $MODULE_NAME" 2>/dev/null
+if test $? -eq 0
+then
+	AC_MSG_RESULT(checking for python module: $MODULE_NAME: found)
+else
+	AC_MSG_RESULT(checking for python module: $MODULE_NAME: not found)
+	exit 1 
+fi
+
 MODULE_NAME="sqlite3"
 $PYTHONC -c "import $MODULE_NAME" 2>/dev/null
 if test $? -eq 0
diff --git a/data/Makefile.am b/data/Makefile.am
index 1dd6721..d8e5d69 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1,7 @@
 SUBDIRS = ui images other
+
+# gsettings_SCHEMAS is a list of all the schemas you want to install
+gsettings_SCHEMAS = apps.gevice.gschema.xml
+ 
+# include the appropriate makefile rules for schema handling
+ GSETTINGS_RULES@
diff --git a/src/gevicedatabase.py b/src/gevicedatabase.py
index 580b75b..c439522 100644
--- a/src/gevicedatabase.py
+++ b/src/gevicedatabase.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gi.repository import Gtk, Gdk
+from gi.repository import Gtk
 import os
 import sqlite3