[glom] Fix the build with latest gtksourceviewmm from git master.

[Murray Cumming <murrayc src gnome org>]

commit d152a0b0d7371a30848567ffefe6e51beede640f
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Dec 3 18:04:21 2010 +0100

    Fix the build with latest gtksourceviewmm from git master.
    
    * glom/main.cc:
    * glom/mode_design/dialog_database_preferences.cc:
    * glom/mode_design/dialog_database_preferences.h:
    * glom/mode_design/fields/dialog_fieldcalculation.cc:
    * glom/mode_design/fields/dialog_fieldcalculation.h:
    * glom/mode_design/fields/dialog_fielddefinition.h:
    * glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.c
    c:
    * glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h
    :
    * glom/mode_design/script_library/dialog_script_library.cc:
    * glom/mode_design/script_library/dialog_script_library.h:
    * tests/glade_toplevels_instantiation.cc:
    * tests/test_glade_derived_instantiation.cc: Change the gtksourceview
    namespace to Gsv.

 ChangeLog                                          |   20 ++++++++++++++++++++
 glom/main.cc                                       |    2 +-
 glom/mode_design/dialog_database_preferences.cc    |    8 ++++----
 glom/mode_design/dialog_database_preferences.h     |    2 +-
 glom/mode_design/fields/dialog_fieldcalculation.cc |    6 +++---
 glom/mode_design/fields/dialog_fieldcalculation.h  |    2 +-
 glom/mode_design/fields/dialog_fielddefinition.h   |    2 +-
 .../layout_item_dialogs/dialog_buttonscript.cc     |    8 ++++----
 .../layout_item_dialogs/dialog_buttonscript.h      |    2 +-
 .../script_library/dialog_script_library.cc        |    6 +++---
 .../script_library/dialog_script_library.h         |    2 +-
 tests/glade_toplevels_instantiation.cc             |    2 +-
 tests/test_glade_derived_instantiation.cc          |    2 +-
 13 files changed, 42 insertions(+), 22 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 66ce59a..809a6be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 2010-12-03  Murray Cumming  <murrayc murrayc com>
 
+	Fix the build with latest gtksourceviewmm from git master.
+
+	* glom/main.cc:
+	* glom/mode_design/dialog_database_preferences.cc:
+	* glom/mode_design/dialog_database_preferences.h:
+	* glom/mode_design/fields/dialog_fieldcalculation.cc:
+	* glom/mode_design/fields/dialog_fieldcalculation.h:
+	* glom/mode_design/fields/dialog_fielddefinition.h:
+	* glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.c
+	c:
+	* glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h
+	:
+	* glom/mode_design/script_library/dialog_script_library.cc:
+	* glom/mode_design/script_library/dialog_script_library.h:
+	* tests/glade_toplevels_instantiation.cc:
+	* tests/test_glade_derived_instantiation.cc: Change the gtksourceview 
+	namespace to Gsv.
+
+2010-12-03  Murray Cumming  <murrayc murrayc com>
+
 	Fix the build with latest gtkmm from git master.
 
 	* glom/mode_design/dialog_add_related_table.cc:
diff --git a/glom/main.cc b/glom/main.cc
index 4e72f5d..72e89cb 100644
--- a/glom/main.cc
+++ b/glom/main.cc
@@ -511,7 +511,7 @@ main(int argc, char* argv[])
   try
   {
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-    gtksourceview::init();
+    Gsv::init();
     Goocanvas::init(PACKAGE_NAME, PACKAGE_VERSION, argc, argv);
 #endif //!GLOM_ENABLE_CLIENT_ONLY
 
diff --git a/glom/mode_design/dialog_database_preferences.cc b/glom/mode_design/dialog_database_preferences.cc
index 5bad489..4fbaec2 100644
--- a/glom/mode_design/dialog_database_preferences.cc
+++ b/glom/mode_design/dialog_database_preferences.cc
@@ -87,15 +87,15 @@ Dialog_Database_Preferences::Dialog_Database_Preferences(BaseObjectType* cobject
   //Dialog_Properties::set_modified(false);
 
   //Tell the SourceView to do syntax highlighting for Python:
-  Glib::RefPtr<gtksourceview::SourceLanguageManager> languages_manager = 
-    gtksourceview::SourceLanguageManager::get_default();
+  Glib::RefPtr<Gsv::SourceLanguageManager> languages_manager = 
+    Gsv::SourceLanguageManager::get_default();
 
-  Glib::RefPtr<gtksourceview::SourceLanguage> language = 
+  Glib::RefPtr<Gsv::SourceLanguage> language = 
     languages_manager->get_language("python"); //This is the GtkSourceView language ID.
   if(language)
   {
      //Create a new buffer and set it, instead of getting the default buffer, in case libglade has tried to set it, using the wrong buffer type:
-     Glib::RefPtr<gtksourceview::SourceBuffer> buffer = gtksourceview::SourceBuffer::create(language);
+     Glib::RefPtr<Gsv::SourceBuffer> buffer = Gsv::SourceBuffer::create(language);
      buffer->set_highlight_syntax();
      m_text_view_script->set_buffer(buffer);
   }
diff --git a/glom/mode_design/dialog_database_preferences.h b/glom/mode_design/dialog_database_preferences.h
index 75cb813..485c3f3 100644
--- a/glom/mode_design/dialog_database_preferences.h
+++ b/glom/mode_design/dialog_database_preferences.h
@@ -83,7 +83,7 @@ private:
   ImageGlom* m_image;
   Gtk::Button* m_button_choose_image;
 
-  gtksourceview::SourceView* m_text_view_script;
+  Gsv::SourceView* m_text_view_script;
   Gtk::Button* m_button_test_script;
 
   SystemPrefs m_system_prefs;
diff --git a/glom/mode_design/fields/dialog_fieldcalculation.cc b/glom/mode_design/fields/dialog_fieldcalculation.cc
index da91c0c..8f73bc3 100644
--- a/glom/mode_design/fields/dialog_fieldcalculation.cc
+++ b/glom/mode_design/fields/dialog_fieldcalculation.cc
@@ -50,13 +50,13 @@ Dialog_FieldCalculation::Dialog_FieldCalculation(BaseObjectType* cobject, const
   {
     m_text_view->set_highlight_current_line(true);
 
-    Glib::RefPtr<gtksourceview::SourceLanguageManager> languages_manager = gtksourceview::SourceLanguageManager::get_default();
+    Glib::RefPtr<Gsv::SourceLanguageManager> languages_manager = Gsv::SourceLanguageManager::get_default();
 
-    Glib::RefPtr<gtksourceview::SourceLanguage> language = languages_manager->get_language("python"); //This is the GtkSourceView language ID.
+    Glib::RefPtr<Gsv::SourceLanguage> language = languages_manager->get_language("python"); //This is the GtkSourceView language ID.
     if(language)
     {
        //Createa a new buffer and set it, instead of getting the default buffer, in case libglade has tried to set it, using the wrong buffer type:
-       Glib::RefPtr<gtksourceview::SourceBuffer> buffer = gtksourceview::SourceBuffer::create(language);
+       Glib::RefPtr<Gsv::SourceBuffer> buffer = Gsv::SourceBuffer::create(language);
        buffer->set_highlight_syntax();
        m_text_view->set_buffer(buffer);
     }
diff --git a/glom/mode_design/fields/dialog_fieldcalculation.h b/glom/mode_design/fields/dialog_fieldcalculation.h
index d9a216a..a1b34fe 100644
--- a/glom/mode_design/fields/dialog_fieldcalculation.h
+++ b/glom/mode_design/fields/dialog_fieldcalculation.h
@@ -49,7 +49,7 @@ private:
   void on_button_test();
   bool check_for_return_statement(const Glib::ustring& calculation);
 
-  gtksourceview::SourceView* m_text_view;
+  Gsv::SourceView* m_text_view;
   Gtk::Button* m_button_test;
   Gtk::Label* m_label_triggered_by;
 
diff --git a/glom/mode_design/fields/dialog_fielddefinition.h b/glom/mode_design/fields/dialog_fielddefinition.h
index dc9fd66..f4ddea7 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.h
+++ b/glom/mode_design/fields/dialog_fielddefinition.h
@@ -84,7 +84,7 @@ private:
 
   Gtk::RadioButton* m_pRadio_Calculate;
   Gtk::Alignment* m_pAlignment_Calculate;
-  gtksourceview::SourceView* m_pTextView_Calculation;
+  Gsv::SourceView* m_pTextView_Calculation;
   Gtk::Button* m_pButton_EditCalculation;
 
   Gtk::Entry* m_pEntry_Title;
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
index b7c805a..a227329 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc
@@ -51,15 +51,15 @@ Dialog_ButtonScript::Dialog_ButtonScript(BaseObjectType* cobject, const Glib::Re
   //Dialog_Properties::set_modified(false);
 
   //Tell the SourceView to do syntax highlighting for Python:
-  Glib::RefPtr<gtksourceview::SourceLanguageManager> languages_manager = 
-    gtksourceview::SourceLanguageManager::get_default();
+  Glib::RefPtr<Gsv::SourceLanguageManager> languages_manager = 
+    Gsv::SourceLanguageManager::get_default();
 
-  Glib::RefPtr<gtksourceview::SourceLanguage> language = 
+  Glib::RefPtr<Gsv::SourceLanguage> language = 
     languages_manager->get_language("python"); //This is the GtkSourceView language ID.
   if(language)
   {
      //Create a new buffer and set it, instead of getting the default buffer, in case libglade has tried to set it, using the wrong buffer type:
-     Glib::RefPtr<gtksourceview::SourceBuffer> buffer = gtksourceview::SourceBuffer::create(language);
+     Glib::RefPtr<Gsv::SourceBuffer> buffer = Gsv::SourceBuffer::create(language);
      buffer->set_highlight_syntax();
      m_text_view_script->set_buffer(buffer);
   }
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h
index db07bc5..6fd3dbb 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h
@@ -51,7 +51,7 @@ private:
   void on_button_test_script();
 
   Gtk::Entry* m_entry_title;
-  gtksourceview::SourceView* m_text_view_script;
+  Gsv::SourceView* m_text_view_script;
   Gtk::Button* m_button_test_script;
 
   sharedptr<LayoutItem_Button> m_script;
diff --git a/glom/mode_design/script_library/dialog_script_library.cc b/glom/mode_design/script_library/dialog_script_library.cc
index 5eff0e8..23acca8 100644
--- a/glom/mode_design/script_library/dialog_script_library.cc
+++ b/glom/mode_design/script_library/dialog_script_library.cc
@@ -58,13 +58,13 @@ Dialog_ScriptLibrary::Dialog_ScriptLibrary(BaseObjectType* cobject, const Glib::
   //Dialog_Properties::set_modified(false);
 
   //Set the SourceView to do syntax highlighting for Python:
-  Glib::RefPtr<gtksourceview::SourceLanguageManager> languages_manager = gtksourceview::SourceLanguageManager::get_default();
+  Glib::RefPtr<Gsv::SourceLanguageManager> languages_manager = Gsv::SourceLanguageManager::get_default();
 
-  Glib::RefPtr<gtksourceview::SourceLanguage> language = languages_manager->get_language("python"); //This is the GtkSourceView language ID.
+  Glib::RefPtr<Gsv::SourceLanguage> language = languages_manager->get_language("python"); //This is the GtkSourceView language ID.
   if(language)
   {
      //Create a new buffer and set it, instead of getting the default buffer, in case libglade has tried to set it, using the wrong buffer type:
-     Glib::RefPtr<gtksourceview::SourceBuffer> buffer = gtksourceview::SourceBuffer::create(language);
+     Glib::RefPtr<Gsv::SourceBuffer> buffer = Gsv::SourceBuffer::create(language);
      buffer->set_highlight_syntax();
      m_text_view->set_buffer(buffer);
   }
diff --git a/glom/mode_design/script_library/dialog_script_library.h b/glom/mode_design/script_library/dialog_script_library.h
index 30e2f01..4e030e8 100644
--- a/glom/mode_design/script_library/dialog_script_library.h
+++ b/glom/mode_design/script_library/dialog_script_library.h
@@ -59,7 +59,7 @@ private:
 
   Combo_TextGlade* m_combobox_name;
 
-  gtksourceview::SourceView* m_text_view;
+  Gsv::SourceView* m_text_view;
   Gtk::Button* m_button_check;
   Gtk::Button* m_button_add;
   Gtk::Button* m_button_remove;
diff --git a/tests/glade_toplevels_instantiation.cc b/tests/glade_toplevels_instantiation.cc
index db89fe8..d5fee5c 100644
--- a/tests/glade_toplevels_instantiation.cc
+++ b/tests/glade_toplevels_instantiation.cc
@@ -89,7 +89,7 @@ static bool attempt_instantiation(const std::string& filepath, const xmlpp::Elem
 int main(int argc, char* argv[])
 {
   Gtk::Main kit(argc, argv);
-  gtksourceview::init(); //Our .glade files contain gtksourceview widgets too.
+  Gsv::init(); //Our .glade files contain gtksourceview widgets too.
 
   std::string filepath;
   if(argc > 1 )
diff --git a/tests/test_glade_derived_instantiation.cc b/tests/test_glade_derived_instantiation.cc
index d77b688..2e21624 100644
--- a/tests/test_glade_derived_instantiation.cc
+++ b/tests/test_glade_derived_instantiation.cc
@@ -74,7 +74,7 @@ bool instantiate_widget()
 int main(int argc, char *argv[])
 {
   Gtk::Main kit(argc, argv);
-  gtksourceview::init(); //Our .glade files contain gtksourceview widgets too.
+  Gsv::init(); //Our .glade files contain gtksourceview widgets too.
 
   using namespace Glom;