[gnome-panel] don't try to load external modules



commit 39cd8be894752466e329a846bd6b35724c3e4795
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Oct 12 23:45:28 2016 +0300

    don't try to load external modules

 configure.ac                |    3 ---
 gnome-panel/Makefile.am     |    2 --
 gnome-panel/panel-modules.c |   25 -------------------------
 3 files changed, 0 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1927016..118e0c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,9 +205,6 @@ dnl **************************************************************************
 
 AC_STRUCT_DIRENT_D_TYPE
 
-dnl Modules dir
-AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
-
 dnl Applets dir
 AC_SUBST([appletsdir],"\$(datadir)/gnome-panel/applets")
 AC_SUBST([appletsdir_pkgconfig],"\${datadir}/gnome-panel/applets")
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index a9ac2e5..307e948 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -114,7 +114,6 @@ gnome_panel_SOURCES =                       \
        $(panel_headers)
 
 gnome_panel_CFLAGS = \
-       -DPANEL_MODULES_DIR=\"$(modulesdir)\" \
        -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
        -DGNOME_DESKTOP_USE_UNSTABLE_API \
        -DPANELDATADIR=\""$(datadir)/gnome-panel"\" \
@@ -178,7 +177,6 @@ panel_test_applets_SOURCES =                        \
 panel_test_applets_CFLAGS = \
        -DGNOMELOCALEDIR=\""$(localedir)"\" \
        -DPANELDATADIR=\""$(datadir)/gnome-panel"\" \
-       -DPANEL_MODULES_DIR=\"$(modulesdir)\"   \
        -DPANEL_APPLETS_DIR=\"$(appletsdir)\" \
        -I$(srcdir) \
        -I$(top_builddir)/gnome-panel \
diff --git a/gnome-panel/panel-modules.c b/gnome-panel/panel-modules.c
index 33dcb97..d1221dd 100644
--- a/gnome-panel/panel-modules.c
+++ b/gnome-panel/panel-modules.c
@@ -48,37 +48,12 @@ void
 panel_modules_ensure_loaded (void)
 {
        static gboolean loaded_dirs = FALSE;
-       const char *module_path;
 
        panel_modules_ensure_extension_points_registered ();
 
        if (!loaded_dirs) {
-               GList *modules;
                loaded_dirs = TRUE;
 
-               /* We load the modules explicitly instead of using scan_all
-                * so that we can leak a reference to them.  This prevents them
-                * from getting unloaded later (something they aren't designed
-                * to cope with) */
-               modules = g_io_modules_load_all_in_directory (PANEL_MODULES_DIR);
-               g_list_free (modules);
-
-               module_path = g_getenv ("GNOME_PANEL_EXTRA_MODULES");
-
-               if (module_path) {
-                       gchar **paths;
-                       int i;
-
-                       paths = g_strsplit (module_path, ":", 0);
-
-                       for (i = 0; paths[i] != NULL; i++) {
-                               modules = g_io_modules_load_all_in_directory (paths[i]);
-                               g_list_free (modules);
-                       }
-
-                       g_strfreev (paths);
-               }
-
                panel_applets_manager_dbus_get_type ();
        }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]