diff options
author | Steve Zesch <[email protected]> | 2012-05-10 12:59:42 -0700 |
---|---|---|
committer | Steve Zesch <[email protected]> | 2012-05-10 12:59:42 -0700 |
commit | 69769af51fe3f072bfd2612a27afc095eb67384f (patch) | |
tree | d6763f371a423ce34a333b457c66ef69019fa219 /matecomponent/libmate-panel-applet/mate-panel-applet.c | |
parent | 9639e4e9ccdbf44e8a4a29a57c23cc7c4cf05253 (diff) | |
parent | 4cd113800b89a73dfa77ed4081811055a4cbe23e (diff) | |
download | mate-panel-69769af51fe3f072bfd2612a27afc095eb67384f.tar.bz2 mate-panel-69769af51fe3f072bfd2612a27afc095eb67384f.tar.xz |
Merge pull request #18 from benpicco/upstream
pull in upstream changes & fixes
Diffstat (limited to 'matecomponent/libmate-panel-applet/mate-panel-applet.c')
-rw-r--r-- | matecomponent/libmate-panel-applet/mate-panel-applet.c | 49 |
1 files changed, 0 insertions, 49 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) |