Merge branch 'gtk3'

diff --cc .gitignore
Simple merge

diff --cc configure.ac
index 973bcd75b807dca45cecd969f28ce801a7677227,2a595204b6b1620b14007649d7b195a94b1e1984..15173bb98cf3f4cf0265ceb6bbb5484cff82377d
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -98,16 -73,13 +101,15 @@@ dnl -----------------------------------
  dnl - Library dependencies
  dnl ---------------------------------------------------------------------------
  dnl Required dependencies
- GLIB_REQUIRED=2.24.0
- GTK_REQUIRED=2.20.0
- GCONF_REQUIRED=2.28.0
- LIBXML_REQUIRED=2.7.0
- LIBRSVG_REQUIRED=2.26.0
+ GLIB_REQUIRED=2.27.1
+ GTK_REQUIRED=2.91.1
+ LIBXML_REQUIRED=2.7.7
+ LIBRSVG_REQUIRED=2.26.3
 +CAIRO_REQUIRED=1.8.0
 +PANGO_REQUIRED=1.28.0
  
  dnl Optional dependencies
- LIBEBOOK_REQUIRED=2.28.0
+ LIBEBOOK_REQUIRED=2.30.3
  LIBBARCODE_REQUIRED=0.98
  LIBQRENCODE_REQUIRED=3.1.0
  LIBIEC16022_REQUIRED=0.2.4
@@@ -116,11 -88,7 +118,10 @@@ LIBZINT_REQUIRED=2.4.
  dnl Make above strings available for packaging files (e.g. rpm spec files)
  AC_SUBST(GLIB_REQUIRED)
  AC_SUBST(GTK_REQUIRED)
- AC_SUBST(GCONF_REQUIRED)
  AC_SUBST(LIBXML_REQUIRED)
 +AC_SUBST(LIBRSVG_REQUIRED)
 +AC_SUBST(CAIRO_REQUIRED)
 +AC_SUBST(PANGO_REQUIRED)
  AC_SUBST(LIBEBOOK_REQUIRED)
  AC_SUBST(LIBBARCODE_REQUIRED)
  AC_SUBST(LIBQRENCODE_REQUIRED)
@@@ -317,9 -270,8 +316,10 @@@ AC_CONFIG_FILES(
  Makefile
  libglabels/Makefile
  libglabels/${LIBGLABELS_BRANCH}.pc
 +libglbarcode/Makefile
 +libglbarcode/${LIBGLBARCODE_BRANCH}.pc
  src/Makefile
+ src/cursors/Makefile
  src/pixmaps/Makefile
  data/Makefile
  data/desktop/Makefile

diff --cc data/ui/template-designer.ui
Simple merge

diff --cc src/Makefile.am
index fb94449d1fef034d052af47d31c3d21c50499a8d,4c464deed1e33ccba581ffb3ff143eff63a89d5f..057bdc307895cf7f81caf829753fa8969e801998
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,5 -1,5 +1,9 @@@
  
- SUBDIRS= ../libglabels ../libglbarcode pixmaps
 -SUBDIRS= ../libglabels pixmaps cursors
++SUBDIRS= \
++      ../libglabels \
++      ../libglbarcode \
++      pixmaps \
++      cursors
  
  bin_PROGRAMS = glabels-3 glabels-3-batch
  

diff --cc src/template-designer.c
Simple merge