[gitg: 66/69] Merge branch 'gtk3' into master

[Jesse van den Kieboom <jessevdk src gnome org>]

commit c579e3fea052804a68c67d3e5caacad50c17e250
Merge: d9567b5 1687b43
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Sat Jul 23 00:02:36 2011 +0200

    Merge branch 'gtk3' into master
    
    Conflicts:
    	NEWS
    	README
    	configure.ac
    	data/Makefile.am
    	gitg/gitg-commit-view.c
    	gitg/gitg-revision-details-panel.c
    	gitg/gitg-window.c
    	gitg/gitg.c
    	gitg/gseal-gtk-compat.h

 NEWS                                |   42 ++
 README                              |    6 +-
 configure.ac                        |   51 +--
 data/Makefile.am                    |    2 +-
 gitg/Makefile.am                    |   11 +-
 gitg/gitg-avatar-cache.c            |  416 ++++++++++++++++++
 gitg/gitg-avatar-cache.h            |   73 ++++
 gitg/gitg-branch-actions.c          |    6 +-
 gitg/gitg-cell-renderer-path.c      |   33 +-
 gitg/gitg-commit-view.c             |   41 +-
 gitg/gitg-diff-line-renderer.c      |  427 ++++++++++++-------
 gitg/gitg-diff-line-renderer.h      |    6 +-
 gitg/gitg-diff-view.c               |   74 ++--
 gitg/gitg-dnd.c                     |    3 +-
 gitg/gitg-label-renderer.c          |    2 +-
 gitg/gitg-label-renderer.h          |    2 +-
 gitg/gitg-preferences.ui            |    4 +
 gitg/gitg-repository-dialog.c       |   97 +----
 gitg/gitg-repository.ui             |    2 +-
 gitg/gitg-revision-changes-panel.c  |   11 +-
 gitg/gitg-revision-details-panel.c  |   67 +++-
 gitg/gitg-revision-details-panel.ui |  336 +++++++++------
 gitg/gitg-revision-files-panel.c    |    6 +-
 gitg/gitg-revision-files-panel.ui   |    2 +
 gitg/gitg-spinner.c                 |  794 -----------------------------------
 gitg/gitg-spinner.h                 |   99 -----
 gitg/gitg-stat-view.c               |   57 +--
 gitg/gitg-tag.ui                    |    1 -
 gitg/gitg-utils.c                   |   10 +-
 gitg/gitg-window.c                  |   77 +---
 gitg/gitg.c                         |    3 +-
 gitg/gseal-gtk-compat.c             |   21 -
 gitg/gseal-gtk-compat.h             |   47 --
 libgitg/gitg-lanes.c                |    6 +-
 libgitg/gitg-line-parser.c          |    5 +-
 libgitg/gitg-repository.c           |    8 +-
 libgitg/gitg-revision.c             |    3 +-
 37 files changed, 1265 insertions(+), 1586 deletions(-)
---
diff --cc NEWS
index 0890824,2def5df..980497b
--- a/NEWS
+++ b/NEWS
@@@ -1,15 -1,45 +1,57 @@@
+ = gitg 0.2.3 =
+ Version 0.2.3 was released on 2011-07-21
+ 
+ == Features ==
+   * Use ustar format for distcheck
+ 
+ == Bug fixes ==
+   * Use GLADE_CATALOG_DIR instead of GLADE_CATALOGDIR
+   * Fix spinner in repository dialog
+   * No longer use Gtk[HV]Box as it is deprecated
+   * Fix repository dialog
+   * Remove and reattach model while loading repository
+   * Fix ENABLE_DEBUG use in Makefile.am
+   * Fix --disable-debug
+ 
+ == Features ==
+ 
+ = gitg 0.2.2 =
+ Version 0.2.2 was released on 2011-03-27
+ 
+ == Features ==
+   * Added glade catalog file
+ 
+ == Bug fixes ==
+   * Disable auto-utf8 for repository loading
+ 
+ = gitg 0.2.1 =
+ Version 0.2.1 was released on 2011-03-25
+ 
+ == Features ==
+   * Improved debugging
+   * Add UTF8 as the first candidate encoding
+ 
+ == Bug fixes ==
+   * Adjust to GtkSourceView API break
+ 
+ = gitg 0.2.0 =
+ Version 0.2.0 was released on 2011-02-26
+ 
+ == Features ==
+   * Port gitg to gtk+ 3
+ 
 += gitg 0.1.2 =
 +Version 0.1.2 was released on 2011-03-27
 +
 +== Bug fixes ==
 +  * Compatibility with gtk+ < 2.24
 +
 += gitg 0.1.1 =
 +Version 0.1.1 was released on 2011-03-27
 +
 +== Bug fixes ==
 +  * Better encoding handling (fix performance regression)
 +
  = gitg 0.1.0 =
  Version 0.1.0 was released on 2011-01-13
  
diff --cc configure.ac
index 2272c23,3edc641..80ad860
--- a/configure.ac
+++ b/configure.ac
@@@ -100,47 -94,25 +94,38 @@@ if test "$enable_deprecations" = "yes"
  -DGDK_DISABLE_DEPRECATED \
  -DGTK_DISABLE_DEPRECATED \
  -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED"
+ -DGNOME_DISABLE_DEPRECATED \
+ -DGSEAL_ENABLE"
  fi
  
- if $PKG_CONFIG --atleast-version 2.19.0 $GTK_REQUIRED; then
- 	gtkatleast=
- else
- 	gtkatleast=no
- fi
+ PACKAGE_LIBS="$PACKAGE_LIBS -lm"
  
- AM_CONDITIONAL(BUILD_SPINNER, test "$gtkatleast" = "no")
- if test "$gtkatleast" = "no"; then
- 	AC_DEFINE([BUILD_SPINNER],[1],[Whether to use GitgSpinner instead of GtkSpinner])
- fi
  
- if $PKG_CONFIG --atleast-version 2.21.0 $GTK_REQUIRED; then
- 	gtkatleast=yes
- else
- 	gtkatleast=
- fi
+ AC_ARG_ENABLE(debug,
+               [AS_HELP_STRING([--disable-debug],
+                               [disable debug information [default=yes]])],
+               [enable_debug=$enableval], [enable_debug=yes])
  
- if test "$gtkatleast" = "yes"; then
- 	DISABLE_DEPRECATED_CFLAGS="$DISABLE_DEPRECATED_CFLAGS -DGSEAL_ENABLE"
+ if test "x$enable_debug" = "xyes"; then
+ 	PACKAGE_CFLAGS="$PACKAGE_CFLAGS -g"
+ 	AC_DEFINE([ENABLE_DEBUG],[1],[Whether debugging support is enabled])
  fi
  
- AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
- 
- PACKAGE_LIBS="$PACKAGE_LIBS -lm"
+ AM_CONDITIONAL([ENABLE_DEBUG], [test "$enable_debug" = "yes"])
  
 +
 +AC_ARG_ENABLE(debug,
 +              [AS_HELP_STRING([--disable-debug],
 +                              [disable debug information [default=yes]])],
 +              [enable_debug=$enableval], [enable_debug=yes])
 +
 +if test "x$enable_debug" = "xyes"; then
 +	PACKAGE_CFLAGS="$PACKAGE_CFLAGS -g"
 +	AC_DEFINE([ENABLE_DEBUG],[1],[Whether debugging support is enabled])
 +fi
 +
 +AM_CONDITIONAL([ENABLE_DEBUG], [test "$enable_debug" = "yes"])
 +
  AC_SUBST(PACKAGE_CFLAGS)
  AC_SUBST(PACKAGE_LIBS)
  
diff --cc gitg/gitg-window.c
index f5196f9,33267c5..7ae2fce
--- a/gitg/gitg-window.c
+++ b/gitg/gitg-window.c
@@@ -2217,21 -2210,7 +2210,8 @@@ on_help_about (GtkAction  *action
  	static gchar const copyright[] = "Copyright \xc2\xa9 2009 Jesse van den Kieboom";
  	static gchar const *authors[] = {"Jesse van den Kieboom <jessevdk gnome org>", NULL};
  	static gchar const *comments = N_ ("gitg is a git repository viewer for gtk+/GNOME");
- 	static gchar const *license = N_ ("This program is free software; you can redistribute it and/or modify\n"
- 		"it under the terms of the GNU General Public License as published by\n"
- 		"the Free Software Foundation; either version 2 of the License, or\n"
- 		"(at your option) any later version.\n"
- 		"\n"
- 		"This program is distributed in the hope that it will be useful,\n"
- 		"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
- 		"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
- 		"GNU General Public License for more details.\n"
- 		"\n"
- 		"You should have received a copy of the GNU General Public License\n"
- 		"along with this program; if not, write to the Free Software\n"
- 		"Foundation, Inc., 59 Temple Place, Suite 330,\n"
- 		"Boston, MA 02111-1307, USA.");
+ 
 +
  	gchar *path = gitg_dirs_get_data_filename ("icons", "gitg.svg", NULL);
  	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (path, NULL);
  	g_free (path);