diff options
| author | Vincent Untz <[email protected]> | 2011-02-17 12:47:25 +0100 |
|---|---|---|
| committer | Benjamin Valentin <[email protected]> | 2012-03-26 23:13:52 +0200 |
| commit | ab55bf3e46ccab95d268bf0e10dce2e15294cabf (patch) | |
| tree | 2a6bab11d2d52a00667f8c7a6c0ba955b62e88d6 | |
| parent | 065282bda1caacc9891c4f0c5411f03f17dc5555 (diff) | |
| download | mate-panel-ab55bf3e46ccab95d268bf0e10dce2e15294cabf.tar.bz2 mate-panel-ab55bf3e46ccab95d268bf0e10dce2e15294cabf.tar.xz | |
matecomponent: Remove API to build matecomponent applet as shared library
Yes, it's bad, it breaks API and ABI. In a stable branch. But it's the
matecomponent compatibility module. And it's a rather important fix.
We can't have matecomponent applets as shared libraries since both matecomponent
applets and dbus applets are sharing the MatePanelApplet type name, and they
will conflict in the same process. Since we know we want to allow dbus
in-process applets, it means we have to disallow matecomponent in-process
applets. Hence this change.
| -rw-r--r-- | matecomponent/libmate-panel-applet/mate-panel-applet.c | 49 | ||||
| -rw-r--r-- | matecomponent/libmate-panel-applet/mate-panel-applet.h | 32 |
2 files changed, 0 insertions, 81 deletions
diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet.c b/matecomponent/libmate-panel-applet/mate-panel-applet.c index c83df49f..d8ad2a0a 100644 --- a/matecomponent/libmate-panel-applet/mate-panel-applet.c +++ b/matecomponent/libmate-panel-applet/mate-panel-applet.c @@ -40,7 +40,6 @@ #include <matecomponent/matecomponent-types.h> #include <matecomponent/matecomponent-property-bag.h> #include <matecomponent/matecomponent-item-handler.h> -#include <matecomponent/matecomponent-shlib-factory.h> #include <matecomponent/matecomponent-property-bag-client.h> #include <mateconf/mateconf.h> #include <mateconf/mateconf-client.h> @@ -1811,54 +1810,6 @@ mate_panel_applet_factory_main (const gchar *iid, return mate_panel_applet_factory_main_closure (iid, applet_type, closure); } -MateComponent_Unknown -mate_panel_applet_shlib_factory_closure (const char *iid, - GType applet_type, - PortableServer_POA poa, - gpointer impl_ptr, - GClosure *closure, - CORBA_Environment *ev) -{ - MateComponentShlibFactory *factory; - - g_return_val_if_fail (iid != NULL, CORBA_OBJECT_NIL); - g_return_val_if_fail (closure != NULL, CORBA_OBJECT_NIL); - - g_assert (g_type_is_a (applet_type, PANEL_TYPE_APPLET)); - - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - - closure = matecomponent_closure_store (closure, mate_panel_applet_marshal_BOOLEAN__STRING); - - factory = matecomponent_shlib_factory_new_closure ( - iid, poa, impl_ptr, - g_cclosure_new (G_CALLBACK (mate_panel_applet_factory_callback), - mate_panel_applet_callback_data_new (applet_type, closure), - (GClosureNotify) mate_panel_applet_callback_data_free)); - - return CORBA_Object_duplicate (MATECOMPONENT_OBJREF (factory), ev); -} - -MateComponent_Unknown -mate_panel_applet_shlib_factory (const char *iid, - GType applet_type, - PortableServer_POA poa, - gpointer impl_ptr, - MatePanelAppletFactoryCallback callback, - gpointer user_data, - CORBA_Environment *ev) -{ - g_return_val_if_fail (iid != NULL, CORBA_OBJECT_NIL); - g_return_val_if_fail (callback != NULL, CORBA_OBJECT_NIL); - - return mate_panel_applet_shlib_factory_closure ( - iid, applet_type, poa, impl_ptr, - g_cclosure_new (G_CALLBACK (callback), - user_data, NULL), - ev); -} - void mate_panel_applet_set_background_widget (MatePanelApplet *applet, GtkWidget *widget) diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet.h b/matecomponent/libmate-panel-applet/mate-panel-applet.h index 28d9e89d..3310fa32 100644 --- a/matecomponent/libmate-panel-applet/mate-panel-applet.h +++ b/matecomponent/libmate-panel-applet/mate-panel-applet.h @@ -159,21 +159,6 @@ int mate_panel_applet_factory_main_closure (const gchar *iid, GType applet_type, GClosure *closure); -MateComponent_Unknown mate_panel_applet_shlib_factory (const char *iid, - GType applet_type, - PortableServer_POA poa, - gpointer impl_ptr, - MatePanelAppletFactoryCallback callback, - gpointer user_data, - CORBA_Environment *ev); - -MateComponent_Unknown mate_panel_applet_shlib_factory_closure (const char *iid, - GType applet_type, - PortableServer_POA poa, - gpointer impl_ptr, - GClosure *closure, - CORBA_Environment *ev); - /* * These macros are getting a bit unwieldy. * @@ -234,23 +219,6 @@ int main (int argc, char *argv []) \ return retval; \ } -#define MATE_PANEL_APPLET_MATECOMPONENT_SHLIB_FACTORY(iid, type, descr, callback, data) \ -static MateComponent_Unknown \ -__mate_panel_applet_shlib_factory (PortableServer_POA poa, \ - const char *oafiid, \ - gpointer impl_ptr, \ - CORBA_Environment *ev) \ -{ \ - _MATE_PANEL_APPLET_SETUP_GETTEXT (FALSE); \ - return mate_panel_applet_shlib_factory ((iid), (type), poa, impl_ptr, \ - (callback), (data), ev); \ -} \ -static MateComponentActivationPluginObject plugin_list[] = { \ - { (iid), __mate_panel_applet_shlib_factory }, \ - { NULL } \ -}; \ -const MateComponentActivationPlugin MateComponent_Plugin_info = { plugin_list, (descr) }; - #ifdef __cplusplus } #endif |