[glabels: 12/12] Merge branch 'gtk3'

[Jim Evins <jimevins src gnome org>]

commit 9453143c64d5bbfde9c156c3b5a379eeb124f863
Merge: 61404cf 6e743df
Author: Jim Evins <evins snaught com>
Date:   Sun Nov 14 23:30:24 2010 -0500

    Merge branch 'gtk3'

 .gitignore                                         |    5 +
 configure.ac                                       |   24 +-
 data/Makefile.am                                   |    9 +-
 data/schemas/Makefile.am                           |   23 +
 data/schemas/org.gnome.glabels-3.gschema.xml.in.in |  180 ++++++
 data/ui/media-select.ui                            |   41 +-
 data/ui/merge-properties-dialog.ui                 |   25 +-
 data/ui/object-editor.ui                           |  367 ++++++++-----
 data/ui/template-designer.ui                       |  340 +++++++------
 libglabels/db.c                                    |    2 +-
 src/Makefile.am                                    |    6 +-
 src/color-history-model.c                          |  195 ++++----
 src/color-swatch.c                                 |   36 +-
 src/combo-util.c                                   |   31 +-
 src/combo-util.h                                   |    4 +-
 src/cursors/Makefile.am                            |   26 +
 src/cursors/cursor_barcode.png                     |  Bin 0 -> 198 bytes
 src/cursors/cursor_box.png                         |  Bin 0 -> 200 bytes
 src/cursors/cursor_ellipse.png                     |  Bin 0 -> 243 bytes
 src/cursors/cursor_image.png                       |  Bin 0 -> 247 bytes
 src/cursors/cursor_line.png                        |  Bin 0 -> 198 bytes
 src/cursors/cursor_text.png                        |  Bin 0 -> 210 bytes
 src/font-history-model.c                           |  141 ++----
 src/font-sample.c                                  |   36 +-
 src/media-select.c                                 |   54 +-
 src/merge-properties-dialog.c                      |   17 +-
 src/mini-label-preview.c                           |   37 +-
 src/mini-preview.c                                 |   42 +-
 src/object-editor-bc-page.c                        |   59 ++-
 src/object-editor-private.h                        |    2 +
 src/object-editor-size-page.c                      |    3 +-
 src/object-editor.c                                |    2 +-
 src/prefs-dialog.c                                 |    1 -
 src/prefs-model.c                                  |  578 +++++++-------------
 src/print-op-dialog.c                              |    4 +-
 src/template-designer.c                            |   22 +-
 src/template-history-model.c                       |  119 ++---
 src/ui-sidebar.c                                   |    4 +-
 src/ui.c                                           |    1 -
 src/view-barcode.c                                 |   27 +-
 src/view-box.c                                     |   27 +-
 src/view-ellipse.c                                 |   27 +-
 src/view-image.c                                   |   27 +-
 src/view-line.c                                    |   27 +-
 src/view-text.c                                    |   26 +-
 src/view.c                                         |   74 ++--
 src/wdgt-chain-button.c                            |  117 ++---
 src/window.c                                       |   21 +-
 48 files changed, 1363 insertions(+), 1446 deletions(-)
---
diff --cc configure.ac
index 973bcd7,2a59520..15173bb
--- a/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 src/Makefile.am
index fb94449,4c464de..057bdc3
--- a/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