gedit r6164 - in trunk: . plugins/snippets/data/lang plugins/snippets/snippets

[jessevdk svn gnome org]

Author: jessevdk
Date: Sat Feb 16 07:49:18 2008
New Revision: 6164
URL: http://svn.gnome.org/viewvc/gedit?rev=6164&view=rev

Log:
	* plugins/snippets/data/lang/snippets.lang: fixed reference to def:escape
	style which does no longer exist
	
	* plugins/snippets/snippets/Library.py:
	* plugins/snippets/snippets/WindowHelper.py:
	* plugins/snippets/snippets/Document.py
	
	Fixed problem with accelerator groups not getting uninstalled properly


Modified:
   trunk/ChangeLog
   trunk/plugins/snippets/data/lang/snippets.lang
   trunk/plugins/snippets/snippets/Document.py
   trunk/plugins/snippets/snippets/Library.py
   trunk/plugins/snippets/snippets/WindowHelper.py

Modified: trunk/plugins/snippets/data/lang/snippets.lang
==============================================================================
--- trunk/plugins/snippets/data/lang/snippets.lang	(original)
+++ trunk/plugins/snippets/data/lang/snippets.lang	Sat Feb 16 07:49:18 2008
@@ -31,7 +31,7 @@
     <style id="tabstop"            _name="Tabstop"  map-to="def:decimal"/>
     <style id="placeholder-ref"    _name="Placeholder Reference" map-to="def:decimal"/>
     <style id="placeholder-def"    _name="Placeholder Default" map-to="def:string"/>
-    <style id="escape"             _name="Escape" map-to="def:escape"/>
+    <style id="escape"             _name="Escape" map-to="def:special-char"/>
     <style id="environmental-var"  _name="Environmental Variable" map-to="def:string"/>
     <style id="seperator"          _name="Seperator" map-to="def:shebang"/>
     <style id="regex-pattern"      _name="Regular Expression Pattern" map-to="def:string"/>

Modified: trunk/plugins/snippets/snippets/Document.py
==============================================================================
--- trunk/plugins/snippets/snippets/Document.py	(original)
+++ trunk/plugins/snippets/snippets/Document.py	Sat Feb 16 07:49:18 2008
@@ -113,9 +113,15 @@
 
                         self.update_language()
                 elif self.language_id != 0:
-                        Library().unref(self.language_id)
-                        self.language_id = 0
-        
+                        langid = self.language_id
+                        
+                        self.language_id = None;
+                        
+                        if self.instance:
+                                self.instance.language_changed(self)
+
+                        Library().unref(langid)
+
         def set_view(self, view):
                 if view == self.view:
                         return
@@ -132,8 +138,7 @@
                 elif lang and lang.get_id() == self.language_id:
                         return
 
-                if self.language_id != 0:
-                        Library().unref(self.language_id)
+                langid = self.language_id
 
                 if lang:
                         self.language_id = lang.get_id()
@@ -143,6 +148,9 @@
                 if self.instance:
                         self.instance.language_changed(self)
 
+                if langid != 0:
+                        Library().unref(langid)
+
                 Library().ref(self.language_id)
 
         def accelerator_activate(self, keyval, mod):

Modified: trunk/plugins/snippets/snippets/Library.py
==============================================================================
--- trunk/plugins/snippets/snippets/Library.py	(original)
+++ trunk/plugins/snippets/snippets/Library.py	Sat Feb 16 07:49:18 2008
@@ -854,8 +854,9 @@
                 
         def get_accel_group(self, language):
                 language = self.normalize_language(language)
-                
                 container = self.container(language)
+
+                self.ensure(language)
                 return container.accel_group
                 
         def save(self, language):

Modified: trunk/plugins/snippets/snippets/WindowHelper.py
==============================================================================
--- trunk/plugins/snippets/snippets/WindowHelper.py	(original)
+++ trunk/plugins/snippets/snippets/WindowHelper.py	Sat Feb 16 07:49:18 2008
@@ -60,7 +60,7 @@
                 for view in self.window.get_views():
                         if isinstance(view, gedit.View) and self.has_controller(view):
                                 view._snippet_controller.stop()
-                                view._snippet_controller = None		
+                                view._snippet_controller = None
                 
                 self.window = None
                 self.plugin = None
@@ -76,7 +76,7 @@
                                 self.on_action_snippets_activate)])
 
                 self.merge_id = manager.new_merge_id()
-                manager.insert_action_group(self.action_group, -1)		
+                manager.insert_action_group(self.action_group, -1)
                 manager.add_ui(self.merge_id, '/MenuBar/ToolsMenu/ToolsOps_5', \
                                 'ManageSnippets', 'ManageSnippets', gtk.UI_MANAGER_MENUITEM, False)
 
@@ -144,3 +144,5 @@
 
         def accelerator_activated(self, keyval, mod):
                 return self.current_controller.accelerator_activate(keyval, mod)
+
+# ex:ts=8:et: