diff options
author | Marcel Dijkstra <[email protected]> | 2012-05-23 02:33:19 +0200 |
---|---|---|
committer | Marcel Dijkstra <[email protected]> | 2012-05-23 02:33:19 +0200 |
commit | 13d41840ccb39bebe44b52653ba8d59b0c4985a0 (patch) | |
tree | 913ab19cfa015a5ec63ff66c37a6d67696c347d1 /matecomponent/libmate-panel-applet/mate-panel-applet.h | |
parent | d3b927a321242e36abdb1e4acc488cde7899800e (diff) | |
parent | 9af851f0c4f0296eb5654233b9fc251e9377c8b9 (diff) | |
download | mate-panel-13d41840ccb39bebe44b52653ba8d59b0c4985a0.tar.bz2 mate-panel-13d41840ccb39bebe44b52653ba8d59b0c4985a0.tar.xz |
Merge remote-tracking branch 'upstream/master' into slave
Diffstat (limited to 'matecomponent/libmate-panel-applet/mate-panel-applet.h')
-rw-r--r-- | matecomponent/libmate-panel-applet/mate-panel-applet.h | 32 |
1 files changed, 0 insertions, 32 deletions
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 |