File gtksourceview.patch of Package gobby

Overview Repositories Revisions Requests Users Attributes Meta

File gtksourceview.patch of Package gobby (Revision 68ec424a103d181cec547d2d93b240e6)

Currently displaying revision 68ec424a103d181cec547d2d93b240e6 , Show latest

Index: gobby-0.4.4/src/preferences.cpp
===================================================================
--- gobby-0.4.4.orig/src/preferences.cpp
+++ gobby-0.4.4/src/preferences.cpp
@@ -16,17 +16,34 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define WITH_GTKSOURCEVIEW2
+
 #include "preferences.hpp"
+#include "header.hpp"
+
+
+
+// #ifdef WITH_GTKSOURCEVIEW2
+#include <gtksourceview/gtksourcelanguagemanager.h>
+// #else
+// # include <gtksourceview/gtksourcelanguagesmanager.h>
+// #endif
+
+// #ifndef WITH_GTKSOURCEVIEW2
+// typedef GtkSourceLanguagesManager GtkSourceLanguageManager;
+// #endif
 
 namespace
 {
+#include <gtksourceview/gtksourcelanguagemanager.h>
 	GtkSourceLanguage*
 	get_language_from_mime_type(GtkSourceLanguageManager* manager,
 	                            const gchar* mime_type)
 	{
 #ifdef WITH_GTKSOURCEVIEW2
 		const GSList* list =
-			gtk_source_language_manager_get_available_languages(
+			// gtk_source_language_manager_get_available_languages(
+            gtk_source_language_manager_list_languages(
 				manager
 				);
 
@@ -246,7 +263,7 @@ Gobby::Preferences::FileList::FileList(C
 	else
 	{
 #ifdef WITH_GTKSOURCEVIEW2
-		const GSList* list = gtk_source_language_manager_get_available_languages(
+		const GSList* list = gtk_source_language_manager_list_languages(
 			lang_mgr);
 
 		for(; list != NULL; list = list->next)
Index: gobby-0.4.4/src/header.cpp
===================================================================
--- gobby-0.4.4.orig/src/header.cpp
+++ gobby-0.4.4/src/header.cpp
@@ -610,7 +610,7 @@ Gobby::Header::Header(const ApplicationS
 
 	// Get available languages
 #ifdef WITH_GTKSOURCEVIEW2
-	const GSList* list = gtk_source_language_manager_get_available_languages(
+	const GSList* list = gtk_source_language_manager_list_languages(
 		lang_mgr);
 #else
 	const GSList* list = gtk_source_languages_manager_get_available_languages(
Index: gobby-0.4.4/src/preferencesdialog.cpp
===================================================================
--- gobby-0.4.4.orig/src/preferencesdialog.cpp
+++ gobby-0.4.4/src/preferencesdialog.cpp
@@ -350,7 +350,7 @@ Gobby::PreferencesDialog::FileList::File
 {
 #ifdef WITH_GTKSOURCEVIEW2
 	const GSList* list =
-		gtk_source_language_manager_get_available_languages(lang_mgr);
+		gtk_source_language_manager_list_languages(lang_mgr);
 #else
 	const GSList* list =
 		gtk_source_languages_manager_get_available_languages(lang_mgr);
@@ -521,7 +521,7 @@ void Gobby::PreferencesDialog::FileList:
 {
 #ifdef WITH_GTKSOURCEVIEW2
 	const GSList* list =
-		gtk_source_language_manager_get_available_languages(m_lang_mgr);
+		gtk_source_language_manager_list_languages(m_lang_mgr);
 
 	GtkSourceLanguage* lang = NULL;
 	for(; list != NULL; list = list->next)
Index: gobby-0.4.4/src/docwindow.cpp
===================================================================
--- gobby-0.4.4.orig/src/docwindow.cpp
+++ gobby-0.4.4/src/docwindow.cpp
@@ -22,6 +22,7 @@
 #include "features.hpp"
 #ifdef WITH_GTKSOURCEVIEW2
 # include <gtksourceview/gtksourcestylemanager.h>
+# include <gtksourceview/gtksourceview.h>
 #endif
 
 #include "preferences.hpp"
@@ -351,8 +352,8 @@ void Gobby::DocWindow::apply_preferences
 #ifdef WITH_GTKSOURCEVIEW2
 	gtk_source_view_set_smart_home_end(GTK_SOURCE_VIEW(m_view),
 		m_preferences.editor.homeend_smart ?
-		GTKSOURCEVIEW_SMART_HOME_END_ALWAYS :
-		GTKSOURCEVIEW_SMART_HOME_END_DISABLED);
+		GTK_SOURCE_SMART_HOME_END_ALWAYS :
+		GTK_SOURCE_SMART_HOME_END_DISABLED);
 #else
 	gtk_source_view_set_smart_home_end(GTK_SOURCE_VIEW(m_view),
 		m_preferences.editor.homeend_smart);
Index: gobby-0.4.4/src/window.cpp
===================================================================
--- gobby-0.4.4.orig/src/window.cpp
+++ gobby-0.4.4/src/window.cpp
@@ -186,7 +186,7 @@ Gobby::Window::Window(const IconManager&
 #else
 		m_zeroconf.reset(new obby::zeroconf);
 		// Periodically check for events when not using Avahi Glib Poll
-		Glib::signal_timeout().connect(sigc::bind(sigc::mem_fun(*m_zeroconf.get(), &zeroconf_base::select), 0), 1500);
+		Glib::signal_timeout().connect(sigc::bind(sigc::mem_fun(*m_zeroconf.get(), &obby::zeroconf_base::select), 0), 1500);
 #endif
 	}
 	catch(std::runtime_error&)

Places

File gtksourceview.patch of Package gobby (Revision 68ec424a103d181cec547d2d93b240e6)

Places