shell: Make all control-center plugins static

This makes loading faster, with less I/O, avoids unnecessary
code duplication (around 1k lines shaved), and ensures that
all the panels link and work appropriately.

By the same token, it will stop external panels from being
created, and loaded.

https://bugzilla.gnome.org/show_bug.cgi?id=690036

4 files changed, 1 insertions, 58 deletions

diff --git a/panels/universal-access/Makefile.am b/panels/universal-access/Makefile.am
index 1f387f947..591c56381 100644
--- a/panels/universal-access/Makefile.am
+++ b/panels/universal-access/Makefile.am
@@ -9,11 +9,9 @@ INCLUDES = 						\
 	-I$(top_srcdir)/panels/common/			\
 	$(NULL)
 
-ccpanelsdir = $(PANELS_DIR)
-ccpanels_LTLIBRARIES = libuniversal-access.la
+noinst_LTLIBRARIES = libuniversal-access.la
 
 libuniversal_access_la_SOURCES =		\
-	universal-access-module.c		\
 	cc-ua-panel.c				\
 	cc-ua-panel.h				\
 	cc-marshal.c				\
@@ -22,7 +20,6 @@ libuniversal_access_la_SOURCES =		\
 	zoom-options.h
 
 libuniversal_access_la_LIBADD = $(PANEL_LIBS) $(UNIVERSAL_ACCESS_PANEL_LIBS)
-libuniversal_access_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 uidir = $(pkgdatadir)/ui
 dist_ui_DATA = uap.ui zoom-options.ui
diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c
index 7fe97ae61..7fe2ce8d8 100644
--- a/panels/universal-access/cc-ua-panel.c
+++ b/panels/universal-access/cc-ua-panel.c
@@ -652,13 +652,3 @@ cc_ua_panel_init (CcUaPanel *self)
 
   gtk_container_add (GTK_CONTAINER (self), widget);
 }
-
-void
-cc_ua_panel_register (GIOModule *module)
-{
-  cc_ua_panel_register_type (G_TYPE_MODULE (module));
-  g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
-                                  CC_TYPE_UA_PANEL,
-                                  "universal-access", 0);
-}
-
diff --git a/panels/universal-access/cc-ua-panel.h b/panels/universal-access/cc-ua-panel.h
index a36e0c856..c93dfa53b 100644
--- a/panels/universal-access/cc-ua-panel.h
+++ b/panels/universal-access/cc-ua-panel.h
@@ -68,8 +68,6 @@ struct _CcUaPanelClass
 
 GType cc_ua_panel_get_type (void) G_GNUC_CONST;
 
-void  cc_ua_panel_register (GIOModule *module);
-
 G_END_DECLS
 
 #endif /* _CC_UA_PANEL_H */
diff --git a/panels/universal-access/universal-access-module.c b/panels/universal-access/universal-access-module.c
deleted file mode 100644
index 4f18b5cb5..000000000
--- a/panels/universal-access/universal-access-module.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2010 Intel, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Author: Thomas Wood <thomas.wood@intel.com>
- *
- */
-
-#include <config.h>
-
-#include "cc-ua-panel.h"
-
-#include <glib/gi18n-lib.h>
-
-void
-g_io_module_load (GIOModule *module)
-{
-  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-
-  /* register the panel */
-  cc_ua_panel_register (module);
-}
-
-void
-g_io_module_unload (GIOModule *module)
-{
-}