GNOME.org
 

[gedit] Always use GTK+3 and GtkSourceView 3

commit bbedb66c758ee956ccc07c6b08951b885d3ffc94
Author: Garrett Regier <alias301 gmail com>
Date:   Sat Jun 12 11:11:31 2010 -0700

    Always use GTK+3 and GtkSourceView 3

 configure.ac                                    |   43 +-
 docs/reference/Makefile.am                      |    1 -
 gedit/Makefile.am                               |   13 +-
 gedit/dialogs/gedit-close-confirmation-dialog.c |    2 -
 gedit/gedit-app.c                               |    1 -
 gedit/gedit-dbus.c                              |    2 -
 gedit/gedit-documents-panel.c                   |    1 -
 gedit/gedit-encodings-combo-box.c               |    2 -
 gedit/gedit-message-area.c                      |  634 ---------------
 gedit/gedit-message-area.h                      |  131 ---
 gedit/gedit-notebook.c                          |    2 -
 gedit/gedit-panel.c                             |    1 -
 gedit/gedit-plugins-engine.c                    |    1 -
 gedit/gedit-print-preview.c                     |    1 -
 gedit/gedit-session.c                           |    1 -
 gedit/gedit-spinner.c                           |  993 -----------------------
 gedit/gedit-spinner.h                           |   97 ---
 gedit/gedit-status-combo-box.c                  |    1 -
 gedit/gedit-tab-label.c                         |   17 -
 gedit/gedit-tab.c                               |   24 -
 gedit/gedit-utils.c                             |    2 -
 gedit/gedit-view.c                              |    2 -
 gedit/gedit-window.c                            |    1 -
 gedit/gedit.c                                   |    1 -
 gedit/gseal-gtk-compat.h                        |   77 --
 25 files changed, 5 insertions(+), 2046 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6ff8361..998c1e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,29 +265,17 @@ dnl Start of pkg-config checks
 dnl ================================================================
 
 # Dependencies
-GTK_REQUIRED=
-GTK_REQUIRED_VERSION=
-GSV_REQUIRED=
-
-PKG_CHECK_EXISTS([gtk+-3.0 >= 2.90],
-		 [
-		 	GTK_REQUIRED=gtk+-3.0
-		 	GTK_REQUIRED_VERSION=2.90.0
-		 	GSV_REQUIRED=gtksourceview-3.0
-		 ],[
-		 	GTK_REQUIRED=gtk+-2.0
-		 	GTK_REQUIRED_VERSION=2.16.0
-		 	GSV_REQUIRED=gtksourceview-2.0
-		 ])
 
 PKG_CHECK_MODULES(GEDIT, [
 	libxml-2.0 >= 2.5.0
 	glib-2.0 >= 2.25.6
 	gthread-2.0 >= 2.13.0
 	gio-2.0 >= 2.25.9
-	$GTK_REQUIRED >= $GTK_REQUIRED_VERSION
-	$GSV_REQUIRED >= 2.9.7
+	gtk+-2.0 >= 2.20.0
+	gtksourceview-2.0 >= 2.9.7
 	gconf-2.0 >= 2.31.1
+	libpeas-1.0 >= 0.5.0
+	libpeasui-1.0 >= 0.5.0
 ])
 
 if test "$os_osx" = "no" &&
@@ -315,29 +303,6 @@ GEDIT_LIBS="$GEDIT_LIBS $X11_LIBS $UNIX_LIBS"
 AC_SUBST(GEDIT_CFLAGS)
 AC_SUBST(GEDIT_LIBS)
 
-dnl FIXME: Remove this when removing gedit-message-area
-
-if $PKG_CONFIG --atleast-version 2.17.1 $GTK_REQUIRED; then
-       gtkatleast=
-else
-       gtkatleast=no
-fi
-
-AM_CONDITIONAL(BUILD_MESSAGE_AREA, test "$gtkatleast" = "no")
-
-dnl FIXME: Remove this when removing gedit-spinner
-
-if $PKG_CONFIG --atleast-version 2.19.0 $GTK_REQUIRED; then
-       gtkatleast=
-else
-       gtkatleast=no
-fi
-
-AM_CONDITIONAL(BUILD_SPINNER, test "$gtkatleast" = "no")
-if test "$gtkatleast" = "no"; then
-	AC_DEFINE([BUILD_SPINNER],[1],[Whether to use GeditSpinner instead of GtkSpinner])
-fi
-
 if test "$os_osx" = "no" &&
    test "$os_win32" = "no"; then
 	PKG_CHECK_MODULES(EGG_SMCLIENT, [
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 389a9ab..000a93e 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -52,7 +52,6 @@ IGNORE_HFILES=		\
 	gedit-plugins-engine.h			\
 	gedit-prefs-manager-private.h		\
 	gedit-session.h				\
-	gedit-spinner.h				\
 	gedit-ui.h				\
 	gedit-window-private.h			\
 	gedit-output-window.h			\
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 2c87118..a7be5d4 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -120,8 +120,7 @@ NOINST_H_FILES =			\
 	gedit-tab-label.h		\
 	gedittextregion.h		\
 	gedit-ui.h			\
-	gedit-window-private.h		\
-	gseal-gtk-compat.h
+	gedit-window-private.h
 
 INST_H_FILES =				\
 	gedit-app.h			\
@@ -262,14 +261,4 @@ else
 	ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
 endif
 
-if BUILD_MESSAGE_AREA
-libgedit_la_SOURCES += gedit-message-area.c
-INST_H_FILES += gedit-message-area.h
-endif
-
-if BUILD_SPINNER
-libgedit_la_SOURCES += gedit-spinner.c
-NOINST_H_FILES += gedit-spinner.h
-endif
-
 -include $(top_srcdir)/git.mk
diff --git a/gedit/dialogs/gedit-close-confirmation-dialog.c b/gedit/dialogs/gedit-close-confirmation-dialog.c
index 6b0578d..3b29eec 100644
--- a/gedit/dialogs/gedit-close-confirmation-dialog.c
+++ b/gedit/dialogs/gedit-close-confirmation-dialog.c
@@ -39,8 +39,6 @@
 #include <gedit/gedit-utils.h>
 #include <gedit/gedit-window.h>
 
-#include <gedit/gseal-gtk-compat.h>
-
 /* Properties */
 enum 
 {
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index ecd1c6d..946ac9d 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -44,7 +44,6 @@
 #include "gedit-utils.h"
 #include "gedit-enum-types.h"
 #include "gedit-dirs.h"
-#include "gseal-gtk-compat.h"
 #include "gedit-settings.h"
 
 #ifdef OS_OSX
diff --git a/gedit/gedit-dbus.c b/gedit/gedit-dbus.c
index d8b1d93..83d9da4 100644
--- a/gedit/gedit-dbus.c
+++ b/gedit/gedit-dbus.c
@@ -42,8 +42,6 @@
 #include "gedit-fifo.h"
 #endif
 
-#include "gseal-gtk-compat.h"
-
 typedef struct _WaitData WaitData;
 typedef void (*WaitHandlerFunc)(GObject *object, WaitData *data);
 
diff --git a/gedit/gedit-documents-panel.c b/gedit/gedit-documents-panel.c
index 4fc7d4f..21e0c5f 100644
--- a/gedit/gedit-documents-panel.c
+++ b/gedit/gedit-documents-panel.c
@@ -35,7 +35,6 @@
 #include "gedit-documents-panel.h"
 #include "gedit-utils.h"
 #include "gedit-notebook.h"
-#include "gseal-gtk-compat.h"
 
 #include <glib/gi18n.h>
 
diff --git a/gedit/gedit-encodings-combo-box.c b/gedit/gedit-encodings-combo-box.c
index 99d4952..a7d403c 100644
--- a/gedit/gedit-encodings-combo-box.c
+++ b/gedit/gedit-encodings-combo-box.c
@@ -41,8 +41,6 @@
 #include "gedit-settings.h"
 #include "gedit-utils.h"
 
-#include "gseal-gtk-compat.h"
-
 #define ENCODING_KEY "Enconding"
 
 #define GEDIT_ENCODINGS_COMBO_BOX_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),	\
diff --git a/gedit/gedit-notebook.c b/gedit/gedit-notebook.c
index 38507af..eea3431 100644
--- a/gedit/gedit-notebook.c
+++ b/gedit/gedit-notebook.c
@@ -51,8 +51,6 @@
 #include "gedit-enum-types.h"
 #include "gedit-settings.h"
 
-#include "gseal-gtk-compat.h"
-
 #define AFTER_ALL_TABS -1
 #define NOT_IN_APP_WINDOWS -2
 
diff --git a/gedit/gedit-panel.c b/gedit/gedit-panel.c
index 51a1ff1..bbd2a00 100644
--- a/gedit/gedit-panel.c
+++ b/gedit/gedit-panel.c
@@ -38,7 +38,6 @@
 #include "gedit-close-button.h"
 #include "gedit-window.h"
 #include "gedit-debug.h"
-#include "gseal-gtk-compat.h"
 
 #define PANEL_ITEM_KEY "GeditPanelItemKey"
 
diff --git a/gedit/gedit-plugins-engine.c b/gedit/gedit-plugins-engine.c
index aa8e4c2..5704662 100644
--- a/gedit/gedit-plugins-engine.c
+++ b/gedit/gedit-plugins-engine.c
@@ -46,7 +46,6 @@
 #include "gedit-dirs.h"
 #include "gedit-settings.h"
 #include "gedit-utils.h"
-#include "gseal-gtk-compat.h"
 
 #define GEDIT_PLUGINS_ENGINE_BASE_KEY "/apps/gedit-2/plugins"
 #define GEDIT_PLUGINS_ENGINE_KEY GEDIT_PLUGINS_ENGINE_BASE_KEY "/active-plugins"
diff --git a/gedit/gedit-print-preview.c b/gedit/gedit-print-preview.c
index 743001b..deaadfa 100644
--- a/gedit/gedit-print-preview.c
+++ b/gedit/gedit-print-preview.c
@@ -40,7 +40,6 @@
 #include <cairo-pdf.h>
 
 #include "gedit-print-preview.h"
-#include "gseal-gtk-compat.h"
 
 #define PRINTER_DPI (72.)
 
diff --git a/gedit/gedit-session.c b/gedit/gedit-session.c
index 9a89696..b77fb74 100644
--- a/gedit/gedit-session.c
+++ b/gedit/gedit-session.c
@@ -52,7 +52,6 @@
 #include "gedit-commands.h"
 #include "dialogs/gedit-close-confirmation-dialog.h"
 #include "smclient/eggsmclient.h"
-#include "gseal-gtk-compat.h"
 
 /* The master client we use for SM */
 static EggSMClient *master_client = NULL;
diff --git a/gedit/gedit-status-combo-box.c b/gedit/gedit-status-combo-box.c
index 10ed49e..9eae04f 100644
--- a/gedit/gedit-status-combo-box.c
+++ b/gedit/gedit-status-combo-box.c
@@ -23,7 +23,6 @@
 #include "gedit-status-combo-box.h"
 
 #include <gdk/gdkkeysyms.h>
-#include "gseal-gtk-compat.h"
 
 #define COMBO_BOX_TEXT_DATA "GeditStatusComboBoxTextData"
 
diff --git a/gedit/gedit-tab-label.c b/gedit/gedit-tab-label.c
index 544533b..a29df27 100644
--- a/gedit/gedit-tab-label.c
+++ b/gedit/gedit-tab-label.c
@@ -29,10 +29,6 @@
 #include "gedit-tab-label.h"
 #include "gedit-close-button.h"
 
-#ifdef BUILD_SPINNER
-#include "gedit-spinner.h"
-#endif
-
 #define GEDIT_TAB_LABEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GEDIT_TYPE_TAB_LABEL, GeditTabLabelPrivate))
 
 /* Signals */
@@ -174,11 +170,7 @@ sync_state (GeditTab      *tab,
 		gtk_widget_hide (tab_label->priv->icon);
 
 		gtk_widget_show (tab_label->priv->spinner);
-#ifdef BUILD_SPINNER
-		gedit_spinner_start (GEDIT_SPINNER (tab_label->priv->spinner));
-#else
 		gtk_spinner_start (GTK_SPINNER (tab_label->priv->spinner));
-#endif
 	}
 	else
 	{
@@ -193,11 +185,7 @@ sync_state (GeditTab      *tab,
 		gtk_widget_show (tab_label->priv->icon);
 
 		gtk_widget_hide (tab_label->priv->spinner);
-#ifdef BUILD_SPINNER
-		gedit_spinner_stop (GEDIT_SPINNER (tab_label->priv->spinner));
-#else
 		gtk_spinner_stop (GTK_SPINNER (tab_label->priv->spinner));
-#endif
 	}
 
 	/* sync tip since encoding is known only after load/save end */
@@ -296,12 +284,7 @@ gedit_tab_label_init (GeditTabLabel *tab_label)
 			  G_CALLBACK (close_button_clicked_cb),
 			  tab_label);
 
-#ifdef BUILD_SPINNER
-	spinner = gedit_spinner_new ();
-	gedit_spinner_set_size (GEDIT_SPINNER (spinner), GTK_ICON_SIZE_MENU);
-#else
 	spinner = gtk_spinner_new ();
-#endif
 	gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0);
 	tab_label->priv->spinner = spinner;
 
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index 803d655..3881da7 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -45,10 +45,6 @@
 #include "gedit-enum-types.h"
 #include "gedit-settings.h"
 
-#if !GTK_CHECK_VERSION (2, 17, 1)
-#include "gedit-message-area.h"
-#endif
-
 #define GEDIT_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GEDIT_TYPE_TAB, GeditTabPrivate))
 
 #define GEDIT_TAB_KEY "GEDIT_TAB_KEY"
@@ -1002,13 +998,8 @@ document_loaded (GeditDocument *document,
 			set_message_area (tab, emsg);
 		}
 
-#if !GTK_CHECK_VERSION (2, 17, 1)
-		gedit_message_area_set_default_response (GEDIT_MESSAGE_AREA (emsg),
-							 GTK_RESPONSE_CANCEL);
-#else
 		gtk_info_bar_set_default_response (GTK_INFO_BAR (emsg),
 						   GTK_RESPONSE_CANCEL);
-#endif
 
 		gtk_widget_show (emsg);
 
@@ -1054,13 +1045,8 @@ document_loaded (GeditDocument *document,
 					  G_CALLBACK (io_loading_error_message_area_response),
 					  tab);
 
-#if !GTK_CHECK_VERSION (2, 17, 1)
-			gedit_message_area_set_default_response (GEDIT_MESSAGE_AREA (emsg),
-								 GTK_RESPONSE_CANCEL);
-#else
 			gtk_info_bar_set_default_response (GTK_INFO_BAR (emsg),
 							   GTK_RESPONSE_CANCEL);
-#endif
 
 			gtk_widget_show (emsg);
 		}
@@ -1091,13 +1077,8 @@ document_loaded (GeditDocument *document,
 
 					set_message_area (tab, w);
 
-#if !GTK_CHECK_VERSION (2, 17, 1)
-					gedit_message_area_set_default_response (GEDIT_MESSAGE_AREA (w),
-										 GTK_RESPONSE_CANCEL);
-#else
 					gtk_info_bar_set_default_response (GTK_INFO_BAR (w),
 									   GTK_RESPONSE_CANCEL);
-#endif
 
 					gtk_widget_show (w);
 
@@ -1425,13 +1406,8 @@ document_saved (GeditDocument *document,
 					  tab);
 		}
 
-#if !GTK_CHECK_VERSION (2, 17, 1)
-		gedit_message_area_set_default_response (GEDIT_MESSAGE_AREA (emsg),
-							 GTK_RESPONSE_CANCEL);
-#else
 		gtk_info_bar_set_default_response (GTK_INFO_BAR (emsg),
 						   GTK_RESPONSE_CANCEL);
-#endif
 
 		gtk_widget_show (emsg);
 	}
diff --git a/gedit/gedit-utils.c b/gedit/gedit-utils.c
index 0c30b7a..54d806f 100644
--- a/gedit/gedit-utils.c
+++ b/gedit/gedit-utils.c
@@ -63,8 +63,6 @@
 #include <sys/stat.h>
 #endif
 
-#include "gseal-gtk-compat.h"
-
 #define STDIN_DELAY_MICROSECONDS 100000
 
 /* Returns true if location is a file: uri and is not a chained uri */
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index 8863f3c..d9cf86d 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -45,10 +45,8 @@
 #include "gedit-debug.h"
 #include "gedit-marshal.h"
 #include "gedit-utils.h"
-#include "gseal-gtk-compat.h"
 #include "gedit-settings.h"
 #include "gedit-app.h"
-#include "gseal-gtk-compat.h"
 
 #define GEDIT_VIEW_SCROLL_MARGIN 0.02
 #define GEDIT_VIEW_SEARCH_DIALOG_TIMEOUT (30*1000) /* 30 seconds */
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index 7d69a3e..14bb7d0 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -56,7 +56,6 @@
 #include "gedit-enum-types.h"
 #include "gedit-dirs.h"
 #include "gedit-status-combo-box.h"
-#include "gseal-gtk-compat.h"
 #include "gedit-settings.h"
 #include "gedit-marshal.h"
 
diff --git a/gedit/gedit.c b/gedit/gedit.c
index 57a13c4..e529f13 100644
--- a/gedit/gedit.c
+++ b/gedit/gedit.c
@@ -43,7 +43,6 @@
 #include "gedit-app.h"
 #include "gedit-encodings.h"
 
-#include "gseal-gtk-compat.h"
 #include "gedit-commands.h"
 #include "gedit-debug.h"
 #include "gedit-dirs.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]