[gitg/gtk3: 5/20] Drop GTK+ 2

[Garrett Regier <gregier src gnome org>]

commit edbe29694d652c86ef73ff3e69318175cc3000d3
Author: Garrett Regier <alias301 gmail com>
Date:   Sun Jan 2 22:00:01 2011 -0800

    Drop GTK+ 2

 configure.ac               |   33 ++++-----------------------------
 gitg/Makefile.am           |    3 +--
 gitg/gitg-branch-actions.c |    4 ----
 gitg/gitg-commit-view.c    |    1 -
 gitg/gitg-dnd.c            |    1 -
 gitg/gitg-stat-view.c      |    1 -
 gitg/gitg-utils.c          |    2 --
 gitg/gitg-window.c         |    2 --
 gitg/gseal-gtk-compat.h    |   38 --------------------------------------
 9 files changed, 5 insertions(+), 80 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4782e99..471c730 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,37 +51,12 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 
 AC_CHECK_LIB([m], [sinf])
 
-# Which gtk+ API version to compile against
-
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
-	[AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
-	[case "$with_gtk" in
-		2.0|3.0) ;;
-		*) AC_MSG_ERROR([invalid gtk version specified]) ;;
-	esac],
-	[with_gtk=2.0])
-AC_MSG_RESULT([$with_gtk])
-
-case "$with_gtk" in
-	2.0)
-		GTK_REQUIRED=gtk+-2.0
-		GTK_REQUIRED_VERSION=2.20.0
-		GTKSOURCEVIEW_REQUIRED=gtksourceview-2.0
-		GTKSOURCEVIEW_REQUIRED_VERSION=2.8.0
-		;;
-	3.0)
-		GTK_REQUIRED=gtk+-3.0
-		GTK_REQUIRED_VERSION=2.90.0
-		GTKSOURCEVIEW_REQUIRED=gtksourceview-3.0
-		GTKSOURCEVIEW_REQUIRED_VERSION=2.90.0
-		;;
-esac
-
 GLIB_REQUIRED_VERSION=2.26
+GTK_REQUIRED_VERSION=2.90.0
+GTKSOURCEVIEW_REQUIRED_VERSION=2.90.0
 
 PKG_CHECK_MODULES(GITG, [
-	$GTK_REQUIRED >= $GTK_REQUIRED_VERSION
+	gtk+-3.0 >= $GTK_REQUIRED_VERSION
 	gthread-2.0 >= $GLIB_REQUIRED_VERSION
 	glib-2.0 >= $GLIB_REQUIRED_VERSION
 	gobject-2.0 >= $GLIB_REQUIRED_VERSION
@@ -91,7 +66,7 @@ PKG_CHECK_MODULES(GITG, [
 ])
 
 PKG_CHECK_MODULES(PACKAGE, [
-	$GTKSOURCEVIEW_REQUIRED >= $GTKSOURCEVIEW_REQUIRED_VERSION
+	gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED_VERSION
 	gsettings-desktop-schemas
 ])
 
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index 4522206..50dc17f 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -30,8 +30,7 @@ NOINST_H_FILES =			\
 	gitg-stat-view.h		\
 	gitg-uri.h			\
 	gitg-utils.h			\
-	gitg-window.h			\
-	gseal-gtk-compat.h
+	gitg-window.h
 
 gitg_SOURCES =				\
 	$(BUILT_SOURCES)		\
diff --git a/gitg/gitg-branch-actions.c b/gitg/gitg-branch-actions.c
index d98be6b..fd31b0f 100644
--- a/gitg/gitg-branch-actions.c
+++ b/gitg/gitg-branch-actions.c
@@ -622,10 +622,6 @@ rename_dialog (GitgWindow *window, const gchar *oldname)
 	                                   "_Rename", GTK_RESPONSE_OK,
 	                                   NULL);
 
-#if ! GTK_CHECK_VERSION(2, 22, 0)
-	gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE);
-#endif
-
 	gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
 
 	GtkWidget *box = gtk_hbox_new (FALSE, 6);
diff --git a/gitg/gitg-commit-view.c b/gitg/gitg-commit-view.c
index f1fe5fe..9ab2ffe 100644
--- a/gitg/gitg-commit-view.c
+++ b/gitg/gitg-commit-view.c
@@ -31,7 +31,6 @@
 #include "gitg-commit-view.h"
 #include "gitg-diff-view.h"
 #include "gitg-utils.h"
-#include "gseal-gtk-compat.h"
 
 #define GITG_COMMIT_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GITG_TYPE_COMMIT_VIEW, GitgCommitViewPrivate))
 #define CATEGORY_UNSTAGE_HUNK "CategoryUnstageHunk"
diff --git a/gitg/gitg-dnd.c b/gitg/gitg-dnd.c
index 2d0eff4..fb908b9 100644
--- a/gitg/gitg-dnd.c
+++ b/gitg/gitg-dnd.c
@@ -26,7 +26,6 @@
 #include "gitg-cell-renderer-path.h"
 #include "gitg-window.h"
 #include "gitg-branch-actions.h"
-#include "gseal-gtk-compat.h"
 #include "gitg-utils.h"
 
 #include <string.h>
diff --git a/gitg/gitg-stat-view.c b/gitg/gitg-stat-view.c
index d9c54cc..a04f9b2 100644
--- a/gitg/gitg-stat-view.c
+++ b/gitg/gitg-stat-view.c
@@ -3,7 +3,6 @@
 #include "gitg-utils.h"
 #include <math.h>
 #include <cairo.h>
-#include "gseal-gtk-compat.h"
 
 #define GITG_STAT_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GITG_TYPE_STAT_VIEW, GitgStatViewPrivate))
 
diff --git a/gitg/gitg-utils.c b/gitg/gitg-utils.c
index dd0e119..b51344c 100644
--- a/gitg/gitg-utils.c
+++ b/gitg/gitg-utils.c
@@ -27,8 +27,6 @@
 #include <string.h>
 #include <math.h>
 
-#include "gseal-gtk-compat.h"
-
 gchar *
 gitg_utils_get_content_type(GFile *file)
 {
diff --git a/gitg/gitg-window.c b/gitg/gitg-window.c
index 0c550bd..e13c201 100644
--- a/gitg/gitg-window.c
+++ b/gitg/gitg-window.c
@@ -46,8 +46,6 @@
 #include "gitg-activatable.h"
 #include "gitg-uri.h"
 
-#include "gseal-gtk-compat.h"
-
 #define DYNAMIC_ACTION_DATA_KEY "GitgDynamicActionDataKey"
 #define DYNAMIC_ACTION_DATA_REMOTE_KEY "GitgDynamicActionDataRemoteKey"
 #define DYNAMIC_ACTION_DATA_BRANCH_KEY "GitgDynamicActionDataBranchKey"