|
 |
f620a9 |
diff -up gedit-3.8.3/configure.ac.disable-python gedit-3.8.3/configure.ac
|
|
|
f620a9 |
--- gedit-3.8.3/configure.ac.disable-python 2013-07-17 20:41:04.210713683 -0400
|
|
|
f620a9 |
+++ gedit-3.8.3/configure.ac 2013-07-17 20:41:36.763967930 -0400
|
|
|
f620a9 |
@@ -306,7 +306,7 @@ if test "x$enable_python" = "xauto"; the
|
|
|
f620a9 |
fi
|
|
|
f620a9 |
|
|
|
f620a9 |
if test "x$enable_python" = "xyes"; then
|
|
|
f620a9 |
- AM_PATH_PYTHON(3.2.3)
|
|
|
f620a9 |
+ AM_PATH_PYTHON
|
|
|
f620a9 |
PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
|
|
|
f620a9 |
|
|
|
f620a9 |
pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
|
|
|
f620a9 |
diff -up gedit-3.8.3/gedit/gedit-plugins-engine.c.disable-python gedit-3.8.3/gedit/gedit-plugins-engine.c
|
|
|
f620a9 |
--- gedit-3.8.3/gedit/gedit-plugins-engine.c.disable-python 2013-03-12 02:35:32.000000000 -0400
|
|
|
f620a9 |
+++ gedit-3.8.3/gedit/gedit-plugins-engine.c 2013-07-17 20:41:04.210713683 -0400
|
|
|
f620a9 |
@@ -66,7 +66,7 @@ gedit_plugins_engine_init (GeditPluginsE
|
|
|
f620a9 |
GEDIT_TYPE_PLUGINS_ENGINE,
|
|
|
f620a9 |
GeditPluginsEnginePrivate);
|
|
|
f620a9 |
|
|
|
f620a9 |
- peas_engine_enable_loader (PEAS_ENGINE (engine), "python3");
|
|
|
f620a9 |
+ peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
|
|
|
f620a9 |
|
|
|
f620a9 |
engine->priv->plugin_settings = g_settings_new ("org.gnome.gedit.plugins");
|
|
|
f620a9 |
|
|
|
f620a9 |
--- a/plugins/externaltools/externaltools.plugin.desktop.in
|
|
|
f620a9 |
+++ b/plugins/externaltools/externaltools.plugin.desktop.in
|
|
|
f620a9 |
@@ -1,5 +1,5 @@
|
|
|
f620a9 |
[Plugin]
|
|
|
f620a9 |
-Loader=python3
|
|
|
f620a9 |
+Loader=python
|
|
|
f620a9 |
Module=externaltools
|
|
|
f620a9 |
IAge=3
|
|
|
f620a9 |
_Name=External Tools
|
|
|
f620a9 |
--- a/plugins/pythonconsole/pythonconsole.plugin.desktop.in
|
|
|
f620a9 |
+++ b/plugins/pythonconsole/pythonconsole.plugin.desktop.in
|
|
|
f620a9 |
@@ -1,5 +1,5 @@
|
|
|
f620a9 |
[Plugin]
|
|
|
f620a9 |
-Loader=python3
|
|
|
f620a9 |
+Loader=python
|
|
|
f620a9 |
Module=pythonconsole
|
|
|
f620a9 |
IAge=3
|
|
|
f620a9 |
_Name=Python Console
|
|
|
f620a9 |
--- a/plugins/quickopen/quickopen.plugin.desktop.in
|
|
|
f620a9 |
+++ b/plugins/quickopen/quickopen.plugin.desktop.in
|
|
|
f620a9 |
@@ -1,5 +1,5 @@
|
|
|
f620a9 |
[Plugin]
|
|
|
f620a9 |
-Loader=python3
|
|
|
f620a9 |
+Loader=python
|
|
|
f620a9 |
Module=quickopen
|
|
|
f620a9 |
IAge=3
|
|
|
f620a9 |
_Name=Quick Open
|
|
|
f620a9 |
--- a/plugins/snippets/snippets.plugin.desktop.in
|
|
|
f620a9 |
+++ b/plugins/snippets/snippets.plugin.desktop.in
|
|
|
f620a9 |
@@ -1,5 +1,5 @@
|
|
|
f620a9 |
[Plugin]
|
|
|
f620a9 |
-Loader=python3
|
|
|
f620a9 |
+Loader=python
|
|
|
f620a9 |
Module=snippets
|
|
|
f620a9 |
IAge=3
|
|
|
f620a9 |
_Name=Snippets
|
|
|
f620a9 |
--- a/plugins/snippets/snippets/shareddata.py
|
|
|
f620a9 |
+++ b/plugins/snippets/snippets/shareddata.py
|
|
|
f620a9 |
@@ -20,7 +20,10 @@ import os
|
|
|
f620a9 |
|
|
|
f620a9 |
from gi.repository import Gtk
|
|
|
f620a9 |
|
|
|
f620a9 |
-class SharedData(object, metaclass=Singleton):
|
|
|
f620a9 |
+
|
|
|
f620a9 |
+class SharedData(object):
|
|
|
f620a9 |
+ __metaclass__ = Singleton
|
|
|
f620a9 |
+
|
|
|
f620a9 |
def __init__(self):
|
|
|
f620a9 |
self.dlg = None
|
|
|
f620a9 |
self.dlg_default_size = None
|
|
|
f620a9 |
@@ -29,7 +32,7 @@ class SharedData(object, metaclass=Singl
|
|
|
f620a9 |
|
|
|
f620a9 |
def register_controller(self, view, controller):
|
|
|
f620a9 |
self.controller_registry[view] = controller
|
|
|
f620a9 |
-
|
|
|
f620a9 |
+
|
|
|
f620a9 |
def unregister_controller(self, view, controller):
|
|
|
f620a9 |
if self.controller_registry[view] == controller:
|
|
|
f620a9 |
del self.controller_registry[view]
|
|
|
f620a9 |
@@ -72,7 +75,8 @@ class SharedData(object, metaclass=Singl
|
|
|
f620a9 |
self.dlg.connect('destroy', self.manager_destroyed)
|
|
|
f620a9 |
|
|
|
f620a9 |
if self.dlg_default_size:
|
|
|
f620a9 |
- self.dlg.set_default_size(self.dlg_default_size[0], self.dlg_default_size[1])
|
|
|
f620a9 |
+ self.dlg.set_default_size(self.dlg_default_size[0],
|
|
|
f620a9 |
+ self.dlg_default_size[1])
|
|
|
f620a9 |
|
|
|
f620a9 |
self.dlg.set_transient_for(window)
|
|
|
f620a9 |
self.dlg.present()
|
|
|
f620a9 |
|