Remove support for GtkSourceView

diff --git a/configure.in b/configure.in
index d97e275661fce6d7d2df82d794a639df65fbeb4a..b8b9324103bfc59fb5f8d6c04e238d690ced46bd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -60,12 +60,6 @@ AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 AC_DEFINE_UNQUOTED(HAVE_GTK,$have_gtk, [Whether Gtk is available])
 
-# Checks for GtkSourceView
-PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0, have_gtksourceview=1, have_gtksourceview=0)
-AC_SUBST(GTKSOURCEVIEW_CFLAGS)
-AC_SUBST(GTKSOURCEVIEW_LIBS)
-AC_DEFINE_UNQUOTED(HAVE_GTKSOURCEVIEW,$have_gtksourceview, [Whether GtkSourceView is available])
-
 # Checks for WebKit
 PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=1, have_webkit=0)
 if test "x${have_webkit}" = "xfalse" ; then

diff --git a/midori/midori-source.c b/midori/midori-source.c
index ce3131bb8867efab3dd7978071de0b9ba09aa90d..bede4992d4896e89dceaa468c02bcfcb5870c949 100644 (file)
--- a/midori/midori-source.c
+++ b/midori/midori-source.c
@@ -20,30 +20,18 @@
     #include <gio/gio.h>
 #endif
 #include <glib/gi18n.h>
-#if HAVE_GTKSOURCEVIEW
-    #include <gtksourceview/gtksourceview.h>
-    #include <gtksourceview/gtksourcelanguagemanager.h>
-
-    #define MidoriSourceView GtkSourceView
-    #define MidoriSourceViewClass GtkSourceViewClass
-    #define MIDORI_TYPE_SOURCE_VIEW GTK_TYPE_SOURCE_VIEW
-#else
-    #define MidoriSourceView GtkTextView
-    #define MidoriSourceViewClass GtkTextViewClass
-    #define MIDORI_TYPE_SOURCE_VIEW GTK_TYPE_TEXT_VIEW
-#endif
 
 struct _MidoriSource
 {
-    MidoriSourceView parent_instance;
+    GtkTextView parent_instance;
 };
 
 struct _MidoriSourceClass
 {
-    MidoriSourceViewClass parent_class;
+    GtkTextViewClass parent_class;
 };
 
-G_DEFINE_TYPE (MidoriSource, midori_source, MIDORI_TYPE_SOURCE_VIEW);
+G_DEFINE_TYPE (MidoriSource, midori_source, GTK_TYPE_TEXT_VIEW);
 
 static void
 midori_source_finalize (GObject* object);
@@ -60,20 +48,10 @@ midori_source_class_init (MidoriSourceClass* class)
 static void
 midori_source_init (MidoriSource* source)
 {
-    #if HAVE_GTKSOURCEVIEW
-    GtkSourceBuffer* buffer;
-    #else
     GtkTextBuffer* buffer;
-    #endif
 
-    #if HAVE_GTKSOURCEVIEW
-    buffer = gtk_source_buffer_new (NULL);
-    gtk_source_buffer_set_highlight_syntax (buffer, TRUE);
-    gtk_source_view_set_show_line_numbers (GTK_SOURCE_VIEW (source), TRUE);
-    #else
     buffer = gtk_text_buffer_new (NULL);
-    #endif
-    gtk_text_view_set_buffer (GTK_TEXT_VIEW (source), GTK_TEXT_BUFFER (buffer));
+    gtk_text_view_set_buffer (GTK_TEXT_VIEW (source), buffer);
     gtk_text_view_set_editable (GTK_TEXT_VIEW (source), FALSE);
 }
 
@@ -109,20 +87,10 @@ midori_source_set_uri (MidoriSource* source,
     #if HAVE_GIO
     GFile* file;
     gchar* tag;
-    #if HAVE_GTKSOURCEVIEW
-    GFileInfo* info;
-    const gchar* content_type;
-    #endif
     #endif
     gchar* contents;
     gchar* contents_utf8;
     GtkTextBuffer* buffer;
-    #if HAVE_GTKSOURCEVIEW
-    #if HAVE_GIO
-    GtkSourceLanguageManager* language_manager;
-    GtkSourceLanguage* language;
-    #endif
-    #endif
 
     g_return_if_fail (MIDORI_IS_SOURCE (source));
 
@@ -131,16 +99,8 @@ midori_source_set_uri (MidoriSource* source,
     #if HAVE_GIO
     file = g_file_new_for_uri (uri);
     tag = NULL;
-    #if HAVE_GTKSOURCEVIEW
-    content_type = NULL;
-    #endif
     if (g_file_load_contents (file, NULL, &contents, NULL, &tag, NULL))
     {
-        #if HAVE_GTKSOURCEVIEW
-        info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
-                                  G_FILE_QUERY_INFO_NONE, NULL, NULL);
-        content_type = g_file_info_get_content_type (info);
-        #endif
         g_object_unref (file);
     }
     if (contents && !g_utf8_validate (contents, -1, NULL))
@@ -154,32 +114,6 @@ midori_source_set_uri (MidoriSource* source,
         contents_utf8 = contents;
 
     buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (source));
-    #if HAVE_GTKSOURCEVIEW
-    #if HAVE_GIO
-    if (content_type)
-    {
-        language_manager = gtk_source_language_manager_get_default ();
-        if (!strcmp (content_type, "text/html"))
-        {
-            language = gtk_source_language_manager_get_language (
-                language_manager, "html");
-            gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (buffer), language);
-        }
-        else if (!strcmp (content_type, "text/css"))
-        {
-            language = gtk_source_language_manager_get_language (
-                language_manager, "css");
-            gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (buffer), language);
-        }
-        else if (!strcmp (content_type, "text/javascript"))
-        {
-            language = gtk_source_language_manager_get_language (
-                language_manager, "js");
-            gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (buffer), language);
-        }
-    }
-    #endif
-    #endif
     if (contents_utf8)
         gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer), contents_utf8, -1);
 

diff --git a/wscript b/wscript
index 160fb253878019b8691db8d6c387454b48fa7b1e..d683eb0710226d87ec6a004e4e9e6c36c973fb07 100644 (file)
--- a/wscript
+++ b/wscript
@@ -126,7 +126,6 @@ def configure (conf):
     conf.check_message_custom ('history database', 'support', sqlite)
 
     conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True)
-    conf.check_pkg ('gtksourceview-2.0', destvar='GTKSOURCEVIEW', vnum='2.0', mandatory=False)
     conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True)
     conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True)