1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
Description: Also load plugins from pre-multiarch directory
Author: Jeremy Bicha <jbicha@ubuntu.com>
Forwarded: not-needed
--- a/gedit/gedit-dirs.c
+++ b/gedit/gedit-dirs.c
@@ -36,6 +36,7 @@
static gchar *gedit_locale_dir = NULL;
static gchar *gedit_lib_dir = NULL;
static gchar *gedit_plugins_dir = NULL;
+static gchar *gedit_fallback_plugins_dir = NULL;
static gchar *gedit_plugins_data_dir = NULL;
void
@@ -111,6 +112,9 @@
gedit_plugins_dir = g_build_filename (gedit_lib_dir,
"plugins",
NULL);
+ gedit_fallback_plugins_dir = g_build_filename ("/usr/lib/gedit",
+ "plugins",
+ NULL);
gedit_plugins_data_dir = g_build_filename (gedit_data_dir,
"plugins",
NULL);
@@ -127,6 +131,7 @@
g_free (gedit_locale_dir);
g_free (gedit_lib_dir);
g_free (gedit_plugins_dir);
+ g_free (gedit_fallback_plugins_dir);
g_free (gedit_plugins_data_dir);
}
@@ -179,6 +184,12 @@
}
const gchar *
+gedit_dirs_get_gedit_fallback_plugins_dir (void)
+{
+ return gedit_fallback_plugins_dir;
+}
+
+const gchar *
gedit_dirs_get_gedit_plugins_data_dir (void)
{
return gedit_plugins_data_dir;
--- a/gedit/gedit-dirs.h
+++ b/gedit/gedit-dirs.h
@@ -48,6 +48,8 @@
const gchar *gedit_dirs_get_gedit_plugins_dir (void);
+const gchar *gedit_dirs_get_gedit_fallback_plugins_dir (void);
+
const gchar *gedit_dirs_get_gedit_plugins_data_dir (void);
gchar *gedit_dirs_get_ui_file (const gchar *file);
--- a/gedit/gedit-plugins-engine.c
+++ b/gedit/gedit-plugins-engine.c
@@ -98,6 +98,10 @@
gedit_dirs_get_gedit_plugins_dir (),
gedit_dirs_get_gedit_plugins_data_dir ());
+ peas_engine_add_search_path (PEAS_ENGINE (engine),
+ gedit_dirs_get_gedit_fallback_plugins_dir (),
+ gedit_dirs_get_gedit_plugins_data_dir ());
+
g_settings_bind (engine->priv->plugin_settings,
GEDIT_SETTINGS_ACTIVE_PLUGINS,
engine,
|
