debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Glib/ GtkSoureview conditionals

Browse source
This commit is contained in:
Christian Dywan 2008-08-15 02:50:18 +02:00
parent 16cb5b45bb
commit 6ab8bd6fd8
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
midori/midori-browser.c
View file

@ -1821,7 +1821,7 @@ _action_source_view_activate (GtkAction* action,
{ {
GtkWidget* web_view; GtkWidget* web_view;
const gchar* uri; const gchar* uri;
#if GLIB_CHECK_VERSION (2, 16, 0) #if HAVE_GIO
GFile* file; GFile* file;
gchar* tag; gchar* tag;
#ifdef HAVE_GTKSOURCEVIEW #ifdef HAVE_GTKSOURCEVIEW
@ -1833,7 +1833,7 @@ _action_source_view_activate (GtkAction* action,
gchar* contents_utf8; gchar* contents_utf8;
#ifdef HAVE_GTKSOURCEVIEW #ifdef HAVE_GTKSOURCEVIEW
GtkSourceBuffer* buffer; GtkSourceBuffer* buffer;
#if GLIB_CHECK_VERSION (2, 16, 0) #if HAVE_GIO
GtkSourceLanguageManager* language_manager; GtkSourceLanguageManager* language_manager;
GtkSourceLanguage* language; GtkSourceLanguage* language;
#endif #endif
@ -1850,7 +1850,7 @@ _action_source_view_activate (GtkAction* action,
contents = NULL; contents = NULL;
#if GLIB_CHECK_VERSION (2, 16, 0) #if HAVE_GIO
file = g_file_new_for_uri (uri); file = g_file_new_for_uri (uri);
tag = NULL; tag = NULL;
#ifdef HAVE_GTKSOURCEVIEW #ifdef HAVE_GTKSOURCEVIEW
@ -1878,6 +1878,7 @@ _action_source_view_activate (GtkAction* action,
#ifdef HAVE_GTKSOURCEVIEW #ifdef HAVE_GTKSOURCEVIEW
buffer = gtk_source_buffer_new (NULL); buffer = gtk_source_buffer_new (NULL);
gtk_source_buffer_set_highlight_syntax (buffer, TRUE); gtk_source_buffer_set_highlight_syntax (buffer, TRUE);
#ifdef HAVE_GIO
if (content_type) if (content_type)
{ {
language_manager = gtk_source_language_manager_get_default (); language_manager = gtk_source_language_manager_get_default ();
@ -1900,6 +1901,7 @@ _action_source_view_activate (GtkAction* action,
gtk_source_buffer_set_language (buffer, language); gtk_source_buffer_set_language (buffer, language);
} }
} }
#endif
#else #else
buffer = gtk_text_buffer_new (NULL); buffer = gtk_text_buffer_new (NULL);
#endif #endif
@ -1920,7 +1922,7 @@ _action_source_view_activate (GtkAction* action,
g_object_unref (buffer); g_object_unref (buffer);
g_free (contents_utf8); g_free (contents_utf8);
#if GLIB_CHECK_VERSION (2, 16, 0) #if HAVE_GIO
g_free (tag); g_free (tag);
#endif #endif
} }